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

[Laurynas Biveinis]

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

Merge MySQL 5.6.12. Non-automerge bits:

- Revert our fix for bug 1155859 due to the upstream fix.
- Revert our fix for bug 1035225 due to the upstream fix, but keeping
  our testcase.
- Revert our fix for bug 1135097 due to the upstream fix, but keeping
  our testcase.
- Revert our fix for bug 1017192 due to the upstream fix, but keeping
  our testcase.
- Add MTR suppressions for the additional diagnostics in 5.6.12 for
  percona_bug_999147.test.
- Re-enable parts of group_commit_crash.test that were disabled due to
  http://bugs.mysql.com/bug.php?id=68932.
- Add fake changes support to then ne in 5.6.12 function
  lock_trx_has_rec_x_lock()
- Fix upstream regresion bug 1188516 /
  http://bugs.mysql.com/bug.php?id=69419 (Undocumented and untested
  table_open_cache table_definition_cache default change) by only
  adjusting the maximum connections and table cache size defaults in
  the case when open_files_limit == 0, as it was done in 5.6.11 and
  earlier.

[Alexey Kopytov (akopytov)]

The fix for http://bugs.mysql.com/bug.php?id=69419 looks problematic. We seem to be deviating from upstream (with all implications for users and performance_schema autosizing) merely to make a few tests pass in specific OS configurations.

Aren't there any better (less invasive) solutions? I didn't investigate the problem in details, but perhaps tweaking our Jenkins slaves would fix it without changing the server behavior? Or, if table_open_cache and table_definition_cache get some specific fixed values once the OS open_files limit is below a certain threshold, could we allow both "below threshold" and "above threshold" values in test results, e.g. with "--replace_result 615 1400"? Or, as the comment in the report suggests, check the actual (possibly adjusted) value of open_files_limit and skip the relevant tests if its below the threshold?

review: Needs Information

[Laurynas Biveinis (laurynas-biveinis)]

Alexey -

The upstream bug is that the default values have been silently changed from 5.6.11 to 5.6.12 for systems with specific configurations. My patch restores the 5.6.11 behavior that matches all the current docs and cannot have any worse implications than Oracle 5.6.11 itself, which seems quite safe to me. I strongly suspect that the 5.6.12 change was unintended consequence of a refactoring (the commit fixes P_S sizing, does not say a word about changed defaults) and will be either documented as a feature for 5.6.12 post-factum now that they are aware of it, either will be reverted.

If you still want me to change this to match 5.6.12 instead of 5.6.11 then all three options should work, I'd implement the "below threshold" and "above threshold" option.

[Alexey Kopytov (akopytov)]

Hi Laurynas,

On Wed, 19 Jun 2013 15:28:29 -0000, Laurynas Biveinis wrote:
> Alexey -
>
> The upstream bug is that the default values have been silently changed from 5.6.11 to 5.6.12 for systems with specific configurations. My patch restores the 5.6.11 behavior that matches all the current docs and cannot have any worse implications than Oracle 5.6.11 itself, which seems quite safe to me. I strongly suspect that the 5.6.12 change was unintended consequence of a refactoring (the commit fixes P_S sizing, does not say a word about changed defaults) and will be either documented as a feature for 5.6.12 post-factum now that they are aware of it, either will be reverted.
>

So, took me a while to figure all the details, will probably take even
longer to explain :)

OK, pre-5.6.12 behavior (in 5.6.8 - 5.6.11 to be specific):

1. Read variables values from configuration or use their default values

2. Use them to calculate performance autosized settings

3. Try to set the desired open_files limit based on open_files_limit (or
5000 if it's zero), max_connections and table_open_cache

4. See if were only allowed to raise the limit to a lower value.

5. If that's the case, adjust max_connections and table_open_cache, but
only if open_files_limit was 0. I don't think it is (was) documented
anywhere, including the open_files_limit=0 prerequisite. There's also an
old feature request to change that: http://bugs.mysql.com/bug.php?id=43427

And the purpose of that prerequisite is also unclear. Perhaps to avoid
autosizing when a hard-coded "default" value of 5000 is used.

6. Adjust table_definition_cache only if it was not specified explicitly
by the user based on the current (possibly adjusted) value of
table_open_cache

Important things to note here are that:
- autosizing of table_open_cache might occur only if open_files_limit=0
and we could not raise the limit to the desired value (not documented)
- autosizing of table_definition_cache might occur if it was not
specified explicitly (documented, see below)

As the 4948 revision comment says, the problem was that Performance
Schema autosizing was based on wrong values, i.e. before they are
adjusted later.

Now enter 5.6.12. What's changed in the above is basically that:

- adjustments are performed before perf. schema initialization
- the open_files_limit=0 prerequisite for adjusting table_open_cache got
dropped. I can see why it was done, it makes the logic unnecessary
complicated and again, it was not documented anywhere.

Back to http://bugs.mysql.com/bug.php?id=69419:

Was it an undocumented change of default values for table_open_cache and
table_definition_cache?

I don't think so. Docs say that the value of table_definition_cache is
autosized by default based on the "400 + (table_open_cache / 2)"
formula. No questions here, it was like that before 5.6.12 and is like
that in 5.6.12.

For table_open_cache, docs say the default value is 2000. This is only
half true. It is 2000, if we could reserve the desired number of open
files on startup, *and* before 5.6.12 if open_files_limit is 0.
Otherwise it is autosized based on the actual open_files limit we could
achieve and max_connecti...

[Laurynas Biveinis (laurynas-biveinis)]

The problem with the "--replace_result <low value> <default>" approach is that low value will vary, for example, table_definition_cache may become anything between 615 and 1399. replace_regexp is not practical for matching such range exactly, and a broad regexp, e.g. [0-9]+ IMHO kills the purpose of the test.

That leaves the option of skipping the tests. I'd prefer checking the system ulimit (there are such tests already) instead of the actual adjusted variable value as the latter approach undermines the actual default value testing (if the default is broken, the test is skipped, never fails).

[Laurynas Biveinis (laurynas-biveinis)]

Speaking too soon is the mother of stupidity.

The system ulimit check _is_ performed through the adjusted open_files_limit query.

[Alexey Kopytov (akopytov)]

Or we can just remove the default values checks and keep the rest of the corresponding tests?

[Laurynas Biveinis (laurynas-biveinis)]

Yes, we can do that. Would there be any advantage over open_files_limit < 500 test skipping approach, which I have almost finished implementing?

The pro would be the tests actually being run with low ulimits. The con would be missing default value checks. Both of them look hair-splitting to me, especially that we'd expect to revert the fix in one or two point releases.

[Laurynas Biveinis (laurynas-biveinis)]

s/500/5000

[Alexey Kopytov (akopytov)]

Is missing the default value checks really a con? As in, if we skip tests, we don't get *any* checks?

[Laurynas Biveinis (laurynas-biveinis)]

The tests still run on large ulimit -n machines, which both we and upstream have in our CI farms (and it is apparent that there is not a single small ulimit -n machine in both of them) and the tested functionality is mostly orthogonal to the ulimit value. Thus IMHO don't we don't lose much by skipping testing on small ulimit machines. While the defaults have some calculating algorithm behind them, which is possible to break and not know about it, since it would not be checked anywhere at all.

Maybe technically better would be splitting the default checks to their own testcases, that would be skipped on low-ulimit machines and the rest that is runnable everywhere? But then again I wouldn't see much return on the time spent here.

[Alexey Kopytov (akopytov)]

s/SELECT @start_value;/SELECT IF(@@open_files_limit < 5000, 400, @start_value);/ ? :)

[Laurynas Biveinis (laurynas-biveinis)]

Perfect.

=== modified file 'Makefile'
--- Makefile	2013-05-31 16:00:19 +0000
+++ Makefile	2013-06-20 15:23:53 +0000
@@ -1,5 +1,5 @@
-MYSQL_VERSION=5.6.11
-PERCONA_SERVER_VERSION=rc60.3
+MYSQL_VERSION=5.6.12
+PERCONA_SERVER_VERSION=rc60.4
 PERCONA_SERVER         ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
 PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
 PERCONA_SERVER_SHORT_2 ?=Percona-Server

=== modified file 'Percona-Server/BUILD/SETUP.sh'
--- Percona-Server/BUILD/SETUP.sh	2013-02-26 05:45:28 +0000
+++ Percona-Server/BUILD/SETUP.sh	2013-06-20 15:23:53 +0000
@@ -14,8 +14,8 @@
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA
 
 ########################################################################
 

=== modified file 'Percona-Server/BUILD/compile-pentium'
--- Percona-Server/BUILD/compile-pentium	2013-05-12 06:24:46 +0000
+++ Percona-Server/BUILD/compile-pentium	2013-06-20 15:23:53 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 path=`dirname $0`
 cmake $path/.. -DWITH_DEBUG=0

=== modified file 'Percona-Server/BUILD/compile-pentium-debug-max-no-ndb'
--- Percona-Server/BUILD/compile-pentium-debug-max-no-ndb	2013-05-12 06:24:46 +0000
+++ Percona-Server/BUILD/compile-pentium-debug-max-no-ndb	2013-06-20 15:23:53 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 path=`dirname $0`
 cmake $path/.. -DWITH_DEBUG=1 -DWITH_NDBCLUSTER=0

=== modified file 'Percona-Server/BUILD/compile-pentium-gcov'
--- Percona-Server/BUILD/compile-pentium-gcov	2012-08-22 01:40:20 +0000
+++ Percona-Server/BUILD/compile-pentium-gcov	2013-06-20 15:23:53 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 path=`dirname $0`
 cmake $path/.. -DWITH_DEBUG=1 -DENABLE_GCOV=ON 

=== modified file 'Percona-Server/BUILD/compile-pentium-gprof'
--- Percona-Server/BUILD/compile-pentium-gprof	2012-08-22 01:40:20 +0000
+++ Percona-Server/BUILD/compile-pentium-gprof	2013-06-20 15:23:53 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 path=`dirname $0`
 cmake $path/.. -DWITH_DEBUG=0 -DENABLE_GPROF=ON 

=== modified file 'Percona-Server/BUILD/compile-pentium-valgrind-max-no-ndb'
--- Percona-Server/BUILD/compile-pentium-valgrind-max-no-ndb	2012-08-22 01:40:20 +0000
+++ Percona-Server/BUILD/compile-pentium-valgrind-max-no-ndb	2013-06-20 15:23:53 +0000
@@ -14,8 +14,8 @@
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA
 
 path=`dirname $0`
 cmake $path/.. -DWITH_DEBUG=1 -DWITH_VALGRIND=1 \

=== modified file 'Percona-Server/BUILD/compile-pentium64'
--- Percona-Server/BUILD/compile-pentium64	2012-08-22 01:40:20 +0000
+++ Percona-Server/BUILD/compile-pentium64	2013-06-20 15:23:53 +0000
@@ -14,8 +14,8 @@
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA
 
 path=`dirname $0`
 cmake $path/.. -DCMAKE_CXX_FLAGS=-m64 -DCMAKE_C_FLAGS=-m64 

=== modified file 'Percona-Server/CMakeLists.txt'
--- Percona-Server/CMakeLists.txt	2013-05-12 09:13:00 +0000
+++ Percona-Server/CMakeLists.txt	2013-06-20 15:23:53 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -328,8 +328,8 @@
 MYSQL_CHECK_ZLIB_WITH_COMPRESS()
 # Add bundled yassl/taocrypt or system openssl.
 MYSQL_CHECK_SSL()
-# Add readline or libedit.
-MYSQL_CHECK_READLINE()
+# Add system/bundled editline.
+MYSQL_CHECK_EDITLINE()
 # Add libevent
 MYSQL_CHECK_LIBEVENT()
 
@@ -381,6 +381,10 @@
   ADD_SUBDIRECTORY(unittest/examples)
   ADD_SUBDIRECTORY(unittest/mytap)
   ADD_SUBDIRECTORY(unittest/mytap/t)
+  # Visual Studio 11 needs this extra flag in order to compile gmock.
+  IF(WIN32)
+    ADD_DEFINITIONS( /D _VARIADIC_MAX=10 )
+  ENDIF()
   ADD_SUBDIRECTORY(unittest/gunit)
 ENDIF()
 

=== modified file 'Percona-Server/Docs/mysql.info'
--- Percona-Server/Docs/mysql.info	2013-05-10 09:39:17 +0000
+++ Percona-Server/Docs/mysql.info	2013-06-20 15:23:53 +0000
@@ -1,4 +1,3 @@
 
 The MySQL Reference Manual is available in various formats on
-http://dev.mysql.com/doc; if you're interested in the DocBook XML
-sources go to http://svn.mysql.com.
+http://dev.mysql.com/doc.

=== modified file 'Percona-Server/INSTALL-SOURCE'
--- Percona-Server/INSTALL-SOURCE	2013-05-10 09:39:17 +0000
+++ Percona-Server/INSTALL-SOURCE	2013-06-20 15:23:53 +0000
@@ -4,5 +4,4 @@
   http://dev.mysql.com/doc/refman/5.5/en/source-installation.html
 
 The MySQL Reference Manual is also available in various formats on
-http://dev.mysql.com/doc; if you're interested in the DocBook XML
-sources go to http://svn.mysql.com.
+http://dev.mysql.com/doc.

=== modified file 'Percona-Server/INSTALL-WIN-SOURCE'
--- Percona-Server/INSTALL-WIN-SOURCE	2013-05-10 09:39:17 +0000
+++ Percona-Server/INSTALL-WIN-SOURCE	2013-06-20 15:23:53 +0000
@@ -5,5 +5,4 @@
   http://dev.mysql.com/doc/refman/5.5/en/source-installation.html
 
 The MySQL Reference Manual is also available in various formats on
-http://dev.mysql.com/doc; if you're interested in the DocBook XML
-sources go to http://svn.mysql.com.
+http://dev.mysql.com/doc.

=== modified file 'Percona-Server/README'
--- Percona-Server/README	2013-01-01 02:38:33 +0000
+++ Percona-Server/README	2013-06-20 15:23:53 +0000
@@ -1,56 +1,56 @@
-MySQL Server 5.6
-
-This is a release of MySQL, a dual-license SQL database server.
-For the avoidance of doubt, this particular copy of the software 
-is released under the version 2 of the GNU General Public License. 
-MySQL is brought to you by Oracle.
-
-Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
-
-License information can be found in the COPYING file.
-
-MySQL FOSS License Exception
-We want free and open source software applications under certain
-licenses to be able to use specified GPL-licensed MySQL client
-libraries despite the fact that not all such FOSS licenses are
-compatible with version 2 of the GNU General Public License.  
-Therefore there are special exceptions to the terms and conditions 
-of the GPLv2 as applied to these client libraries, which are 
-identified and described in more detail in the FOSS License 
-Exception at 
-<http://www.mysql.com/about/legal/licensing/foss-exception.html>.
-
-This distribution may include materials developed by third
-parties. For license and attribution notices for these
-materials, please refer to the documentation that accompanies
-this distribution (see the "Licenses for Third-Party Components"
-appendix) or view the online documentation at 
-<http://dev.mysql.com/doc/>.
-
-GPLv2 Disclaimer
-For the avoidance of doubt, except that if any license choice
-other than GPL or LGPL is available it will apply instead, 
-Oracle elects to use only the General Public License version 2 
-(GPLv2) at this time for any software where a choice of GPL 
-license versions is made available with the language indicating 
-that GPLv2 or any later version may be used, or where a choice 
-of which version of the GPL is applied is otherwise unspecified.
-
-For further information about MySQL or additional documentation, 
-see:
-- The latest information about MySQL: http://www.mysql.com
-- The current MySQL documentation: http://dev.mysql.com/doc
-
-Some Reference Manual sections of special interest:
-- If you are migrating from an older version of MySQL, please 
-  read the "Upgrading from..." section.
-- To see what MySQL can do, take a look at the features section.
-- For installation instructions, see the Installing and Upgrading
-  chapter.
-- For the new features/bugfix history, see the MySQL Change History 
-  appendix.
-
-You can browse the MySQL Reference Manual online or download it 
-in any of several formats at the URL given earlier in this file.
-Source distributions include a local copy of the manual in the
-Docs directory.
+MySQL Server 5.6
+
+This is a release of MySQL, a dual-license SQL database server.
+For the avoidance of doubt, this particular copy of the software 
+is released under the version 2 of the GNU General Public License. 
+MySQL is brought to you by Oracle.
+
+Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+
+License information can be found in the COPYING file.
+
+MySQL FOSS License Exception
+We want free and open source software applications under certain
+licenses to be able to use specified GPL-licensed MySQL client
+libraries despite the fact that not all such FOSS licenses are
+compatible with version 2 of the GNU General Public License.  
+Therefore there are special exceptions to the terms and conditions 
+of the GPLv2 as applied to these client libraries, which are 
+identified and described in more detail in the FOSS License 
+Exception at 
+<http://www.mysql.com/about/legal/licensing/foss-exception.html>.
+
+This distribution may include materials developed by third
+parties. For license and attribution notices for these
+materials, please refer to the documentation that accompanies
+this distribution (see the "Licenses for Third-Party Components"
+appendix) or view the online documentation at 
+<http://dev.mysql.com/doc/>.
+
+GPLv2 Disclaimer
+For the avoidance of doubt, except that if any license choice
+other than GPL or LGPL is available it will apply instead, 
+Oracle elects to use only the General Public License version 2 
+(GPLv2) at this time for any software where a choice of GPL 
+license versions is made available with the language indicating 
+that GPLv2 or any later version may be used, or where a choice 
+of which version of the GPL is applied is otherwise unspecified.
+
+For further information about MySQL or additional documentation, 
+see:
+- The latest information about MySQL: http://www.mysql.com
+- The current MySQL documentation: http://dev.mysql.com/doc
+
+Some Reference Manual sections of special interest:
+- If you are migrating from an older version of MySQL, please 
+  read the "Upgrading from..." section.
+- To see what MySQL can do, take a look at the features section.
+- For installation instructions, see the Installing and Upgrading
+  chapter.
+- For the new features/bugfix history, see the MySQL Change History 
+  appendix.
+
+You can browse the MySQL Reference Manual online or download it 
+in any of several formats at the URL given earlier in this file.
+Source distributions include a local copy of the manual in the
+Docs directory.

=== modified file 'Percona-Server/VERSION'
--- Percona-Server/VERSION	2013-05-12 09:13:00 +0000
+++ Percona-Server/VERSION	2013-06-20 15:23:53 +0000
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=6
-MYSQL_VERSION_PATCH=11
+MYSQL_VERSION_PATCH=12
 MYSQL_VERSION_EXTRA=

=== modified file 'Percona-Server/client/CMakeLists.txt'
--- Percona-Server/client/CMakeLists.txt	2013-05-22 08:50:07 +0000
+++ Percona-Server/client/CMakeLists.txt	2013-06-20 15:23:53 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
   ${CMAKE_SOURCE_DIR}/regex
   ${CMAKE_SOURCE_DIR}/sql
   ${CMAKE_SOURCE_DIR}/strings
-  ${READLINE_INCLUDE_DIR}
+  ${EDITLINE_INCLUDE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
 )
 
@@ -30,13 +30,11 @@
 ## We will need libeay32.dll and ssleay32.dll when running client executables.
 COPY_OPENSSL_DLLS(copy_openssl_client)
 
-
-ADD_DEFINITIONS(${READLINE_DEFINES})
 ADD_DEFINITIONS(${SSL_DEFINES})
 MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)
 TARGET_LINK_LIBRARIES(mysql mysqlclient)
 IF(UNIX)
-  TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
+  TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
 ENDIF(UNIX)
 
 MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)

=== modified file 'Percona-Server/client/completion_hash.h'
--- Percona-Server/client/completion_hash.h	2013-02-26 05:45:28 +0000
+++ Percona-Server/client/completion_hash.h	2013-06-20 15:23:53 +0000
@@ -13,8 +13,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA */
 
 #ifndef _HASH_
 #define _HASH_

=== modified file 'Percona-Server/client/echo.c'
--- Percona-Server/client/echo.c	2013-02-26 05:45:28 +0000
+++ Percona-Server/client/echo.c	2013-06-20 15:23:53 +0000
@@ -12,7 +12,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 /*
   echo is a replacement for the "echo" command builtin to cmd.exe

=== modified file 'Percona-Server/client/mysql.cc'
--- Percona-Server/client/mysql.cc	2013-06-12 05:31:35 +0000
+++ Percona-Server/client/mysql.cc	2013-06-20 15:23:53 +0000
@@ -102,7 +102,7 @@
 #if defined(__WIN__)
 #include <conio.h>
 #else
-#include <readline/readline.h>
+#include <readline.h>
 #define HAVE_READLINE
 #define USE_POPEN
 #endif
@@ -169,6 +169,7 @@
 static char *opt_bind_addr = NULL;
 static int connect_flag=CLIENT_INTERACTIVE;
 static my_bool opt_binary_mode= FALSE;
+static my_bool opt_connect_expired_password= FALSE;
 static char *current_host,*current_db,*current_user=0,*opt_password=0,
             *current_prompt=0, *delimiter_str= 0,
             *default_charset= (char*) MYSQL_AUTODETECT_CHARSET_NAME,
@@ -1770,6 +1771,11 @@
    &opt_server_public_key, &opt_server_public_key, 0,
    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #endif
+  {"connect-expired-password", 0,
+   "Notify the server that this client is prepared to handle expired "
+   "password sandbox mode.",
+   &opt_connect_expired_password, &opt_connect_expired_password, 0, GET_BOOL,
+   NO_ARG, 0, 0, 0, 0, 0, 0},
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 
@@ -2044,7 +2050,7 @@
   String buffer;
 #endif
 
-  char	*line;
+  char	*line= NULL;
   char	in_string=0;
   ulong line_number=0;
   bool ml_comment= 0;  
@@ -2130,6 +2136,13 @@
 #else
       if (opt_outfile)
 	fputs(prompt, OUTFILE);
+      /*
+        free the previous entered line.
+        Note: my_free() cannot be used here as the memory was allocated under
+        the readline/libedit library.
+      */
+      if (line)
+        free(line);
       line= readline(prompt);
 #endif /* defined(__WIN__) */
 
@@ -2189,6 +2202,14 @@
 #if defined(__WIN__)
   buffer.free();
   tmpbuf.free();
+#else
+  if (interactive)
+    /*
+      free the last entered line.
+      Note: my_free() cannot be used here as the memory was allocated under
+      the readline/libedit library.
+    */
+    free(line);
 #endif
 
   /*
@@ -3035,7 +3056,7 @@
   for (i= 0; i < histignore_patterns.elements; i++)
   {
     tmp= dynamic_element(&histignore_patterns, i, LEX_STRING *);
-    if ((rc= charset_info->coll->wildcmp(&my_charset_latin1,
+    if ((rc= charset_info->coll->wildcmp(charset_info,
                                          string, string + strlen(string),
                                          tmp->str, tmp->str + tmp->length,
                                          wild_prefix, wild_one,
@@ -4729,7 +4750,8 @@
 sql_real_connect(char *host,char *database,char *user,char *password,
 		 uint silent)
 {
-  my_bool interactive= status.batch ? FALSE : TRUE;
+  my_bool handle_expired= (opt_connect_expired_password || !status.batch) ?
+    TRUE : FALSE;
 
   if (connected)
   {
@@ -4821,7 +4843,7 @@
   mysql_options(&mysql, MYSQL_OPT_CONNECT_ATTR_RESET, 0);
   mysql_options4(&mysql, MYSQL_OPT_CONNECT_ATTR_ADD, 
                  "program_name", "mysql");
-  mysql_options(&mysql, MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS, &interactive);
+  mysql_options(&mysql, MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS, &handle_expired);
 
   if (!mysql_real_connect(&mysql, host, user, password,
                           database, opt_mysql_port, opt_mysql_unix_port,

=== modified file 'Percona-Server/client/mysql_plugin.c'
--- Percona-Server/client/mysql_plugin.c	2013-02-26 05:45:28 +0000
+++ Percona-Server/client/mysql_plugin.c	2013-06-20 15:23:53 +0000
@@ -12,7 +12,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 */
 
 #include <m_string.h>

=== modified file 'Percona-Server/client/mysql_upgrade.c'
--- Percona-Server/client/mysql_upgrade.c	2013-05-12 06:24:46 +0000
+++ Percona-Server/client/mysql_upgrade.c	2013-06-20 15:23:53 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -40,7 +40,7 @@
 static char mysqlcheck_path[FN_REFLEN];
 
 static my_bool opt_force, opt_verbose, debug_info_flag, debug_check_flag,
-               opt_systables_only;
+               opt_systables_only, opt_version_check;
 static uint my_end_arg= 0;
 static char *opt_user= (char*)"root";
 
@@ -129,6 +129,12 @@
    "Base name of shared memory.", 0,
    0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #endif
+  {"version-check", 'k', "Run this program only if its \'server version\' "
+   "matches the version of the server to which it's connecting, (enabled by "
+   "default); use --skip-version-check to avoid this check. Note: the \'server "
+   "version\' of the program is the version of the MySQL server with which it "
+   "was built/distributed.", &opt_version_check, &opt_version_check, 0,
+   GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
   {"socket", 'S', "The socket file to use for connection.",
    0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #include <sslopt-longopts.h>
@@ -286,6 +292,7 @@
             my_progname, optid == 'b' ? "basedir" : "datadir");
     /* FALLTHROUGH */
 
+  case 'k':                                     /* --version-check */
   case 'v': /* --verbose   */
   case 'f': /* --force     */
   case 's':                                     /* --upgrade-system-tables */
@@ -552,6 +559,8 @@
 static int extract_variable_from_show(DYNAMIC_STRING* ds, char* value)
 {
   char *value_start, *value_end;
+  size_t len;
+
   /*
     The query returns "datadir\t<datadir>\n", skip past
     the tab
@@ -564,7 +573,9 @@
   if ((value_end= strchr(value_start, '\n')) == NULL)
     return 1; /* Unexpected result */
 
-  strncpy(value, value_start, MY_MIN(FN_REFLEN, value_end - value_start));
+  len= (size_t) MY_MIN(FN_REFLEN, value_end-value_start);
+  strncpy(value, value_start, len);
+  value[len]= '\0';
   return 0;
 }
 
@@ -891,6 +902,55 @@
 };
 
 
+/* Convert the specified version string into the numeric format. */
+static ulong STDCALL calc_server_version(char *some_version)
+{
+  uint major, minor, version;
+  char *point= some_version, *end_point;
+  major=   (uint) strtoul(point, &end_point, 10);   point=end_point+1;
+  minor=   (uint) strtoul(point, &end_point, 10);   point=end_point+1;
+  version= (uint) strtoul(point, &end_point, 10);
+  return (ulong) major * 10000L + (ulong)(minor * 100 + version);
+}
+
+/**
+  Check if the server version matches with the server version mysql_upgrade
+  was compiled with.
+
+  @return 0 match successful
+          1 failed
+*/
+static int check_version_match(void)
+{
+  DYNAMIC_STRING ds_version;
+  char version_str[NAME_CHAR_LEN + 1];
+
+  if (init_dynamic_string(&ds_version, NULL, NAME_CHAR_LEN, NAME_CHAR_LEN))
+    die("Out of memory");
+
+  if (run_query("show variables like 'version'",
+                &ds_version, FALSE) ||
+      extract_variable_from_show(&ds_version, version_str))
+  {
+    dynstr_free(&ds_version);
+    return 1;                                   /* Query failed */
+  }
+
+  dynstr_free(&ds_version);
+
+  if (calc_server_version((char *) version_str) != MYSQL_VERSION_ID)
+  {
+    fprintf(stderr, "Error: Server version (%s) does not match with the "
+            "version of\nthe server (%s) with which this program was built/"
+            "distributed. You can\nuse --skip-version-check to skip this "
+            "check.\n", version_str, MYSQL_SERVER_VERSION);
+    return 1;
+  }
+  else
+    return 0;
+}
+
+
 int main(int argc, char **argv)
 {
   char self_name[FN_REFLEN];
@@ -957,6 +1017,9 @@
     die(NULL);
   }
 
+  if (opt_version_check && check_version_match())
+    die("Upgrade failed");
+
   /*
     Run "mysqlcheck" and "mysql_fix_privilege_tables.sql"
     First run mysqlcheck on the system database.

=== modified file 'Percona-Server/client/mysqlbinlog.cc'
--- Percona-Server/client/mysqlbinlog.cc	2013-05-12 09:13:00 +0000
+++ Percona-Server/client/mysqlbinlog.cc	2013-06-20 15:23:53 +0000
@@ -187,6 +187,10 @@
             *opt_exclude_gtids_str= NULL;
 static my_bool opt_skip_gtids= 0;
 static bool filter_based_on_gtids= false;
+
+static bool in_transaction= false;
+static bool seen_gtids= false;
+
 static Exit_status dump_local_log_entries(PRINT_EVENT_INFO *print_event_info,
                                           const char* logname);
 static Exit_status dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info,
@@ -745,6 +749,60 @@
        filtered= filtered || opt_skip_gtids;
     }
     break;
+    /* Skip previous gtids if --skip-gtids is set. */
+    case PREVIOUS_GTIDS_LOG_EVENT:
+      filtered= opt_skip_gtids;
+    break;
+
+    /*
+      Transaction boundaries reset the global filtering flag.
+
+      Since in the relay log a transaction can span multiple
+      log files, we do not reset filter_based_on_gtids flag when
+      processing control events (they can appear in the middle
+      of a transaction). But then, if:
+
+        FILE1: ... GTID BEGIN QUERY QUERY COMMIT ROTATE
+        FILE2: FD BEGIN QUERY QUERY COMMIT
+
+      Events on the second file would not be outputted, even
+      though they should.
+    */
+    case XID_EVENT:
+      filtered= filter_based_on_gtids;
+      filter_based_on_gtids= false;
+    break;
+    case QUERY_EVENT:
+      filtered= filter_based_on_gtids;
+      if (((Query_log_event *)ev)->ends_group())
+        filter_based_on_gtids= false;
+    break;
+
+    /*
+      Never skip STOP, FD, ROTATE, IGNORABLE or INCIDENT events.
+      SLAVE_EVENT and START_EVENT_V3 are there for completion.
+
+      Although in the binlog transactions do not span multiple
+      log files, in the relay-log, that can happen. As such,
+      we need to explicitly state that we do not filter these
+      events, because there is a chance that they appear in the
+      middle of a filtered transaction, e.g.:
+
+         FILE1: ... GTID BEGIN QUERY QUERY ROTATE
+         FILE2: FD QUERY QUERY COMMIT GTID BEGIN ...
+
+      In this case, ROTATE and FD events should be processed and
+      outputted.
+    */
+    case START_EVENT_V3: /* for completion */
+    case SLAVE_EVENT: /* for completion */
+    case STOP_EVENT:
+    case FORMAT_DESCRIPTION_EVENT:
+    case ROTATE_EVENT:
+    case IGNORABLE_LOG_EVENT:
+    case INCIDENT_EVENT:
+      filtered= false;
+    break;
     default:
       filtered= filter_based_on_gtids;
     break;
@@ -842,7 +900,9 @@
       bool parent_query_skips=
           !((Query_log_event*) ev)->is_trans_keyword() &&
            shall_skip_database(((Query_log_event*) ev)->db);
-           
+      bool ends_group= ((Query_log_event*) ev)->ends_group();
+      bool starts_group= ((Query_log_event*) ev)->starts_group();
+
       for (uint i= 0; i < buff_ev.elements; i++) 
       {
         buff_event_info pop_event_array= *dynamic_element(&buff_ev, i, buff_event_info *);
@@ -865,12 +925,28 @@
           statements in the Query_log_event, we still need to handle DDL,
           which causes a commit itself.
         */
-        print_event_info->skipped_event_in_transaction= true;
+
+        if (seen_gtids && !in_transaction && !starts_group && !ends_group)
+        {
+          /*
+            For DDLs, print the COMMIT right away. 
+          */
+          fprintf(result_file, "COMMIT /* added by mysqlbinlog */%s\n", print_event_info->delimiter);
+          print_event_info->skipped_event_in_transaction= false;
+          in_transaction= false;
+        }
+        else
+          print_event_info->skipped_event_in_transaction= true;
         goto end;
       }
 
-      if (((Query_log_event*) ev)->ends_group())
+      if (ends_group)
+      {
+        in_transaction= false;
         print_event_info->skipped_event_in_transaction= false;
+      }
+      else if (starts_group)
+        in_transaction= true;
 
       ev->print(result_file, print_event_info);
       if (head->error == -1)
@@ -1113,9 +1189,13 @@
       bool skip_event= (ignored_map != NULL);
       /*
         end of statement check:
-           i) destroy/free ignored maps
-          ii) if skip event, flush cache now
-      */
+        i) destroy/free ignored maps
+        ii) if skip event
+              a) set the unflushed_events flag to false
+              b) since we are skipping the last event,
+                 append END-MARKER(') to body cache (if required)
+              c) flush cache now
+       */
       if (stmt_end)
       {
         /*
@@ -1134,11 +1214,22 @@
            event was not skipped).
         */
         if (skip_event)
+        {
+          // set the unflushed_events flag to false
+          print_event_info->have_unflushed_events= FALSE;
+
+          // append END-MARKER(') with delimiter
+          IO_CACHE *const body_cache= &print_event_info->body_cache;
+          if (my_b_tell(body_cache))
+            my_b_printf(body_cache, "'%s\n", print_event_info->delimiter);
+
+          // flush cache
           if ((copy_event_cache_to_file_and_reinit(&print_event_info->head_cache,
                                                    result_file, stop_never /* flush result_file */) ||
               copy_event_cache_to_file_and_reinit(&print_event_info->body_cache,
                                                   result_file, stop_never /* flush result_file */)))
             goto err;
+        }
       }
 
       /* skip the event check */
@@ -1188,8 +1279,10 @@
       }
       break;
     }
+    case ANONYMOUS_GTID_LOG_EVENT:
     case GTID_LOG_EVENT:
     {
+      seen_gtids= true;
       if (print_event_info->skipped_event_in_transaction == true)
         fprintf(result_file, "COMMIT /* added by mysqlbinlog */%s\n", print_event_info->delimiter);
       print_event_info->skipped_event_in_transaction= false;
@@ -1201,12 +1294,40 @@
     }
     case XID_EVENT:
     {
+      in_transaction= false;
       print_event_info->skipped_event_in_transaction= false;
       ev->print(result_file, print_event_info);
       if (head->error == -1)
         goto err;
       break;
     }
+    case ROTATE_EVENT:
+    {
+      Rotate_log_event *rev= (Rotate_log_event *) ev;
+      /* no transaction context, gtids seen and not a fake rotate */
+      if (seen_gtids)
+      {
+        /*   
+          Fake rotate events have 'when' set to zero. @c fake_rotate_event(...).
+        */
+        bool is_fake= (rev->when.tv_sec == 0);
+        if (!in_transaction && !is_fake)
+        {
+          /*
+            If processing multiple files, we must reset this flag,
+            since there may be no gtids on the next one.
+          */
+          seen_gtids= false;
+          fprintf(result_file, "SET @@SESSION.GTID_NEXT= 'AUTOMATIC' "
+                               "/* added by mysqlbinlog */ %s\n", 
+                               print_event_info->delimiter);
+        }
+      }
+      ev->print(result_file, print_event_info);
+      if (head->error == -1)
+        goto err;
+      break;
+    }
     case PREVIOUS_GTIDS_LOG_EVENT:
       if (one_database && !opt_skip_gtids)
         warning("The option --database has been used. It may filter "
@@ -2135,6 +2256,11 @@
             */
             continue;
           }
+          /*
+             Reset the value of '# at pos' field shown against first event of
+             next binlog file (fake rotate) picked by mysqlbinlog --to-last-log
+         */
+          old_off= start_position_mot;
           len= 1; // fake Rotate, so don't increment old_off
         }
       }

=== modified file 'Percona-Server/client/mysqldump.c'
--- Percona-Server/client/mysqldump.c	2013-05-27 03:01:29 +0000
+++ Percona-Server/client/mysqldump.c	2013-06-20 15:23:53 +0000
@@ -12,7 +12,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 */
 
 /* mysqldump.c  - Dump a tables contents and format to an ASCII file
@@ -5818,18 +5818,28 @@
   MYSQL_RES  *gtid_mode_res;
   MYSQL_ROW  gtid_mode_row;
   char       *gtid_mode_val= 0;
+  char buf[32], query[64];
 
   if (opt_set_gtid_purged_mode == SET_GTID_PURGED_OFF)
     return FALSE;  /* nothing to be done */
 
+  /*
+    Check if the server has the knowledge of GTIDs(pre mysql-5.6)
+    or if the gtid_mode is ON or OFF.
+  */
+  my_snprintf(query, sizeof(query), "SHOW VARIABLES LIKE %s",
+              quote_for_like("gtid_mode", buf));
 
-  /* check if gtid_mode is ON or OFF */
-  if (mysql_query_with_error_report(mysql_con, &gtid_mode_res,
-                                    "SELECT @@GTID_MODE"))
+  if (mysql_query_with_error_report(mysql_con, &gtid_mode_res, query))
     return TRUE;
 
   gtid_mode_row = mysql_fetch_row(gtid_mode_res);
-  gtid_mode_val = (char*)gtid_mode_row[0];
+
+  /*
+     gtid_mode_row is NULL for pre 5.6 versions. For versions >= 5.6,
+     get the gtid_mode value from the second column.
+  */
+  gtid_mode_val = gtid_mode_row ? (char*)gtid_mode_row[1] : NULL;
 
   if (gtid_mode_val && strcmp(gtid_mode_val, "OFF"))
   {

=== modified file 'Percona-Server/client/mysqltest.cc'
--- Percona-Server/client/mysqltest.cc	2013-05-27 03:01:29 +0000
+++ Percona-Server/client/mysqltest.cc	2013-06-20 15:23:53 +0000
@@ -3407,8 +3407,12 @@
   /* Set default wild chars for wild_compare, is changed in embedded mode */
   set_wild_chars(1);
   
+  uint length;
+  /* Storing the length of the path to the file, so it can be reused */
+  length= ds_file_to_remove.length;
   for (i= 0; i < (uint) dir_info->number_off_files; i++)
   {
+    ds_file_to_remove.length= length;
     file= dir_info->dir_entry + i;
     /* Remove only regular files, i.e. no directories etc. */
     /* if (!MY_S_ISREG(file->mystat->st_mode)) */
@@ -3418,8 +3422,10 @@
     if (ds_wild.length &&
         wild_compare(file->name, ds_wild.str, 0))
       continue;
-    ds_file_to_remove.length= ds_directory.length + 1;
-    ds_file_to_remove.str[ds_directory.length + 1]= 0;
+    /* Not required as the var ds_file_to_remove.length already has the
+       length in canonnicalized form */
+    /* ds_file_to_remove.length= ds_directory.length + 1;
+    ds_file_to_remove.str[ds_directory.length + 1]= 0; */
     dynstr_append(&ds_file_to_remove, file->name);
     DBUG_PRINT("info", ("removing file: %s", ds_file_to_remove.str));
     error= my_delete(ds_file_to_remove.str, MYF(0)) != 0;

=== modified file 'Percona-Server/client/sql_string.h'
--- Percona-Server/client/sql_string.h	2013-05-27 03:01:29 +0000
+++ Percona-Server/client/sql_string.h	2013-06-20 15:23:53 +0000
@@ -1,7 +1,7 @@
 #ifndef CLIENT_SQL_STRING_INCLUDED
 #define CLIENT_SQL_STRING_INCLUDED
 
-/* 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
@@ -237,6 +237,7 @@
       DBUG_ASSERT(!s.uses_buffer_owned_by(this));
       free();
       Ptr=s.Ptr ; str_length=s.str_length ; Alloced_length=s.Alloced_length;
+      str_charset=s.str_charset;
       alloced=0;
     }
     return *this;

=== modified file 'Percona-Server/cmake/build_configurations/mysql_release.cmake'
--- Percona-Server/cmake/build_configurations/mysql_release.cmake	2013-05-12 06:24:46 +0000
+++ Percona-Server/cmake/build_configurations/mysql_release.cmake	2013-06-20 15:23:53 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -33,7 +33,6 @@
 
 IF(UNIX)
   SET(WITH_EXTRA_CHARSETS all CACHE STRING "")
-  OPTION(WITH_LIBEDIT  "" ON)
 
   OPTION(WITH_PIC "" ON) # Why?
 

=== modified file 'Percona-Server/cmake/os/WindowsCache.cmake'
--- Percona-Server/cmake/os/WindowsCache.cmake	2011-07-03 23:56:47 +0000
+++ Percona-Server/cmake/os/WindowsCache.cmake	2013-06-20 15:23:53 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, 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
@@ -116,7 +116,7 @@
 SET(HAVE_LRAND48 CACHE  INTERNAL "")
 SET(HAVE_LSTAT CACHE  INTERNAL "")
 SET(HAVE_MADVISE CACHE  INTERNAL "")
-SET(HAVE_MALLINFO CACHE  INTERNAL "")
+SET(HAVE_MALLOC_INFO CACHE  INTERNAL "")
 SET(HAVE_MALLOC_H 1 CACHE  INTERNAL "")
 SET(HAVE_MEMALIGN CACHE  INTERNAL "")
 SET(HAVE_MEMCPY 1 CACHE  INTERNAL "")

=== modified file 'Percona-Server/cmake/package_name.cmake'
--- Percona-Server/cmake/package_name.cmake	2013-05-12 06:24:46 +0000
+++ Percona-Server/cmake/package_name.cmake	2013-06-20 15:23:53 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -82,12 +82,20 @@
         MATH(EXPR VER  "${VER} -4")
         SET(DEFAULT_PLATFORM "osx10.${VER}")
       ENDIF()
-      LIST(LENGTH CMAKE_OSX_ARCHITECTURES LEN)
-      IF(LEN GREATER 1)
-        SET(DEFAULT_MACHINE "universal")
+
+      IF(CMAKE_OSX_ARCHITECTURES)
+        LIST(LENGTH CMAKE_OSX_ARCHITECTURES LEN)
+        IF(LEN GREATER 1)
+          SET(DEFAULT_MACHINE "universal")
+        ELSE()
+          SET(DEFAULT_MACHINE "${CMAKE_OSX_ARCHITECTURES}")
+        ENDIF()
       ELSE()
-        SET(DEFAULT_MACHINE "${CMAKE_OSX_ARCHITECTURES}")
+        IF(64BIT)
+          SET(DEFAULT_MACHINE "x86_64")
+        ENDIF()
       ENDIF()
+
       IF(DEFAULT_MACHINE MATCHES "i386")
         SET(DEFAULT_MACHINE "x86")
       ENDIF()

=== modified file 'Percona-Server/cmake/readline.cmake'
--- Percona-Server/cmake/readline.cmake	2013-02-26 05:45:28 +0000
+++ Percona-Server/cmake/readline.cmake	2013-06-20 15:23:53 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -13,6 +13,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
 
+# cmake -DWITH_EDITLINE=system|bundled
+# bundled is the default
+
 MACRO (MYSQL_CHECK_MULTIBYTE)
   CHECK_INCLUDE_FILE(wctype.h HAVE_WCTYPE_H)
   CHECK_INCLUDE_FILE(wchar.h HAVE_WCHAR_H)
@@ -117,85 +120,93 @@
  ENDIF()
 ENDMACRO()
 
-MACRO (MYSQL_USE_BUNDLED_LIBEDIT)
+MACRO (MYSQL_USE_BUNDLED_EDITLINE)
   SET(USE_LIBEDIT_INTERFACE 1)
   SET(HAVE_HIST_ENTRY 1)
-  SET(READLINE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/cmd-line-utils/libedit)
-  SET(READLINE_LIBRARY edit)
+  SET(EDITLINE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/cmd-line-utils/libedit/editline)
+  SET(EDITLINE_LIBRARY edit)
   FIND_CURSES()
   ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/cmd-line-utils/libedit)
 ENDMACRO()
 
-MACRO (FIND_SYSTEM_LIBEDIT name)
-  
-  FIND_PATH(${name}_INCLUDE_DIR readline/readline.h ) 
-  FIND_LIBRARY(${name}_LIBRARY NAMES ${name})
-  MARK_AS_ADVANCED(${name}_INCLUDE_DIR  ${name}_LIBRARY)
+MACRO (FIND_SYSTEM_EDITLINE)
+  FIND_PATH(FOUND_EDITLINE_READLINE
+    NAMES editline/readline.h
+  )
+  IF(FOUND_EDITLINE_READLINE)
+    SET(EDITLINE_INCLUDE_DIR "${FOUND_EDITLINE_READLINE}/editline")
+  ELSE()
+    # Different path on FreeBSD
+    FIND_PATH(FOUND_EDIT_READLINE_READLINE
+      NAMES edit/readline/readline.h
+    )
+    IF(FOUND_EDIT_READLINE_READLINE)
+      SET(EDITLINE_INCLUDE_DIR "${FOUND_EDIT_READLINE_READLINE}/edit/readline")
+    ENDIF()
+  ENDIF()
+
+  FIND_LIBRARY(EDITLINE_LIBRARY
+    NAMES
+    edit
+  )
+  MARK_AS_ADVANCED(EDITLINE_INCLUDE_DIR EDITLINE_LIBRARY)
+
+  MESSAGE(STATUS "EDITLINE_INCLUDE_DIR ${EDITLINE_INCLUDE_DIR}")
+  MESSAGE(STATUS "EDITLINE_LIBRARY ${EDITLINE_LIBRARY}")
 
   INCLUDE(CheckCXXSourceCompiles)
-  SET(CMAKE_REQUIRES_LIBRARIES ${${name}_LIBRARY})
-
-  IF(${name}_LIBRARY AND ${name}_INCLUDE_DIR)
-    SET(SYSTEM_READLINE_FOUND 1)
-    SET(CMAKE_REQUIRED_LIBRARIES ${${name}_LIBRARY})
+  IF(EDITLINE_LIBRARY AND EDITLINE_INCLUDE_DIR)
+    SET(CMAKE_REQUIRED_INCLUDES ${EDITLINE_INCLUDE_DIR})
+    SET(CMAKE_REQUIRED_LIBRARIES ${EDITLINE_LIBRARY})
     CHECK_CXX_SOURCE_COMPILES("
     #include <stdio.h>
-    #include <readline/readline.h> 
+    #include <readline.h>
     int main(int argc, char **argv)
     {
        HIST_ENTRY entry;
        return 0;
     }"
-    ${name}_HAVE_HIST_ENTRY)
-    
+    EDITLINE_HAVE_HIST_ENTRY)
+
     CHECK_CXX_SOURCE_COMPILES("
     #include <stdio.h>
-    #include <readline/readline.h>
+    #include <readline.h>
     int main(int argc, char **argv)
     {
-      char res= *(*rl_completion_entry_function)(0,0);
+      typedef int MYFunction(const char*, int);
+      MYFunction* myf= rl_completion_entry_function;
+      int res= (myf)(NULL, 0);
       completion_matches(0,0);
+      return res;
     }"
-    ${name}_USE_LIBEDIT_INTERFACE)
+    EDITLINE_HAVE_COMPLETION)
 
-    CHECK_CXX_SOURCE_COMPILES("
-    #include <stdio.h>
-    #include <readline/readline.h>
-    int main(int argc, char **argv)
-    {
-      rl_completion_func_t *func1= (rl_completion_func_t*)0;
-      rl_compentry_func_t *func2= (rl_compentry_func_t*)0;
-    }"
-    ${name}_USE_NEW_READLINE_INTERFACE)
-  
-    IF(${name}_USE_LIBEDIT_INTERFACE  OR ${name}_USE_NEW_READLINE_INTERFACE)
-      SET(READLINE_LIBRARY ${${name}_LIBRARY})
-      SET(READLINE_INCLUDE_DIR ${${name}_INCLUDE_DIR})
-      SET(HAVE_HIST_ENTRY ${${name}_HAVE_HIST_ENTRY})
-      SET(USE_LIBEDIT_INTERFACE ${${name}_USE_LIBEDIT_INTERFACE})
-      SET(USE_NEW_READLINE_INTERFACE ${${name}_USE_NEW_READLINE_INTERFACE}) 
-      SET(READLINE_FOUND 1)
+    IF(EDITLINE_HAVE_COMPLETION)
+      SET(HAVE_HIST_ENTRY ${EDITLINE_HAVE_HIST_ENTRY})
+      SET(USE_LIBEDIT_INTERFACE 1)
+      SET(EDITLINE_FOUND 1)
     ENDIF()
   ENDIF()
 ENDMACRO()
 
 
-MACRO (MYSQL_CHECK_READLINE)
+IF (NOT WITH_EDITLINE AND NOT WIN32)
+  SET(WITH_EDITLINE "bundled" CACHE STRING "By default use bundled editline")
+ENDIF()
+
+MACRO (MYSQL_CHECK_EDITLINE)
   IF (NOT WIN32)
     MYSQL_CHECK_MULTIBYTE()
-    IF(NOT CYGWIN)	
-      SET(WITH_LIBEDIT  ON CACHE BOOL  "Use bundled libedit")
-      # Bundled libedit does not compile on cygwin, only readline
-    ENDIF()
 
-    IF(WITH_LIBEDIT) 
-     MYSQL_USE_BUNDLED_LIBEDIT()
+    IF(WITH_EDITLINE STREQUAL "bundled") 
+      MYSQL_USE_BUNDLED_EDITLINE()
+    ELSEIF(WITH_EDITLINE STREQUAL "system")
+      FIND_SYSTEM_EDITLINE()
+      IF(NOT EDITLINE_FOUND)
+        MESSAGE(FATAL_ERROR "Cannot find system editline libraries.") 
+      ENDIF()
     ELSE()
-      FIND_SYSTEM_LIBEDIT(edit)
-      IF(NOT_LIBEDIT_FOUND)
-        MESSAGE(FATAL_ERROR "Cannot find system libedit libraries.Use WITH_LIBEDIT") 
-      ENDIF()
+      MESSAGE(FATAL_ERROR "WITH_EDITLINE must be bundled or system")
     ENDIF()
   ENDIF(NOT WIN32)
 ENDMACRO()
-

=== renamed directory 'Percona-Server/cmd-line-utils/libedit/readline' => 'Percona-Server/cmd-line-utils/libedit/editline'
=== modified file 'Percona-Server/cmd-line-utils/libedit/readline.c'
--- Percona-Server/cmd-line-utils/libedit/readline.c	2012-01-12 13:03:44 +0000
+++ Percona-Server/cmd-line-utils/libedit/readline.c	2013-06-20 15:23:53 +0000
@@ -51,7 +51,7 @@
 #else
 #include "np/vis.h"
 #endif
-#include "readline/readline.h"
+#include "editline/readline.h"
 #include "el.h"
 #include "fcns.h"		/* for EL_NUM_FCNS */
 #include "histedit.h"

=== modified file 'Percona-Server/config.h.cmake'
--- Percona-Server/config.h.cmake	2013-05-12 06:24:46 +0000
+++ Percona-Server/config.h.cmake	2013-06-20 15:23:53 +0000
@@ -120,7 +120,6 @@
 /* Readline */
 #cmakedefine HAVE_HIST_ENTRY 1
 #cmakedefine USE_LIBEDIT_INTERFACE 1
-#cmakedefine USE_NEW_READLINE_INTERFACE 1
 
 #cmakedefine FIONREAD_IN_SYS_IOCTL 1
 #cmakedefine GWINSZ_IN_SYS_IOCTL 1
@@ -194,7 +193,7 @@
 #cmakedefine HAVE_DECL_MADVISE 1
 #cmakedefine HAVE_DECL_TGOTO 1
 #cmakedefine HAVE_DECL_MHA_MAPSIZE_VA
-#cmakedefine HAVE_MALLINFO 1
+#cmakedefine HAVE_MALLOC_INFO 1
 #cmakedefine HAVE_MEMCPY 1
 #cmakedefine HAVE_MEMMOVE 1
 #cmakedefine HAVE_MKSTEMP 1

=== modified file 'Percona-Server/configure.cmake'
--- Percona-Server/configure.cmake	2013-05-12 06:24:46 +0000
+++ Percona-Server/configure.cmake	2013-06-20 15:23:53 +0000
@@ -441,7 +441,7 @@
 CHECK_FUNCTION_EXISTS (longjmp HAVE_LONGJMP)
 CHECK_FUNCTION_EXISTS (lstat HAVE_LSTAT)
 CHECK_FUNCTION_EXISTS (madvise HAVE_MADVISE)
-CHECK_FUNCTION_EXISTS (mallinfo HAVE_MALLINFO)
+CHECK_FUNCTION_EXISTS (malloc_info HAVE_MALLOC_INFO)
 CHECK_FUNCTION_EXISTS (memcpy HAVE_MEMCPY)
 CHECK_FUNCTION_EXISTS (memmove HAVE_MEMMOVE)
 CHECK_FUNCTION_EXISTS (mkstemp HAVE_MKSTEMP)
@@ -695,6 +695,7 @@
 
 # check whether time_t is unsigned
 CHECK_C_SOURCE_COMPILES("
+#include <time.h>
 int main()
 {
   int array[(((time_t)-1) > 0) ? 1 : -1];

=== modified file 'Percona-Server/dbug/dbug.c'
--- Percona-Server/dbug/dbug.c	2013-01-18 04:53:12 +0000
+++ Percona-Server/dbug/dbug.c	2013-06-20 15:23:53 +0000
@@ -598,7 +598,7 @@
         if (!is_shared(stack, keywords))
           FreeList(stack->keywords);
         stack->keywords=NULL;
-        stack->flags &= ~DEBUG_ON;
+        stack->flags&= ~DEBUG_ON;
         break;
       }
       if (rel && is_shared(stack, keywords))
@@ -606,11 +606,29 @@
       if (sign < 0)
       {
         if (DEBUGGING)
+        {
           stack->keywords= ListDel(stack->keywords, control, end);
-      break;
-      }
-      stack->keywords= ListAdd(stack->keywords, control, end);
-      stack->flags |= DEBUG_ON;
+          /* Turn off DEBUG_ON if it is last keyword to be removed. */
+          if (stack->keywords == NULL)
+            stack->flags&= ~DEBUG_ON;
+        }
+        break;
+      }
+
+      /* Do not add keyword if debugging all is enabled. */
+      if (!(DEBUGGING && stack->keywords == NULL))
+      {
+        stack->keywords= ListAdd(stack->keywords, control, end);
+        stack->flags|= DEBUG_ON;
+      }
+
+      /* If debug all is enabled, make the keyword list empty. */
+      if (sign == 1 && control == end)
+      {
+        FreeList(stack->keywords);
+        stack->keywords= NULL;
+      }
+
       break;
     case 'D':
       stack->delay= atoi(control);
@@ -1035,7 +1053,7 @@
       } while (0)
 #define str_to_buf(S)    do {                   \
         char_to_buf(',');                       \
-        buf=strnmov(buf, (S), len+1);           \
+        buf=strnmov(buf, (S), end-buf);         \
         if (buf >= end) goto overflow;          \
       } while (0)
 #define list_to_buf(l, f)  do {                 \
@@ -1358,6 +1376,38 @@
 /*
  *  FUNCTION
  *
+ *    _db_enabled_    check if debug is enabled for the keyword used in
+ *    DBUG_PRINT
+ *
+ *  SYNOPSIS
+ *
+ *    int _db_enabled_();
+ *
+ *  DESCRIPTION
+ *
+ *    The function checks if the debug output is to be enabled for the keyword
+ *    specified in DBUG_PRINT macro. _db_doprnt_ will be called only if this
+ *    function evaluates to 1.
+ */
+
+int _db_enabled_()
+{
+  CODE_STATE *cs;
+
+  get_code_state_or_return 0;
+
+  if (! DEBUGGING)
+    return 0;
+
+  if (_db_keyword_(cs, cs->u_keyword, 0))
+    return 1;
+
+  return 0;
+}
+
+/*
+ *  FUNCTION
+ *
  *      _db_doprnt_    handle print of debug lines
  *
  *  SYNOPSIS
@@ -1368,11 +1418,9 @@
  *
  *  DESCRIPTION
  *
- *      When invoked via one of the DBUG macros, tests the current keyword
- *      set by calling _db_pargs_() to see if that macro has been selected
- *      for processing via the debugger control string, and if so, handles
- *      printing of the arguments via the format string.  The line number
- *      of the DBUG macro in the source is found in u_line.
+ *      This function handles the printing of the arguments via the format
+ *      string.  The line number of the DBUG macro in the source is found in
+ *      u_line.
  *
  *      Note that the format string SHOULD NOT include a terminating
  *      newline, this is supplied automatically.
@@ -1385,6 +1433,8 @@
 {
   va_list args;
   CODE_STATE *cs;
+  int save_errno;
+
   get_code_state_or_return;
 
   /* Dirty read, for DBUG_PRINT() performance. */
@@ -1394,21 +1444,19 @@
   va_start(args,format);
   read_lock_stack(cs);
 
-  if (_db_keyword_(cs, cs->u_keyword, 0))
-  {
-    int save_errno=errno;
-    if (!cs->locked)
-      pthread_mutex_lock(&THR_LOCK_dbug);
-    DoPrefix(cs, cs->u_line);
-    if (TRACING)
-      Indent(cs, cs->level + 1);
-    else
-      (void) fprintf(cs->stack->out_file, "%s: ", cs->func);
-    (void) fprintf(cs->stack->out_file, "%s: ", cs->u_keyword);
-    DbugVfprintf(cs->stack->out_file, format, args);
-    DbugFlush(cs);
-    errno=save_errno;
-  }
+  save_errno=errno;
+  if (!cs->locked)
+    pthread_mutex_lock(&THR_LOCK_dbug);
+  DoPrefix(cs, cs->u_line);
+  if (TRACING)
+    Indent(cs, cs->level + 1);
+  else
+    (void) fprintf(cs->stack->out_file, "%s: ", cs->func);
+  (void) fprintf(cs->stack->out_file, "%s: ", cs->u_keyword);
+  DbugVfprintf(cs->stack->out_file, format, args);
+  DbugFlush(cs);
+  errno=save_errno;
+
   unlock_stack(cs);
   va_end(args);
 }

=== modified file 'Percona-Server/extra/charset2html.c'
--- Percona-Server/extra/charset2html.c	2013-02-26 05:45:28 +0000
+++ Percona-Server/extra/charset2html.c	2013-06-20 15:23:53 +0000
@@ -12,7 +12,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA 
  */
 
 /*

=== modified file 'Percona-Server/extra/yassl/COPYING'
--- Percona-Server/extra/yassl/COPYING	2006-08-01 18:20:46 +0000
+++ Percona-Server/extra/yassl/COPYING	2013-06-20 15:23:53 +0000
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@
 
     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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 
 Also add information on how to contact you by electronic and paper mail.

=== modified file 'Percona-Server/extra/yassl/include/openssl/generate_prefix_files.pl'
--- Percona-Server/extra/yassl/include/openssl/generate_prefix_files.pl	2010-12-28 18:57:23 +0000
+++ Percona-Server/extra/yassl/include/openssl/generate_prefix_files.pl	2013-06-20 15:23:53 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 #
 # This script generates defines for all functions

=== modified file 'Percona-Server/extra/yassl/src/crypto_wrapper.cpp'
--- Percona-Server/extra/yassl/src/crypto_wrapper.cpp	2013-05-12 06:24:46 +0000
+++ Percona-Server/extra/yassl/src/crypto_wrapper.cpp	2013-06-20 15:23:53 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 /*  The crypto wrapper source implements the policies for the cipher
  *  components used by SSL.

=== modified file 'Percona-Server/extra/yassl/src/make.bat'
--- Percona-Server/extra/yassl/src/make.bat	2013-02-26 05:45:28 +0000
+++ Percona-Server/extra/yassl/src/make.bat	2013-06-20 15:23:53 +0000
@@ -11,7 +11,7 @@
 REM 
 REM You should have received a copy of the GNU General Public License
 REM along with this program; if not, write to the Free Software
-REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 REM quick and dirty build file for testing different MSDEVs
 setlocal 

=== modified file 'Percona-Server/extra/yassl/src/yassl_int.cpp'
--- Percona-Server/extra/yassl/src/yassl_int.cpp	2013-05-12 06:24:46 +0000
+++ Percona-Server/extra/yassl/src/yassl_int.cpp	2013-06-20 15:23:53 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 /* yaSSL internal source implements SSL supporting types not specified in the
  * draft along with type conversion functions.

=== modified file 'Percona-Server/extra/yassl/taocrypt/COPYING'
--- Percona-Server/extra/yassl/taocrypt/COPYING	2006-09-25 14:40:29 +0000
+++ Percona-Server/extra/yassl/taocrypt/COPYING	2013-06-20 15:23:53 +0000
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@
 
     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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 
 Also add information on how to contact you by electronic and paper mail.

=== modified file 'Percona-Server/extra/yassl/taocrypt/benchmark/make.bat'
--- Percona-Server/extra/yassl/taocrypt/benchmark/make.bat	2013-02-26 05:45:28 +0000
+++ Percona-Server/extra/yassl/taocrypt/benchmark/make.bat	2013-06-20 15:23:53 +0000
@@ -11,7 +11,7 @@
 REM 
 REM You should have received a copy of the GNU General Public License
 REM along with this program; if not, write to the Free Software
-REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 REM quick and dirty build file for testing different MSDEVs
 setlocal 

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/algebra.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/algebra.cpp	2013-05-12 06:24:46 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/algebra.cpp	2013-06-20 15:23:53 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 /* based on Wei Dai's algebra.cpp from CryptoPP */
 #undef  NDEBUG

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/integer.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/integer.cpp	2013-05-12 06:24:46 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/integer.cpp	2013-06-20 15:23:53 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 /* based on Wei Dai's integer.cpp from CryptoPP */
 

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/make.bat'
--- Percona-Server/extra/yassl/taocrypt/src/make.bat	2013-02-26 05:45:28 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/make.bat	2013-06-20 15:23:53 +0000
@@ -11,7 +11,7 @@
 REM 
 REM You should have received a copy of the GNU General Public License
 REM along with this program; if not, write to the Free Software
-REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 REM quick and dirty build file for testing different MSDEVs
 setlocal 

=== modified file 'Percona-Server/extra/yassl/taocrypt/test/make.bat'
--- Percona-Server/extra/yassl/taocrypt/test/make.bat	2013-02-26 05:45:28 +0000
+++ Percona-Server/extra/yassl/taocrypt/test/make.bat	2013-06-20 15:23:53 +0000
@@ -11,7 +11,7 @@
 REM 
 REM You should have received a copy of the GNU General Public License
 REM along with this program; if not, write to the Free Software
-REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 REM quick and dirty build file for testing different MSDEVs
 setlocal 

=== modified file 'Percona-Server/extra/yassl/testsuite/make.bat'
--- Percona-Server/extra/yassl/testsuite/make.bat	2013-02-26 05:45:28 +0000
+++ Percona-Server/extra/yassl/testsuite/make.bat	2013-06-20 15:23:53 +0000
@@ -11,7 +11,7 @@
 REM 
 REM You should have received a copy of the GNU General Public License
 REM along with this program; if not, write to the Free Software
-REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 REM quick and dirty build file for testing different MSDEVs
 setlocal 

=== modified file 'Percona-Server/include/my_bitmap.h'
--- Percona-Server/include/my_bitmap.h	2012-08-22 01:40:20 +0000
+++ Percona-Server/include/my_bitmap.h	2013-06-20 15:23:53 +0000
@@ -12,7 +12,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 #ifndef _my_bitmap_h_
 #define _my_bitmap_h_

=== modified file 'Percona-Server/include/my_compare.h'
--- Percona-Server/include/my_compare.h	2011-03-29 12:56:34 +0000
+++ Percona-Server/include/my_compare.h	2013-06-20 15:23:53 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 #ifndef _my_compare_h
 #define _my_compare_h

=== modified file 'Percona-Server/include/my_dbug.h'
--- Percona-Server/include/my_dbug.h	2013-02-26 05:45:28 +0000
+++ Percona-Server/include/my_dbug.h	2013-06-20 15:23:53 +0000
@@ -39,7 +39,7 @@
 };
 
 struct  _db_code_state_;
-extern  my_bool _dbug_on_;
+extern  MYSQL_PLUGIN_IMPORT my_bool _dbug_on_;
 extern  my_bool _db_keyword_(struct _db_code_state_ *, const char *, int);
 extern  int _db_explain_(struct _db_code_state_ *cs, char *buf, size_t len);
 extern  int _db_explain_init_(char *buf, size_t len);
@@ -55,6 +55,7 @@
                        struct _db_stack_frame_ *_stack_frame_);
 extern  void _db_return_(uint _line_, struct _db_stack_frame_ *_stack_frame_);
 extern  void _db_pargs_(uint _line_,const char *keyword);
+extern  int _db_enabled_();
 extern  void _db_doprnt_(const char *format,...)
   ATTRIBUTE_FORMAT(printf, 1, 2);
 extern  void _db_dump_(uint _line_,const char *keyword,
@@ -80,7 +81,17 @@
 #define DBUG_EVALUATE_IF(keyword,a1,a2) \
         (_db_keyword_(0,(keyword), 1) ? (a1) : (a2))
 #define DBUG_PRINT(keyword,arglist) \
-        do {_db_pargs_(__LINE__,keyword); _db_doprnt_ arglist;} while(0)
+        do \
+        {  \
+          if (_dbug_on_) \
+          { \
+            _db_pargs_(__LINE__,keyword); \
+            if (_db_enabled_()) \
+            {  \
+              _db_doprnt_ arglist; \
+            } \
+          } \
+        } while(0)
 #define DBUG_PUSH(a1) _db_push_ (a1)
 #define DBUG_POP() _db_pop_ ()
 #define DBUG_SET(a1) _db_set_ (a1)

=== modified file 'Percona-Server/include/my_global.h'
--- Percona-Server/include/my_global.h	2012-03-06 14:29:42 +0000
+++ Percona-Server/include/my_global.h	2013-06-20 15:23:53 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2001, 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
@@ -47,10 +47,6 @@
 #define HAVE_ERRNO_AS_DEFINE
 #endif /* __CYGWIN__ */
 
-#if defined(__OpenBSD__) && (OpenBSD >= 200411)
-#define HAVE_ERRNO_AS_DEFINE
-#endif
-
 #if defined(i386) && !defined(__i386__)
 #define __i386__
 #endif
@@ -1021,8 +1017,6 @@
 #define reg16 register
 #endif
 
-#include <my_dbug.h>
-
 /* Some helper macros */
 #define YESNO(X) ((X) ? "yes" : "no")
 
@@ -1190,6 +1184,8 @@
 #endif
 #endif
 
+#include <my_dbug.h>
+
 /* Defines that are unique to the embedded version of MySQL */
 
 #ifdef EMBEDDED_LIBRARY

=== modified file 'Percona-Server/include/my_md5.h'
--- Percona-Server/include/my_md5.h	2013-05-12 06:24:46 +0000
+++ Percona-Server/include/my_md5.h	2013-06-20 15:23:53 +0000
@@ -14,7 +14,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 #include "m_string.h"
 

=== modified file 'Percona-Server/include/my_pthread.h'
--- Percona-Server/include/my_pthread.h	2013-05-12 06:24:46 +0000
+++ Percona-Server/include/my_pthread.h	2013-06-20 15:23:53 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 /* Defines to make different thread packages compatible */
 

=== modified file 'Percona-Server/include/my_sys.h'
--- Percona-Server/include/my_sys.h	2013-05-12 09:13:00 +0000
+++ Percona-Server/include/my_sys.h	2013-06-20 15:23:53 +0000
@@ -234,13 +234,8 @@
 #define my_afree(PTR) my_free(PTR)
 #endif /* HAVE_ALLOCA */
 
-#ifndef errno				/* did we already get it? */
-#ifdef HAVE_ERRNO_AS_DEFINE
 #include <errno.h>			/* errno is a define */
-#else
-extern int errno;			/* declare errno */
-#endif
-#endif					/* #ifndef errno */
+
 extern char *home_dir;			/* Home directory for user */
 extern const char *my_progname;		/* program-name (printed in errors) */
 extern char curr_dir[];		/* Current directory for user */

=== modified file 'Percona-Server/include/my_user.h'
--- Percona-Server/include/my_user.h	2013-02-26 05:45:28 +0000
+++ Percona-Server/include/my_user.h	2013-06-20 15:23:53 +0000
@@ -12,7 +12,7 @@
 
  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 /*
   This is a header for libraries containing functions used in both server and

=== modified file 'Percona-Server/include/my_xml.h'
--- Percona-Server/include/my_xml.h	2013-02-26 05:45:28 +0000
+++ Percona-Server/include/my_xml.h	2013-06-20 15:23:53 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA  */
 
 
 #ifndef _my_xml_h

=== modified file 'Percona-Server/include/mysql/innodb_priv.h'
--- Percona-Server/include/mysql/innodb_priv.h	2010-11-22 14:08:51 +0000
+++ Percona-Server/include/mysql/innodb_priv.h	2013-06-20 15:23:53 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 #ifndef INNODB_PRIV_INCLUDED
 #define INNODB_PRIV_INCLUDED

=== modified file 'Percona-Server/include/mysql_time.h'
--- Percona-Server/include/mysql_time.h	2013-02-26 05:45:28 +0000
+++ Percona-Server/include/mysql_time.h	2013-06-20 15:23:53 +0000
@@ -11,7 +11,7 @@
 
  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 #ifndef _mysql_time_h_
 #define _mysql_time_h_

=== modified file 'Percona-Server/include/t_ctype.h'
--- Percona-Server/include/t_ctype.h	2010-10-27 11:32:32 +0000
+++ Percona-Server/include/t_ctype.h	2013-06-20 15:23:53 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 /*
   Copyright (C) 1998, 1999 by Pruet Boonma, all rights reserved.

=== modified file 'Percona-Server/include/typelib.h'
--- Percona-Server/include/typelib.h	2013-02-26 05:45:28 +0000
+++ Percona-Server/include/typelib.h	2013-06-20 15:23:53 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 
 #ifndef _typelib_h

=== modified file 'Percona-Server/libmysql/authentication_win/common.cc'
--- Percona-Server/libmysql/authentication_win/common.cc	2011-09-21 11:01:41 +0000
+++ Percona-Server/libmysql/authentication_win/common.cc	2013-06-20 15:23:53 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 #include "common.h"
 #include <sddl.h>   // for ConvertSidToStringSid()

=== modified file 'Percona-Server/libmysql/authentication_win/common.h'
--- Percona-Server/libmysql/authentication_win/common.h	2011-09-21 11:01:41 +0000
+++ Percona-Server/libmysql/authentication_win/common.h	2013-06-20 15:23:53 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 #ifndef COMMON_H
 #define COMMON_H

=== modified file 'Percona-Server/libmysql/authentication_win/handshake.cc'
--- Percona-Server/libmysql/authentication_win/handshake.cc	2011-04-29 21:53:46 +0000
+++ Percona-Server/libmysql/authentication_win/handshake.cc	2013-06-20 15:23:53 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 #include "handshake.h"
 
@@ -280,10 +280,9 @@
 
 void Security_buffer::free(void)
 {
-  if (!m_allocated)
-    return;
-  if (!ptr())
-    return;
-  FreeContextBuffer(ptr());
-  m_allocated= false;
+  if (m_allocated && NULL != ptr())
+  {
+    FreeContextBuffer(ptr());
+    init(NULL, 0);
+  }
 }

=== modified file 'Percona-Server/libmysql/authentication_win/handshake.h'
--- Percona-Server/libmysql/authentication_win/handshake.h	2011-04-29 21:53:46 +0000
+++ Percona-Server/libmysql/authentication_win/handshake.h	2013-06-20 15:23:53 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 #ifndef HANDSHAKE_H
 #define HANDSHAKE_H
@@ -53,7 +53,12 @@
   }
 
   /// If @c false, no deallocation will be done in the destructor.
-  bool m_allocated;
+  const bool m_allocated;
+
+  // Copying/assignment is not supported and can lead to memory leaks
+  // So declaring copy constructor and assignment operator as private
+  Security_buffer( const Security_buffer& );
+  const Security_buffer& operator=( const Security_buffer& );
 
  public:
 
@@ -75,11 +80,6 @@
     return m_buf.cbBuffer;
   }
 
-  bool is_valid() const
-  {
-    return ptr() != NULL;
-  }
-
   const Blob as_blob() const
   {
     return Blob(ptr(), len());

=== modified file 'Percona-Server/libmysql/authentication_win/handshake_client.cc'
--- Percona-Server/libmysql/authentication_win/handshake_client.cc	2011-10-19 11:42:46 +0000
+++ Percona-Server/libmysql/authentication_win/handshake_client.cc	2013-06-20 15:23:53 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 #include "handshake.h"
 

=== modified file 'Percona-Server/libmysql/authentication_win/log_client.cc'
--- Percona-Server/libmysql/authentication_win/log_client.cc	2011-09-21 11:01:41 +0000
+++ Percona-Server/libmysql/authentication_win/log_client.cc	2013-06-20 15:23:53 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 #include <my_global.h>
 #include "common.h"

=== modified file 'Percona-Server/libmysql/authentication_win/plugin_client.cc'
--- Percona-Server/libmysql/authentication_win/plugin_client.cc	2011-06-03 13:17:35 +0000
+++ Percona-Server/libmysql/authentication_win/plugin_client.cc	2013-06-20 15:23:53 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 #include <my_global.h>
 #include <mysql.h>

=== modified file 'Percona-Server/libmysql/conf_to_src.c'
--- Percona-Server/libmysql/conf_to_src.c	2013-02-26 05:45:28 +0000
+++ Percona-Server/libmysql/conf_to_src.c	2013-06-20 15:23:53 +0000
@@ -14,7 +14,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 /* can't use -lmysys because this prog is used to create -lstrings */
 

=== modified file 'Percona-Server/libmysqld/examples/CMakeLists.txt'
--- Percona-Server/libmysqld/examples/CMakeLists.txt	2013-05-12 06:24:46 +0000
+++ Percona-Server/libmysqld/examples/CMakeLists.txt	2013-06-20 15:23:53 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
                     ${CMAKE_SOURCE_DIR}/libmysqld/include
                     ${CMAKE_SOURCE_DIR}/regex 
                     ${CMAKE_SOURCE_DIR}/tests
-                    ${READLINE_INCLUDE_DIR}                 
+                    ${EDITLINE_INCLUDE_DIR}                 
                     )
 
 
@@ -28,8 +28,7 @@
                ../../client/mysql.cc ../../client/readline.cc)
 TARGET_LINK_LIBRARIES(mysql_embedded mysqlserver)
 IF(UNIX)
-  ADD_DEFINITIONS(${READLINE_DEFINES})
-  TARGET_LINK_LIBRARIES(mysql_embedded ${READLINE_LIBRARY})
+  TARGET_LINK_LIBRARIES(mysql_embedded ${EDITLINE_LIBRARY})
   SET_TARGET_PROPERTIES(mysql_embedded PROPERTIES ENABLE_EXPORTS TRUE)
 ENDIF(UNIX)
 

=== modified file 'Percona-Server/libmysqld/examples/test-run'
--- Percona-Server/libmysqld/examples/test-run	2010-12-28 18:57:23 +0000
+++ Percona-Server/libmysqld/examples/test-run	2013-06-20 15:23:53 +0000
@@ -13,7 +13,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 # This is slapped together as a quick way to run the tests and
 # is not meant for prime time.  Please hack at it and submit

=== modified file 'Percona-Server/libmysqld/lib_sql.cc'
--- Percona-Server/libmysqld/lib_sql.cc	2013-05-12 06:24:46 +0000
+++ Percona-Server/libmysqld/lib_sql.cc	2013-06-20 15:23:53 +0000
@@ -511,6 +511,7 @@
   char ***argvp= NULL;
   int fake_argc= 1;
   char *fake_argv[2];
+  char **foo= &fake_argv[0];
   char fake_server[]= "server";
   char fake_embedded[]= "embedded";
   char *fake_groups[]= { fake_server, fake_embedded, NULL };
@@ -530,7 +531,6 @@
     fake_argv[0]= fake_name;
     fake_argv[1]= NULL;
 
-    char **foo= &fake_argv[0];
     argcp= &fake_argc;
     argvp= &foo;
   }

=== modified file 'Percona-Server/man/comp_err.1'
--- Percona-Server/man/comp_err.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/comp_err.1	2013-06-20 15:23:53 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBcomp_err\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBCOMP_ERR\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBCOMP_ERR\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/innochecksum.1'
--- Percona-Server/man/innochecksum.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/innochecksum.1	2013-06-20 15:23:53 +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: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBINNOCHECKSUM\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBINNOCHECKSUM\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/msql2mysql.1'
--- Percona-Server/man/msql2mysql.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/msql2mysql.1	2013-06-20 15:23:53 +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: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMSQL2MYSQL\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMSQL2MYSQL\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/my_print_defaults.1'
--- Percona-Server/man/my_print_defaults.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/my_print_defaults.1	2013-06-20 15:23:53 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmy_print_defaults\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMY_PRINT_DEFAULTS" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMY_PRINT_DEFAULTS" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/myisam_ftdump.1'
--- Percona-Server/man/myisam_ftdump.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/myisam_ftdump.1	2013-06-20 15:23:53 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmyisam_ftdump\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYISAM_FTDUMP\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYISAM_FTDUMP\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/myisamchk.1'
--- Percona-Server/man/myisamchk.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/myisamchk.1	2013-06-20 15:23:53 +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: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYISAMCHK\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYISAMCHK\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/myisamlog.1'
--- Percona-Server/man/myisamlog.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/myisamlog.1	2013-06-20 15:23:53 +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: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYISAMLOG\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYISAMLOG\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/myisampack.1'
--- Percona-Server/man/myisampack.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/myisampack.1	2013-06-20 15:23:53 +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: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYISAMPACK\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYISAMPACK\FR" "1" "05/21/2013" "MySQL 5\&.6" "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-05-30 15:34:14 +0000
+++ Percona-Server/man/mysql-stress-test.pl.1	2013-06-20 15:23:53 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql-stress-test.pl\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 03/28/2013
+.\"      Date: 05/16/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\-STRESS\-TE" "1" "03/28/2013" "MySQL" "MySQL Database System"
+.TH "\FBMYSQL\-STRESS\-TE" "1" "05/16/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-05-30 15:34:14 +0000
+++ Percona-Server/man/mysql-test-run.pl.1	2013-06-20 15:23:53 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql-test-run.pl\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 03/28/2013
+.\"      Date: 05/16/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\-TEST\-RUN\" "1" "03/28/2013" "MySQL" "MySQL Database System"
+.TH "\FBMYSQL\-TEST\-RUN\" "1" "05/16/2013" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysql.1'
--- Percona-Server/man/mysql.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysql.1	2013-06-20 15:23:53 +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: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1738,8 +1738,8 @@
 \(lq;\(rq, instances of that character are sent to the server without interpretation\&. However, the server itself still interprets
 \(lq;\(rq
 as a statement delimiter and processes statements accordingly\&. This behavior on the server side comes into play for multiple\-statement execution (see
-Section\ \&21.8.16, \(lqC API Support for Multiple Statement Execution\(rq), and for parsing the body of stored procedures and functions, triggers, and events (see
-Section\ \&18.1, \(lqDefining Stored Programs\(rq)\&.
+Section\ \&22.8.17, \(lqC API Support for Multiple Statement Execution\(rq), and for parsing the body of stored procedures and functions, triggers, and events (see
+Section\ \&19.1, \(lqDefining Stored Programs\(rq)\&.
 .RE
 .sp
 .RS 4
@@ -3411,7 +3411,7 @@
 option\&.
 .PP
 For more information about auto\-reconnect and its effect on state information when a reconnection occurs, see
-Section\ \&21.8.15, \(lqControlling Automatic Reconnection Behavior\(rq\&.
+Section\ \&22.8.16, \(lqControlling Automatic Reconnection Behavior\(rq\&.
 .SH "COPYRIGHT"
 .br
 .PP

=== modified file 'Percona-Server/man/mysql.server.1'
--- Percona-Server/man/mysql.server.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysql.server.1	2013-06-20 15:23:53 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql.server\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\&.SERVER\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL\&.SERVER\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,7 +49,7 @@
 /etc/init\&.d
 directory with the name
 mysql\&. You need not install it manually\&. See
-Section\ \&2.5.1, \(lqInstalling MySQL from RPM Packages on Linux\(rq, for more information on the Linux RPM packages\&.
+Section\ \&2.5.1, \(lqInstalling MySQL on Linux Using RPM Packages\(rq, for more information on the Linux RPM packages\&.
 .PP
 Some vendors provide RPM packages that install a startup script under a different name such as
 \fBmysqld\fR\&.

=== modified file 'Percona-Server/man/mysql_client_test.1'
--- Percona-Server/man/mysql_client_test.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysql_client_test.1	2013-06-20 15:23:53 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_client_test\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 03/28/2013
+.\"      Date: 05/16/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CLIENT_TEST" "1" "03/28/2013" "MySQL" "MySQL Database System"
+.TH "\FBMYSQL_CLIENT_TEST" "1" "05/16/2013" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysql_config.1'
--- Percona-Server/man/mysql_config.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysql_config.1	2013-06-20 15:23:53 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_config\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CONFIG\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_CONFIG\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysql_config_editor.1'
--- Percona-Server/man/mysql_config_editor.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysql_config_editor.1	2013-06-20 15:23:53 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_config_editor\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CONFIG_EDIT" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_CONFIG_EDIT" "1" "05/21/2013" "MySQL 5\&.6" "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-05-30 15:34:14 +0000
+++ Percona-Server/man/mysql_convert_table_format.1	2013-06-20 15:23:53 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_convert_table_format\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CONVERT_TAB" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_CONVERT_TAB" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysql_find_rows.1'
--- Percona-Server/man/mysql_find_rows.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysql_find_rows.1	2013-06-20 15:23:53 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_find_rows\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_FIND_ROWS\F" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_FIND_ROWS\F" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysql_fix_extensions.1'
--- Percona-Server/man/mysql_fix_extensions.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysql_fix_extensions.1	2013-06-20 15:23:53 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_fix_extensions\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_FIX_EXTENSI" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_FIX_EXTENSI" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysql_install_db.1'
--- Percona-Server/man/mysql_install_db.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysql_install_db.1	2013-06-20 15:23:53 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_install_db\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_INSTALL_DB\" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_INSTALL_DB\" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysql_plugin.1'
--- Percona-Server/man/mysql_plugin.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysql_plugin.1	2013-06-20 15:23:53 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_plugin\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_PLUGIN\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_PLUGIN\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysql_secure_installation.1'
--- Percona-Server/man/mysql_secure_installation.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysql_secure_installation.1	2013-06-20 15:23:53 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_secure_installation\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_SECURE_INST" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_SECURE_INST" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysql_setpermission.1'
--- Percona-Server/man/mysql_setpermission.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysql_setpermission.1	2013-06-20 15:23:53 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_setpermission\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_SETPERMISSI" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_SETPERMISSI" "1" "05/21/2013" "MySQL 5\&.6" "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-05-30 15:34:14 +0000
+++ Percona-Server/man/mysql_tzinfo_to_sql.1	2013-06-20 15:23:53 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_tzinfo_to_sql\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_TZINFO_TO_S" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_TZINFO_TO_S" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysql_upgrade.1'
--- Percona-Server/man/mysql_upgrade.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysql_upgrade.1	2013-06-20 15:23:53 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_upgrade\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_UPGRADE\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_UPGRADE\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -193,7 +193,7 @@
 \fBmysql_upgrade\fR
 is included in the server RPM but requires the client RPM because the latter includes
 \fBmysqlcheck\fR\&. (See
-Section\ \&2.5.1, \(lqInstalling MySQL from RPM Packages on Linux\(rq\&.)
+Section\ \&2.5.1, \(lqInstalling MySQL on Linux Using RPM Packages\(rq\&.)
 .PP
 \fBmysql_upgrade\fR
 does not upgrade the contents of the help tables\&. For upgrade instructions, see

=== modified file 'Percona-Server/man/mysql_waitpid.1'
--- Percona-Server/man/mysql_waitpid.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysql_waitpid.1	2013-06-20 15:23:53 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_waitpid\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_WAITPID\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_WAITPID\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysql_zap.1'
--- Percona-Server/man/mysql_zap.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysql_zap.1	2013-06-20 15:23:53 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_zap\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_ZAP\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_ZAP\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysqlaccess.1'
--- Percona-Server/man/mysqlaccess.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysqlaccess.1	2013-06-20 15:23:53 +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: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLACCESS\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLACCESS\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysqladmin.1'
--- Percona-Server/man/mysqladmin.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysqladmin.1	2013-06-20 15:23:53 +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: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLADMIN\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLADMIN\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -81,10 +81,10 @@
 .\}
 debug
 .sp
-Tell the server to write debug information to the error log\&.
+Tell the server to write debug information to the error log\&. Format and content of this information is subject to change\&.
 .sp
 This includes information about the Event Scheduler\&. See
-Section\ \&18.4.5, \(lqEvent Scheduler Status\(rq\&.
+Section\ \&19.4.5, \(lqEvent Scheduler Status\(rq\&.
 .RE
 .sp
 .RS 4

=== modified file 'Percona-Server/man/mysqlbinlog.1'
--- Percona-Server/man/mysqlbinlog.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysqlbinlog.1	2013-06-20 15:23:53 +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: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLBINLOG\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLBINLOG\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -981,6 +981,35 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlbinlog: server-id-bits option
+.\" server-id-bits option: mysqlbinlog
+\fB\-\-server\-id\-bits=\fR\fB\fIN\fR\fR
+.sp
+Use only the first
+\fIN\fR
+bits of the
+server_id
+to identify the server\&. If the binary log was written by a
+\fBmysqld\fR
+with server\-id\-bits set to less than 32 and user data stored in the most significant bit, running
+\fBmysqlbinlog\fR
+with
+\fB\-\-server\-id\-bits\fR
+set to 32 enables this data to be seen\&.
+.sp
+This option is supported only by the versions of
+\fBmysqlbinlog\fR
+supplied with the MySQL Cluster distribution, or built from the MySQL Cluster sources\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlbinlog: set-charset option
 .\" set-charset option: mysqlbinlog
 \fB\-\-set\-charset=\fR\fB\fIcharset_name\fR\fR

=== modified file 'Percona-Server/man/mysqlbug.1'
--- Percona-Server/man/mysqlbug.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysqlbug.1	2013-06-20 15:23:53 +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: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLBUG\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLBUG\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysqlcheck.1'
--- Percona-Server/man/mysqlcheck.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysqlcheck.1	2013-06-20 15:23:53 +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: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLCHECK\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLCHECK\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysqld.8'
--- Percona-Server/man/mysqld.8	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysqld.8	2013-06-20 15:23:53 +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: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLD\FR" "8" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLD\FR" "8" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysqld_multi.1'
--- Percona-Server/man/mysqld_multi.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysqld_multi.1	2013-06-20 15:23:53 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqld_multi\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLD_MULTI\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLD_MULTI\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysqld_safe.1'
--- Percona-Server/man/mysqld_safe.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysqld_safe.1	2013-06-20 15:23:53 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqld_safe\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLD_SAFE\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLD_SAFE\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysqldump.1'
--- Percona-Server/man/mysqldump.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysqldump.1	2013-06-20 15:23:53 +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: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLDUMP\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLDUMP\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -62,6 +62,13 @@
 To reload a dump file, you must have the same privileges needed to create each of the dumped objects by issuing
 CREATE
 statements manually\&.
+.PP
+\fBmysqldump\fR
+output can include
+ALTER DATABASE
+statements that change the database collation\&. These may be used when dumping stored programs to preserve their character encodings\&. To reload a dump file containing such statements, the
+ALTER
+privilege for the affected database is required\&.
         Performance and Scalability Considerations
 .PP
 mysqldump
@@ -1083,151 +1090,9 @@
 also is specified, in which case, a global read lock is acquired only for a short time at the beginning of the dump (see the description for
 \fB\-\-single\-transaction\fR)\&. In all cases, any action on logs happens at the exact moment of the dump\&.
 .sp
-It is also possible to set up a slave by dumping an existing slave of the master\&. To do this, use the following procedure on the existing slave:
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 1.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  1." 4.2
-.\}
-Stop the slave\*(Aqs SQL thread and get its current status:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-mysql> \fBSTOP SLAVE SQL_THREAD;\fR
-mysql> \fBSHOW SLAVE STATUS;\fR
-.fi
-.if n \{\
-.RE
-.\}
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 2.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  2." 4.2
-.\}
-From the output of the
-SHOW SLAVE STATUS
-statement, the binary log coordinates of the master server from which the new slave should start replicating are the values of the
-Relay_Master_Log_File
-and
-Exec_Master_Log_Pos
-fields\&. Denote those values as
-\fIfile_name\fR
-and
-\fIfile_pos\fR\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 3.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  3." 4.2
-.\}
-Dump the slave server:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-shell> \fBmysqldump \-\-master\-data=2 \-\-all\-databases > dumpfile\fR
-.fi
-.if n \{\
-.RE
-.\}
-.sp
-Using
-\fB\-\-master\-data=2\fR
-works only if binary logging has been enabled on the slave\&. Otherwise,
-\fBmysqldump\fR
-fails with the error
-Binlogging on server not active\&. In this case you must handle any locking issues in another manner, using one or more of
-\fB\-\-add\-locks\fR,
-\fB\-\-lock\-tables\fR,
-\fB\-\-lock\-all\-tables\fR, or
-\fB\-\-single\-transaction\fR, as required by your application and environment\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 4.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  4." 4.2
-.\}
-Restart the slave:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-mysql> \fBSTART SLAVE;\fR
-.fi
-.if n \{\
-.RE
-.\}
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 5.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  5." 4.2
-.\}
-On the new slave, load the dump file:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-shell> \fBmysql < dumpfile\fR
-.fi
-.if n \{\
-.RE
-.\}
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 6.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  6." 4.2
-.\}
-On the new slave, set the replication coordinates to those of the master server obtained earlier:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-mysql> \fBCHANGE MASTER TO\fR
-    \-> \fBMASTER_LOG_FILE = \*(Aq\fR\fB\fIfile_name\fR\fR\fB\*(Aq, MASTER_LOG_POS = \fR\fB\fIfile_pos\fR\fR\fB;\fR
-.fi
-.if n \{\
-.RE
-.\}
-.sp
-The
-CHANGE MASTER TO
-statement might also need other parameters, such as
-MASTER_HOST
-to point the slave to the correct master server host\&. Add any such parameters as necessary\&.
-.RE
+It is also possible to set up a slave by dumping an existing slave of the master, using the
+\fB\-\-dump\-slave\fR
+option\&.
 .sp
 Prior to MySQL 5\&.6\&.4, this option was required for dumping the replication log tables (see
 Section\ \&16.2.2, \(lqReplication Relay and Status Logs\(rq)\&.
@@ -2515,6 +2380,11 @@
 performance_schema
 database\&.
 .PP
+\fBmysqldump\fR
+also does not dump the MySQL Cluster
+ndbinfo
+information database\&.
+.PP
 Before MySQL 5\&.6\&.6,
 \fBmysqldump\fR
 does not dump the

=== modified file 'Percona-Server/man/mysqldumpslow.1'
--- Percona-Server/man/mysqldumpslow.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysqldumpslow.1	2013-06-20 15:23:53 +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: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLDUMPSLOW\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLDUMPSLOW\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysqlhotcopy.1'
--- Percona-Server/man/mysqlhotcopy.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysqlhotcopy.1	2013-06-20 15:23:53 +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: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLHOTCOPY\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLHOTCOPY\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysqlimport.1'
--- Percona-Server/man/mysqlimport.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysqlimport.1	2013-06-20 15:23:53 +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: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLIMPORT\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLIMPORT\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysqlshow.1'
--- Percona-Server/man/mysqlshow.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysqlshow.1	2013-06-20 15:23:53 +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: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLSHOW\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLSHOW\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysqlslap.1'
--- Percona-Server/man/mysqlslap.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysqlslap.1	2013-06-20 15:23:53 +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: 04/05/2013
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLSLAP\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLSLAP\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysqltest.1'
--- Percona-Server/man/mysqltest.1	2013-05-30 15:34:14 +0000
+++ Percona-Server/man/mysqltest.1	2013-06-20 15:23:53 +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: 03/28/2013
+.\"      Date: 05/16/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQLTEST\FR" "1" "03/28/2013" "MySQL" "MySQL Database System"
+.TH "\FBMYSQLTEST\FR" "1" "05/16/2013" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== added file 'Percona-Server/man/ndb-common-options.1'
--- Percona-Server/man/ndb-common-options.1	1970-01-01 00:00:00 +0000
+++ Percona-Server/man/ndb-common-options.1	2013-06-20 15:23:53 +0000
@@ -0,0 +1,679 @@
+'\" t
+.\"     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: 05/21/2013
+.\"    Manual: MySQL Database System
+.\"    Source: MySQL 5.6
+.\"  Language: English
+.\"
+.TH "OPTIONS COMMON TO MY" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.\" MySQL Cluster: administration
+.\" command-line options (MySQL Cluster)
+.\" program options (MySQL Cluster)
+.\" MySQL Cluster: ndbd
+.\" MySQL Cluster: mgm
+.\" MySQL Cluster: mgmd
+.SH "NAME"
+ndb-common-options \- MySQL Cluster Common Program Options
+.SH "DESCRIPTION"
+.PP
+All MySQL Cluster programs accept the options described in this section, with the following exceptions:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBmysqld\fR
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBndb_print_backup_file\fR
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBndb_print_schema_file\fR
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBndb_print_sys_file\fR
+.RE
+.PP
+Users of earlier MySQL Cluster versions should note that some of these options have been changed to make them consistent with one another as well as with
+\fBmysqld\fR\&. You can use the
+\fB\-\-help\fR
+option with any MySQL Cluster program\(emwith the exception of
+\fBndb_print_backup_file\fR,
+\fBndb_print_schema_file\fR, and
+\fBndb_print_sys_file\fR\(emto view a list of the options which the program supports\&.
+.PP
+The options in the following table are common to all MySQL Cluster executables (except those noted previously in this section)\&.
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&17.29.\ \&Common MySQL Cluster Program Options and Variables: MySQL Cluster NDB 7.3
+.TS
+allbox tab(:);
+lB lB lB.
+T{
+Format
+T}:T{
+Description
+T}:T{
+Added / Removed
+T}
+.T&
+l l l
+l l l
+l l l
+l l l
+l l l
+l l l
+l l l
+l l l
+l l l.
+T{
+.PP
+--help,
+.PP
+--usage,
+.PP
+-?
+T}:T{
+Display help message and exit
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+--ndb-connectstring=connectstring,
+.PP
+--connect-string=connectstring,
+.PP
+-c
+T}:T{
+Set connectstring for connecting to ndb_mgmd\&. Syntax:
+            [nodeid=<id>;][host=]<hostname>[:<port>]\&.
+            Overrides entries specified in NDB_CONNECTSTRING or my\&.cnf\&.
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+--ndb-mgmd-host=host[:port]
+T}:T{
+Set the host (and port, if desired) for connecting to the management
+            server
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+--ndb-nodeid=#
+T}:T{
+Set node id for this node
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+--ndb-optimized-node-selection
+T}:T{
+Select nodes for transactions in a more optimal way
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+--character-sets-dir=path
+T}:T{
+Directory where character sets are
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+--debug=options
+T}:T{
+Enable output from debug calls\&. Can be used only for versions compiled
+            with debugging enabled
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+--core-file
+T}:T{
+Write core on errors (defaults to TRUE in debug builds)
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+--version,
+.PP
+-V
+T}:T{
+Output version information and exit
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+.TE
+.sp 1
+.PP
+For options specific to individual MySQL Cluster programs, see
+Section\ \&17.4, \(lqMySQL Cluster Programs\(rq\&.
+.PP
+See
+Section\ \&17.3.4.2, \(lqMySQL Server Options for MySQL Cluster\(rq, for
+\fBmysqld\fR
+options relating to MySQL Cluster\&.
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" help option (MySQL Cluster programs)
+.\" usage option (MySQL Cluster programs)
+.\" -? option (MySQL Cluster programs)
+\fB\-\-help\fR,
+\fB\-\-usage\fR,
+\fB\-?\fR
+.TS
+allbox tab(:);
+l l s s
+l l s s
+l l s s.
+T{
+\fBCommand\-Line Format\fR
+T}:T{
+\-\-help
+T}
+T{
+T}:T{
+\-\-usage
+T}
+T{
+T}:T{
+\-?
+T}
+.TE
+.sp 1
+Prints a short list with descriptions of the available command options\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" character-sets-dir option (MySQL Cluster programs)
+.\" character-sets-dir option (MySQL Cluster programs)
+\fB\-\-character\-sets\-dir=\fR\fB\fIname\fR\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{
+\-\-character\-sets\-dir=path
+T}
+T{
+\ \&
+T}:T{
+\fBPermitted Values \fR
+T}
+:T{
+\fBType\fR
+T}:T{
+file name
+T}
+:T{
+\fBDefault\fR
+T}:T{
+T}
+.TE
+.sp 1
+Tells the program where to find character set information\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" ndb-connectstring option (MySQL Cluster programs)
+.\" connect-string option (MySQL Cluster programs)
+.\" -c option (MySQL Cluster programs)
+\fB\-\-ndb\-connectstring=\fR\fB\fIconnect_string\fR\fR,
+\fB\-\-connect\-string=\fR\fB\fIconnect_string\fR\fR,
+\fB\-c \fR\fB\fIconnect_string\fR\fR
+.TS
+allbox tab(:);
+l l s s
+l l s s
+l l s s
+l l s s
+^ l l s
+^ l l s.
+T{
+\fBCommand\-Line Format\fR
+T}:T{
+\-\-ndb\-connectstring=connectstring
+T}
+T{
+T}:T{
+\-\-connect\-string=connectstring
+T}
+T{
+T}:T{
+\-c
+T}
+T{
+\ \&
+T}:T{
+\fBPermitted Values \fR
+T}
+:T{
+\fBType\fR
+T}:T{
+string
+T}
+:T{
+\fBDefault\fR
+T}:T{
+localhost:1186
+T}
+.TE
+.sp 1
+This option takes a MySQL Cluster connectstring that specifies the management server for the application to connect to, as shown here:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+shell> \fBndbd \-\-ndb\-connectstring="nodeid=2;host=ndb_mgmd\&.mysql\&.com:1186"\fR
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+For more information, see
+Section\ \&17.3.2.3, \(lqThe MySQL Cluster Connectstring\(rq\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" core-file option (MySQL Cluster programs)
+\fB\-\-core\-file\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{
+\-\-core\-file
+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
+Write a core file if the program dies\&. The name and location of the core file are system\-dependent\&. (For MySQL Cluster programs nodes running on Linux, the default location is the program\*(Aqs working directory\(emfor a data node, this is the node\*(Aqs
+DataDir\&.) For some systems, there may be restrictions or limitations; for example, it might be necessary to execute
+\fBulimit \-c unlimited\fR
+before starting the server\&. Consult your system documentation for detailed information\&.
+.sp
+If MySQL Cluster was built using the
+\fB\-\-debug\fR
+option for
+\fBconfigure\fR, then
+\fB\-\-core\-file\fR
+is enabled by default\&. For regular builds,
+\fB\-\-core\-file\fR
+is disabled by default\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" debug option (MySQL Cluster programs)
+\fB\-\-debug[=\fR\fB\fIoptions\fR\fR\fB]\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{
+\-\-debug=options
+T}
+T{
+\ \&
+T}:T{
+\fBPermitted Values \fR
+T}
+:T{
+\fBType\fR
+T}:T{
+string
+T}
+:T{
+\fBDefault\fR
+T}:T{
+d:t:O,/tmp/ndb_restore\&.trace
+T}
+.TE
+.sp 1
+This option can be used only for versions compiled with debugging enabled\&. It is used to enable output from debug calls in the same manner as for the
+\fBmysqld\fR
+process\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" ndb-mgmd-host option (MySQL Cluster programs)
+\fB\-\-ndb\-mgmd\-host=\fR\fB\fIhost\fR\fR\fB[:\fR\fB\fIport\fR\fR\fB]\fR
+.TS
+allbox tab(:);
+l l s s
+l l s s
+l l s s
+^ l l s
+^ l l s.
+T{
+\fBCommand\-Line Format\fR
+T}:T{
+\-\-ndb\-mgmd\-host=host[:port]
+T}
+T{
+\fBOption\-File Format\fR
+T}:T{
+ndb\-mgmd\-host
+T}
+T{
+\ \&
+T}:T{
+\fBPermitted Values \fR
+T}
+:T{
+\fBType\fR
+T}:T{
+string
+T}
+:T{
+\fBDefault\fR
+T}:T{
+localhost:1186
+T}
+.TE
+.sp 1
+Can be used to set the host and port number of a single management server for the program to connect to\&. If the program requires node IDs or references to multiple management servers (or both) in its connection information, use the
+\fB\-\-ndb\-connectstring\fR
+option instead\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" ndb-nodeid option (MySQL Cluster programs)
+\fB\-\-ndb\-nodeid=\fR\fB\fI#\fR\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{
+\-\-ndb\-nodeid=#
+T}
+T{
+\ \&
+T}:T{
+\fBPermitted Values \fR
+T}
+:T{
+\fBType\fR
+T}:T{
+numeric
+T}
+:T{
+\fBDefault\fR
+T}:T{
+0
+T}
+.TE
+.sp 1
+Sets this node\*(Aqs MySQL Cluster node ID\&.
+\fIThe range of permitted values depends on the node\*(Aqs type (data, management, or API) and the MySQL Cluster software version\fR\&. See
+Section\ \&17.1.6.2, \(lqLimits and Differences of MySQL Cluster from Standard MySQL Limits\(rq, for more information\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" ndb-optimized-node-selection option (MySQL Cluster)
+\fB\-\-ndb\-optimized\-node\-selection\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{
+\-\-ndb\-optimized\-node\-selection
+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
+Optimize selection of nodes for transactions\&. Enabled by default\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" version option (MySQL Cluster programs)
+.\" -V option (MySQL Cluster programs)
+\fB\-\-version\fR,
+\fB\-V\fR
+.TS
+allbox tab(:);
+l l s s
+l l s s.
+T{
+\fBCommand\-Line Format\fR
+T}:T{
+\-\-version
+T}
+T{
+T}:T{
+\-V
+T}
+.TE
+.sp 1
+Prints the MySQL Cluster version number of the executable\&. The version number is relevant because not all versions can be used together, and the MySQL Cluster startup process verifies that the versions of the binaries being used can co\-exist in the same cluster\&. This is also important when performing an online (rolling) software upgrade or downgrade of MySQL Cluster\&.
+.sp
+See
+Section\ \&17.5.5, \(lqPerforming a Rolling Restart of a MySQL Cluster\(rq), for more information\&.
+.RE
+.SH "COPYRIGHT"
+.br
+.PP
+Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+.PP
+This software and related documentation are provided under a license agreement containing restrictions on use and disclosure and are protected by intellectual property laws. Except as expressly permitted in your license agreement or allowed by law, you may not use, copy, reproduce, translate, broadcast, modify, license, transmit, distribute, exhibit, perform, publish, or display any part, in any form, or by any means. Reverse engineering, disassembly, or decompilation of this software, unless required by law for interoperability, is prohibited.
+.PP
+The information contained herein is subject to change without notice and is not warranted to be error-free. If you find any errors, please report them to us in writing.
+.PP
+If this software or related documentation is delivered to the U.S. Government or anyone licensing it on behalf of the U.S. Government, the following notice is applicable:
+.PP
+U.S. GOVERNMENT RIGHTS Programs, software, databases, and related documentation and technical data delivered to U.S. Government customers are "commercial computer software" or "commercial technical data" pursuant to the applicable Federal Acquisition Regulation and agency-specific supplemental regulations. As such, the use, duplication, disclosure, modification, and adaptation shall be subject to the restrictions and license terms set forth in the applicable Government contract, and, to the extent applicable by the terms of the Government contract, the additional rights set forth in FAR 52.227-19, Commercial Computer Software License (December 2007). Oracle USA, Inc., 500 Oracle Parkway, Redwood City, CA 94065.
+.PP
+This software is developed for general use in a variety of information management applications. It is not developed or intended for use in any inherently dangerous applications, including applications which may create a risk of personal injury. If you use this software in dangerous applications, then you shall be responsible to take all appropriate fail-safe, backup, redundancy, and other measures to ensure the safe use of this software. Oracle Corporation and its affiliates disclaim any liability for any damages caused by use of this software in dangerous applications.
+.PP
+Oracle is a registered trademark of Oracle Corporation and/or its affiliates. MySQL is a trademark of Oracle Corporation and/or its affiliates, and shall not be used without Oracle's express written authorization. Other names may be trademarks of their respective owners.
+.PP
+This software and documentation may provide access to or information on content, products, and services from third parties. Oracle Corporation and its affiliates are not responsible for and expressly disclaim all warranties of any kind with respect to third-party content, products, and services. Oracle Corporation and its affiliates will not be responsible for any loss, costs, or damages incurred due to your access to or use of third-party content, products, or services.
+.PP
+This document in any form, software or printed matter, contains proprietary information that is the exclusive property of Oracle. Your access to and use of this material is subject to the terms and conditions of your Oracle Software License and Service Agreement, which has been executed and with which you agree to comply. This document and information contained herein may not be disclosed, copied, reproduced, or distributed to anyone outside Oracle without prior written consent of Oracle or as specifically provided below. This document is not part of your license agreement nor can it be incorporated into any contractual agreement with Oracle or its subsidiaries or affiliates.
+.PP
+This documentation is NOT distributed under a GPL license. Use of this documentation is subject to the following terms:
+.PP
+You may create a printed copy of this documentation solely for your own personal use. Conversion to other formats is allowed as long as the actual content is not altered or edited in any way. You shall not publish or distribute this documentation in any form or on any media, except if you distribute the documentation in a manner similar to how Oracle disseminates it (that is, electronically for download on a Web site with the software) or on a CD-ROM or similar medium, provided however that the documentation is disseminated together with the software on the same medium. Any other use, such as any dissemination of printed copies or use of this documentation, in whole or in part, in another publication, requires the prior written consent from an authorized representative of Oracle. Oracle and/or its affiliates reserve any and all rights to this documentation not expressly granted above.
+.PP
+For more information on the terms of this license, or for details on how the MySQL documentation is built and produced, please visit
+\m[blue]\fBMySQL Contact & Questions\fR\m[].
+.PP
+For additional licensing information, including licenses for third-party libraries used by MySQL products, see
+Preface and Legal Notices.
+.PP
+For help with using MySQL, please visit either the
+\m[blue]\fBMySQL Forums\fR\m[]
+or
+\m[blue]\fBMySQL Mailing Lists\fR\m[]
+where you can discuss your issues with other MySQL users.
+.PP
+For additional documentation on MySQL products, including translations of the documentation into other languages, and downloadable versions in variety of formats, including HTML and PDF formats, see the
+\m[blue]\fBMySQL Documentation Library\fR\m[].
+.sp
+.SH "SEE ALSO"
+For more information, please refer to the MySQL Reference Manual,
+which may already be installed locally and which is also available
+online at http://dev.mysql.com/doc/.
+.SH AUTHOR
+Oracle Corporation (http://dev.mysql.com/).

=== modified file 'Percona-Server/man/ndb_config.1'
--- Percona-Server/man/ndb_config.1	2013-05-10 09:39:17 +0000
+++ Percona-Server/man/ndb_config.1	2013-06-20 15:23:53 +0000
@@ -1,13 +1,22 @@
 '\" t
 .\"     Title: \fBndb_config\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/02/2012
+.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.5
+.\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_CONFIG\FR" "1" "03/02/2012" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_CONFIG\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -52,8 +61,193 @@
 \fB\-\-connections\fR\&.
 .PP
 The following table includes options that are specific to
-\fBndb_config\fR\&. Additional descriptions follow the table\&. For options common to all MySQL Cluster programs, see
-Section\ \&16.4.2, \(lqOptions Common to MySQL Cluster Programs\(rq\&.
+\fBndb_config\fR\&. Additional descriptions follow the table\&. For options common to most MySQL Cluster programs (including
+\fBndb_config\fR), see
+Options Common to MySQL Cluster Programs(1)\&.
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&17.14.\ \&ndb_config Options and Variables: MySQL Cluster NDB 7.3
+.TS
+allbox tab(:);
+lB lB lB.
+T{
+Format
+T}:T{
+Description
+T}:T{
+Added / Removed
+T}
+.T&
+l l l
+l l l
+l l l
+l l l
+l l l
+l l l
+l l l
+l l l
+l l l
+l l l
+l l l
+l l l
+l l l
+l l l
+l l l.
+T{
+.PP
+--nodes
+T}:T{
+Print node information (DB section) only\&.
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+--connections
+T}:T{
+Print CONNECTIONS section information only\&. Cannot be used with \-\-nodes
+            or \-\-system option\&.
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+--query=string,
+.PP
+-q
+T}:T{
+One or more query options (attributes)
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+--host=name
+T}:T{
+Specify host
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+--type=name
+T}:T{
+Specify node type
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+--nodeid,
+.PP
+--id
+T}:T{
+Get configuration of node with this ID
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+--fields=string,
+.PP
+-f
+T}:T{
+Field separator
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+--rows=string,
+.PP
+-r
+T}:T{
+Row separator
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+--config-file=path
+T}:T{
+Set the path to config\&.ini file
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+--mycnf
+T}:T{
+Read configuration data from my\&.cnf file
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+-c
+T}:T{
+Short form for \-\-ndb\-connectstring
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+--configinfo
+T}:T{
+Dumps information about all NDB configuration parameters in text format
+            with default, maximum, and minimum values\&. Use with \-\-xml to
+            obtain XML output\&.
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+--configinfo --xml
+T}:T{
+Use \-\-xml with \-\-configinfo to obtain a dump of all NDB configuration
+            parameters in XML format with default, maximum, and minimum
+            values\&.
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+--system
+T}:T{
+Print SYSTEM section information only\&. Cannot be used with \-\-nodes or
+            \-\-connections option\&.
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+--config_from_node=#
+T}:T{
+Obtain configuration data from the node having this ID (must be a data
+            node)\&.
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+.TE
+.sp 1
 .sp
 .RS 4
 .ie n \{\
@@ -138,7 +332,7 @@
 T}
 .TE
 .sp 1
-Obtain the cluster\'s configuration data from the data node that has this ID\&.
+Obtain the cluster\*(Aqs configuration data from the data node that has this ID\&.
 .sp
 If the node having this ID is not a data node,
 \fBndb_config\fR
@@ -189,9 +383,46 @@
 .\" ndb-connectstring option: ndb_config
 \fB\-\-ndb\-connectstring=\fR\fB\fIconnect_string\fR\fR,
 \fB\-c \fR\fB\fIconnect_string\fR\fR
-.sp
+.TS
+allbox tab(:);
+l l s s
+l l s s
+l l s s
+l l s s
+^ l l s
+^ l l s.
+T{
+\fBCommand\-Line Format\fR
+T}:T{
+\-\-ndb\-connectstring=connectstring
+T}
+T{
+T}:T{
+\-\-connect\-string=connectstring
+T}
+T{
+T}:T{
+\-c
+T}
+T{
+\ \&
+T}:T{
+\fBPermitted Values \fR
+T}
+:T{
+\fBType\fR
+T}:T{
+string
+T}
+:T{
+\fBDefault\fR
+T}:T{
+localhost:1186
+T}
+.TE
+.sp 1
 Specifies the connectstring to use in connecting to the management server\&. The format for the connectstring is the same as described in
-Section\ \&16.3.2.3, \(lqThe MySQL Cluster Connectstring\(rq, and defaults to
+Section\ \&17.3.2.3, \(lqThe MySQL Cluster Connectstring\(rq, and defaults to
 localhost:1186\&.
 .RE
 .sp
@@ -233,7 +464,7 @@
 T}
 .TE
 .sp 1
-Gives the path to the management server\'s configuration file (config\&.ini)\&. This may be a relative or absolute path\&. If the management node resides on a different host from the one on which
+Gives the path to the management server\*(Aqs configuration file (config\&.ini)\&. This may be a relative or absolute path\&. If the management node resides on a different host from the one on which
 \fBndb_config\fR
 is invoked, then an absolute path must be used\&.
 .RE
@@ -446,7 +677,34 @@
 .\" ndb_config: nodeid option
 .\" nodeid option: ndb_config
 \fB\-\-nodeid=\fR\fB\fInode_id\fR\fR
-.sp
+.TS
+allbox tab(:);
+l l s s
+l l s s
+^ l l s
+^ l l s.
+T{
+\fBCommand\-Line Format\fR
+T}:T{
+\-\-ndb\-nodeid=#
+T}
+T{
+\ \&
+T}:T{
+\fBPermitted Values \fR
+T}
+:T{
+\fBType\fR
+T}:T{
+numeric
+T}
+:T{
+\fBDefault\fR
+T}:T{
+0
+T}
+.TE
+.sp 1
 Either of these options can be used to specify the node ID of the node for which configuration information is to be obtained\&.
 \fB\-\-nodeid\fR
 is the preferred form\&.
@@ -619,7 +877,9 @@
 l l s s
 ^ l l s
 ^ l l s
-^ l l s.
+^ lt l s
+^ ^ l s
+^ ^ l s.
 T{
 \fBCommand\-Line Format\fR
 T}:T{
@@ -643,9 +903,11 @@
 \fBValid Values\fR
 T}:T{
 ndbd
-.sp
+T}
+::T{
 mysqld
-.sp
+T}
+::T{
 ndb_mgmd
 T}
 .TE
@@ -825,7 +1087,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-A brief description of each parameter\'s purpose, effects, and usage
+A brief description of each parameter\*(Aqs purpose, effects, and usage
 .RE
 .sp
 .RS 4
@@ -849,29 +1111,29 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-The parameter\'s data type or unit of measurement
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-Where applicable, the parameter\'s default, minimum, and maximum values
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-A brief description of the parameter\'s purpose, effects, and usage
+The parameter\*(Aqs data type or unit of measurement
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Where applicable, the parameter\*(Aqs default, minimum, and maximum values
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+A brief description of the parameter\*(Aqs purpose, effects, and usage
 .RE
 .sp
 .RS 4
@@ -884,7 +1146,7 @@
 .\}
 MySQL Cluster release version and build information
 .RE
-.RS 4
+.sp
 By default, this output is in text format\&. Part of this output is shown here:
 .sp
 .if n \{\
@@ -959,7 +1221,7 @@
 .\}
 .nf
 shell> \fBndb_config \-\-configinfo \-\-xml\fR
-<configvariables protocolversion="1" ndbversionstring="mysql\-5\&.1\&.34 ndb\-7\&.0\&.6"
+<configvariables protocolversion="1" ndbversionstring="5\&.6\&.11\-ndb\-7\&.3\&.2"
                     ndbversion="458758" ndbversionmajor="7" ndbversionminor="0"
                     ndbversionbuild="6">
   <section name="SYSTEM">
@@ -971,9 +1233,11 @@
               type="unsigned" default="0" min="0" max="4294967039"/>
   </section>
   <section name="NDBD">
-    <param name="MaxNoOfSubscriptions" comment="Max no of subscriptions (default 0 == MaxNoOfTables)"
+    <param name="MaxNoOfSubscriptions" 
+              comment="Max no of subscriptions (default 0 == MaxNoOfTables)"
               type="unsigned" default="0" min="0" max="4294967039"/>
-    <param name="MaxNoOfSubscribers" comment="Max no of subscribers (default 0 == 2 * MaxNoOfTables)"
+    <param name="MaxNoOfSubscribers" 
+              comment="Max no of subscribers (default 0 == 2 * MaxNoOfTables)"
               type="unsigned" default="0" min="0" max="4294967039"/>
     \&...
   </section>
@@ -1111,7 +1375,7 @@
 \fB\-\-configinfo\fR
 serves no purpose\&.
 .RE
-          Examples
+        Examples
 .sp
 .RS 4
 .ie n \{\
@@ -1127,7 +1391,7 @@
 .RS 4
 .\}
 .nf
-shell> \fB\&./ndb_config \-\-query=id,type \-\-fields=\':\' \-\-rows=\'\en\'\fR
+shell> \fB\&./ndb_config \-\-query=id,type \-\-fields=\*(Aq:\*(Aq \-\-rows=\*(Aq\en\*(Aq\fR
 1:ndbd
 2:ndbd
 3:ndbd
@@ -1163,7 +1427,8 @@
 .RS 4
 .\}
 .nf
-shell> \fB\&./ndb_config \-\-config\-file=usr/local/mysql/cluster\-data/config\&.ini \-\-query=hostname,portnumber \-\-fields=: \-\-rows=, \-\-type=ndb_mgmd\fR
+shell> \fB\&./ndb_config \-\-config\-file=usr/local/mysql/cluster\-data/config\&.ini \e 
+\-\-query=hostname,portnumber \-\-fields=: \-\-rows=, \-\-type=ndb_mgmd\fR
 192\&.168\&.0\&.179:1186
 .fi
 .if n \{\
@@ -1183,7 +1448,7 @@
 \fBndb_config\fR
 checks only data nodes (using the
 \fB\-\-type\fR
-option), and shows the values for each node\'s ID and host name, as well as the values set for its
+option), and shows the values for each node\*(Aqs ID and host name, as well as the values set for its
 DataMemory,
 IndexMemory, and
 DataDir
@@ -1193,7 +1458,7 @@
 .RS 4
 .\}
 .nf
-shell> \fB\&./ndb_config \-\-type=ndbd \-\-query=id,host,datamemory,indexmemory,datadir \-f \' : \' \-r \'\en\'\fR
+shell> \fB\&./ndb_config \-\-type=ndbd \-\-query=id,host,datamemory,indexmemory,datadir \-f \*(Aq : \*(Aq \-r \*(Aq\en\*(Aq\fR
 1 : 192\&.168\&.0\&.193 : 83886080 : 18874368 : /usr/local/mysql/cluster\-data
 2 : 192\&.168\&.0\&.112 : 83886080 : 18874368 : /usr/local/mysql/cluster\-data
 3 : 192\&.168\&.0\&.176 : 83886080 : 18874368 : /usr/local/mysql/cluster\-data
@@ -1226,7 +1491,7 @@
 .RS 4
 .\}
 .nf
-shell> \fB\&./ndb_config \-\-host=192\&.168\&.0\&.176 \-f : \-r \'\en\' \-q id,type\fR
+shell> \fB\&./ndb_config \-\-host=192\&.168\&.0\&.176 \-f : \-r \*(Aq\en\*(Aq \-q id,type\fR
 3:ndbd
 5:ndb_mgmd
 .fi
@@ -1247,13 +1512,42 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2012, Oracle and/or its affiliates. All rights reserved.
-.PP
-This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
-.PP
-This documentation 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.
-.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/.
+Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+.PP
+This software and related documentation are provided under a license agreement containing restrictions on use and disclosure and are protected by intellectual property laws. Except as expressly permitted in your license agreement or allowed by law, you may not use, copy, reproduce, translate, broadcast, modify, license, transmit, distribute, exhibit, perform, publish, or display any part, in any form, or by any means. Reverse engineering, disassembly, or decompilation of this software, unless required by law for interoperability, is prohibited.
+.PP
+The information contained herein is subject to change without notice and is not warranted to be error-free. If you find any errors, please report them to us in writing.
+.PP
+If this software or related documentation is delivered to the U.S. Government or anyone licensing it on behalf of the U.S. Government, the following notice is applicable:
+.PP
+U.S. GOVERNMENT RIGHTS Programs, software, databases, and related documentation and technical data delivered to U.S. Government customers are "commercial computer software" or "commercial technical data" pursuant to the applicable Federal Acquisition Regulation and agency-specific supplemental regulations. As such, the use, duplication, disclosure, modification, and adaptation shall be subject to the restrictions and license terms set forth in the applicable Government contract, and, to the extent applicable by the terms of the Government contract, the additional rights set forth in FAR 52.227-19, Commercial Computer Software License (December 2007). Oracle USA, Inc., 500 Oracle Parkway, Redwood City, CA 94065.
+.PP
+This software is developed for general use in a variety of information management applications. It is not developed or intended for use in any inherently dangerous applications, including applications which may create a risk of personal injury. If you use this software in dangerous applications, then you shall be responsible to take all appropriate fail-safe, backup, redundancy, and other measures to ensure the safe use of this software. Oracle Corporation and its affiliates disclaim any liability for any damages caused by use of this software in dangerous applications.
+.PP
+Oracle is a registered trademark of Oracle Corporation and/or its affiliates. MySQL is a trademark of Oracle Corporation and/or its affiliates, and shall not be used without Oracle's express written authorization. Other names may be trademarks of their respective owners.
+.PP
+This software and documentation may provide access to or information on content, products, and services from third parties. Oracle Corporation and its affiliates are not responsible for and expressly disclaim all warranties of any kind with respect to third-party content, products, and services. Oracle Corporation and its affiliates will not be responsible for any loss, costs, or damages incurred due to your access to or use of third-party content, products, or services.
+.PP
+This document in any form, software or printed matter, contains proprietary information that is the exclusive property of Oracle. Your access to and use of this material is subject to the terms and conditions of your Oracle Software License and Service Agreement, which has been executed and with which you agree to comply. This document and information contained herein may not be disclosed, copied, reproduced, or distributed to anyone outside Oracle without prior written consent of Oracle or as specifically provided below. This document is not part of your license agreement nor can it be incorporated into any contractual agreement with Oracle or its subsidiaries or affiliates.
+.PP
+This documentation is NOT distributed under a GPL license. Use of this documentation is subject to the following terms:
+.PP
+You may create a printed copy of this documentation solely for your own personal use. Conversion to other formats is allowed as long as the actual content is not altered or edited in any way. You shall not publish or distribute this documentation in any form or on any media, except if you distribute the documentation in a manner similar to how Oracle disseminates it (that is, electronically for download on a Web site with the software) or on a CD-ROM or similar medium, provided however that the documentation is disseminated together with the software on the same medium. Any other use, such as any dissemination of printed copies or use of this documentation, in whole or in part, in another publication, requires the prior written consent from an authorized representative of Oracle. Oracle and/or its affiliates reserve any and all rights to this documentation not expressly granted above.
+.PP
+For more information on the terms of this license, or for details on how the MySQL documentation is built and produced, please visit
+\m[blue]\fBMySQL Contact & Questions\fR\m[].
+.PP
+For additional licensing information, including licenses for third-party libraries used by MySQL products, see
+Preface and Legal Notices.
+.PP
+For help with using MySQL, please visit either the
+\m[blue]\fBMySQL Forums\fR\m[]
+or
+\m[blue]\fBMySQL Mailing Lists\fR\m[]
+where you can discuss your issues with other MySQL users.
+.PP
+For additional documentation on MySQL products, including translations of the documentation into other languages, and downloadable versions in variety of formats, including HTML and PDF formats, see the
+\m[blue]\fBMySQL Documentation Library\fR\m[].
 .sp
 .SH "SEE ALSO"
 For more information, please refer to the MySQL Reference Manual,

=== modified file 'Percona-Server/man/ndb_cpcd.1'
--- Percona-Server/man/ndb_cpcd.1	2013-05-10 09:39:17 +0000
+++ Percona-Server/man/ndb_cpcd.1	2013-06-20 15:23:53 +0000
@@ -1,13 +1,22 @@
 '\" t
 .\"     Title: \fBndb_cpcd\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/02/2012
+.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.5
+.\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_CPCD\FR" "1" "03/02/2012" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_CPCD\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -26,17 +35,46 @@
 \fBndb_cpcd \fR\fB\fIoptions\fR\fR
 .SH "DESCRIPTION"
 .PP
-A utility having this name was formerly part of an internal automated test framework used in testing and debugging MySQL Cluster\&. It was deprecated in MySQL Cluster NDB 7\&.0, and removed from MySQL Cluster distributions provided by Oracle beginning with MySQL Cluster NDB 7\&.2\&.1\&.
+A utility having this name was formerly part of an internal automated test framework used in testing and debugging MySQL Cluster\&. It is no longer included in MySQL Cluster distributions provided by Oracle\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2012, Oracle and/or its affiliates. All rights reserved.
-.PP
-This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
-.PP
-This documentation 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.
-.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/.
+Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+.PP
+This software and related documentation are provided under a license agreement containing restrictions on use and disclosure and are protected by intellectual property laws. Except as expressly permitted in your license agreement or allowed by law, you may not use, copy, reproduce, translate, broadcast, modify, license, transmit, distribute, exhibit, perform, publish, or display any part, in any form, or by any means. Reverse engineering, disassembly, or decompilation of this software, unless required by law for interoperability, is prohibited.
+.PP
+The information contained herein is subject to change without notice and is not warranted to be error-free. If you find any errors, please report them to us in writing.
+.PP
+If this software or related documentation is delivered to the U.S. Government or anyone licensing it on behalf of the U.S. Government, the following notice is applicable:
+.PP
+U.S. GOVERNMENT RIGHTS Programs, software, databases, and related documentation and technical data delivered to U.S. Government customers are "commercial computer software" or "commercial technical data" pursuant to the applicable Federal Acquisition Regulation and agency-specific supplemental regulations. As such, the use, duplication, disclosure, modification, and adaptation shall be subject to the restrictions and license terms set forth in the applicable Government contract, and, to the extent applicable by the terms of the Government contract, the additional rights set forth in FAR 52.227-19, Commercial Computer Software License (December 2007). Oracle USA, Inc., 500 Oracle Parkway, Redwood City, CA 94065.
+.PP
+This software is developed for general use in a variety of information management applications. It is not developed or intended for use in any inherently dangerous applications, including applications which may create a risk of personal injury. If you use this software in dangerous applications, then you shall be responsible to take all appropriate fail-safe, backup, redundancy, and other measures to ensure the safe use of this software. Oracle Corporation and its affiliates disclaim any liability for any damages caused by use of this software in dangerous applications.
+.PP
+Oracle is a registered trademark of Oracle Corporation and/or its affiliates. MySQL is a trademark of Oracle Corporation and/or its affiliates, and shall not be used without Oracle's express written authorization. Other names may be trademarks of their respective owners.
+.PP
+This software and documentation may provide access to or information on content, products, and services from third parties. Oracle Corporation and its affiliates are not responsible for and expressly disclaim all warranties of any kind with respect to third-party content, products, and services. Oracle Corporation and its affiliates will not be responsible for any loss, costs, or damages incurred due to your access to or use of third-party content, products, or services.
+.PP
+This document in any form, software or printed matter, contains proprietary information that is the exclusive property of Oracle. Your access to and use of this material is subject to the terms and conditions of your Oracle Software License and Service Agreement, which has been executed and with which you agree to comply. This document and information contained herein may not be disclosed, copied, reproduced, or distributed to anyone outside Oracle without prior written consent of Oracle or as specifically provided below. This document is not part of your license agreement nor can it be incorporated into any contractual agreement with Oracle or its subsidiaries or affiliates.
+.PP
+This documentation is NOT distributed under a GPL license. Use of this documentation is subject to the following terms:
+.PP
+You may create a printed copy of this documentation solely for your own personal use. Conversion to other formats is allowed as long as the actual content is not altered or edited in any way. You shall not publish or distribute this documentation in any form or on any media, except if you distribute the documentation in a manner similar to how Oracle disseminates it (that is, electronically for download on a Web site with the software) or on a CD-ROM or similar medium, provided however that the documentation is disseminated together with the software on the same medium. Any other use, such as any dissemination of printed copies or use of this documentation, in whole or in part, in another publication, requires the prior written consent from an authorized representative of Oracle. Oracle and/or its affiliates reserve any and all rights to this documentation not expressly granted above.
+.PP
+For more information on the terms of this license, or for details on how the MySQL documentation is built and produced, please visit
+\m[blue]\fBMySQL Contact & Questions\fR\m[].
+.PP
+For additional licensing information, including licenses for third-party libraries used by MySQL products, see
+Preface and Legal Notices.
+.PP
+For help with using MySQL, please visit either the
+\m[blue]\fBMySQL Forums\fR\m[]
+or
+\m[blue]\fBMySQL Mailing Lists\fR\m[]
+where you can discuss your issues with other MySQL users.
+.PP
+For additional documentation on MySQL products, including translations of the documentation into other languages, and downloadable versions in variety of formats, including HTML and PDF formats, see the
+\m[blue]\fBMySQL Documentation Library\fR\m[].
 .sp
 .SH "SEE ALSO"
 For more information, please refer to the MySQL Reference Manual,

=== modified file 'Percona-Server/man/ndb_delete_all.1'
--- Percona-Server/man/ndb_delete_all.1	2013-05-10 09:39:17 +0000
+++ Percona-Server/man/ndb_delete_all.1	2013-06-20 15:23:53 +0000
@@ -1,13 +1,22 @@
 '\" t
 .\"     Title: \fBndb_delete_all\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/02/2012
+.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.5
+.\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_DELETE_ALL\FR" "1" "03/02/2012" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_DELETE_ALL\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -33,7 +42,7 @@
 DELETE
 or even
 TRUNCATE TABLE\&.
-          Usage
+        Usage
 .sp
 .if n \{\
 .RS 4
@@ -51,7 +60,74 @@
 \fIdb_name\fR\&. It is exactly equivalent to executing
 TRUNCATE \fIdb_name\fR\&.\fItbl_name\fR
 in MySQL\&.
-          Additional Options
+.PP
+The following table includes options that are specific to
+\fBndb_delete_all\fR\&. Additional descriptions follow the table\&. For options common to most MySQL Cluster programs (including
+\fBndb_delete_all\fR), see
+Options Common to MySQL Cluster Programs(1)\&.
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&17.15.\ \&ndb_delete_all Options and Variables: MySQL Cluster NDB 7.3
+.TS
+allbox tab(:);
+lB lB lB.
+T{
+Format
+T}:T{
+Description
+T}:T{
+Added / Removed
+T}
+.T&
+l l l
+l l l
+l l l
+l l l.
+T{
+.PP
+\-\-database=dbname,
+.PP
+\-d
+T}:T{
+Name of the database in which the table is found
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+--transactional,
+.PP
+-t
+T}:T{
+Perform the delete in a single transaction (may run out of operations)
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+\-\-tupscan
+T}:T{
+Run tup scan
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+\-\-diskscan
+T}:T{
+Run disk scan
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+.TE
+.sp 1
 .sp
 .RS 4
 .ie n \{\
@@ -86,13 +162,42 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2012, Oracle and/or its affiliates. All rights reserved.
-.PP
-This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
-.PP
-This documentation 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.
-.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/.
+Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+.PP
+This software and related documentation are provided under a license agreement containing restrictions on use and disclosure and are protected by intellectual property laws. Except as expressly permitted in your license agreement or allowed by law, you may not use, copy, reproduce, translate, broadcast, modify, license, transmit, distribute, exhibit, perform, publish, or display any part, in any form, or by any means. Reverse engineering, disassembly, or decompilation of this software, unless required by law for interoperability, is prohibited.
+.PP
+The information contained herein is subject to change without notice and is not warranted to be error-free. If you find any errors, please report them to us in writing.
+.PP
+If this software or related documentation is delivered to the U.S. Government or anyone licensing it on behalf of the U.S. Government, the following notice is applicable:
+.PP
+U.S. GOVERNMENT RIGHTS Programs, software, databases, and related documentation and technical data delivered to U.S. Government customers are "commercial computer software" or "commercial technical data" pursuant to the applicable Federal Acquisition Regulation and agency-specific supplemental regulations. As such, the use, duplication, disclosure, modification, and adaptation shall be subject to the restrictions and license terms set forth in the applicable Government contract, and, to the extent applicable by the terms of the Government contract, the additional rights set forth in FAR 52.227-19, Commercial Computer Software License (December 2007). Oracle USA, Inc., 500 Oracle Parkway, Redwood City, CA 94065.
+.PP
+This software is developed for general use in a variety of information management applications. It is not developed or intended for use in any inherently dangerous applications, including applications which may create a risk of personal injury. If you use this software in dangerous applications, then you shall be responsible to take all appropriate fail-safe, backup, redundancy, and other measures to ensure the safe use of this software. Oracle Corporation and its affiliates disclaim any liability for any damages caused by use of this software in dangerous applications.
+.PP
+Oracle is a registered trademark of Oracle Corporation and/or its affiliates. MySQL is a trademark of Oracle Corporation and/or its affiliates, and shall not be used without Oracle's express written authorization. Other names may be trademarks of their respective owners.
+.PP
+This software and documentation may provide access to or information on content, products, and services from third parties. Oracle Corporation and its affiliates are not responsible for and expressly disclaim all warranties of any kind with respect to third-party content, products, and services. Oracle Corporation and its affiliates will not be responsible for any loss, costs, or damages incurred due to your access to or use of third-party content, products, or services.
+.PP
+This document in any form, software or printed matter, contains proprietary information that is the exclusive property of Oracle. Your access to and use of this material is subject to the terms and conditions of your Oracle Software License and Service Agreement, which has been executed and with which you agree to comply. This document and information contained herein may not be disclosed, copied, reproduced, or distributed to anyone outside Oracle without prior written consent of Oracle or as specifically provided below. This document is not part of your license agreement nor can it be incorporated into any contractual agreement with Oracle or its subsidiaries or affiliates.
+.PP
+This documentation is NOT distributed under a GPL license. Use of this documentation is subject to the following terms:
+.PP
+You may create a printed copy of this documentation solely for your own personal use. Conversion to other formats is allowed as long as the actual content is not altered or edited in any way. You shall not publish or distribute this documentation in any form or on any media, except if you distribute the documentation in a manner similar to how Oracle disseminates it (that is, electronically for download on a Web site with the software) or on a CD-ROM or similar medium, provided however that the documentation is disseminated together with the software on the same medium. Any other use, such as any dissemination of printed copies or use of this documentation, in whole or in part, in another publication, requires the prior written consent from an authorized representative of Oracle. Oracle and/or its affiliates reserve any and all rights to this documentation not expressly granted above.
+.PP
+For more information on the terms of this license, or for details on how the MySQL documentation is built and produced, please visit
+\m[blue]\fBMySQL Contact & Questions\fR\m[].
+.PP
+For additional licensing information, including licenses for third-party libraries used by MySQL products, see
+Preface and Legal Notices.
+.PP
+For help with using MySQL, please visit either the
+\m[blue]\fBMySQL Forums\fR\m[]
+or
+\m[blue]\fBMySQL Mailing Lists\fR\m[]
+where you can discuss your issues with other MySQL users.
+.PP
+For additional documentation on MySQL products, including translations of the documentation into other languages, and downloadable versions in variety of formats, including HTML and PDF formats, see the
+\m[blue]\fBMySQL Documentation Library\fR\m[].
 .sp
 .SH "SEE ALSO"
 For more information, please refer to the MySQL Reference Manual,

=== modified file 'Percona-Server/man/ndb_desc.1'
--- Percona-Server/man/ndb_desc.1	2013-05-10 09:39:17 +0000
+++ Percona-Server/man/ndb_desc.1	2013-06-20 15:23:53 +0000
@@ -1,13 +1,22 @@
 '\" t
 .\"     Title: \fBndb_desc\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/02/2012
+.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
+.\"      Date: 05/21/2013
 .\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.5
+.\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_DESC\FR" "1" "03/02/2012" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_DESC\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -30,20 +39,21 @@
 provides a detailed description of one or more
 NDB
 tables\&.
-          Usage
+        Usage
 .sp
 .if n \{\
 .RS 4
 .\}
 .nf
 ndb_desc \-c \fIconnect_string\fR \fItbl_name\fR \-d \fIdb_name\fR [\-p]
+ndb_desc \-c \fIconnect_string\fR \fIindex_name\fR \-d \fIdb_name\fR \-t \fItbl_name\fR
 .fi
 .if n \{\
 .RE
 .\}
 .sp
-          Sample Output
-        .PP
+        Sample Output
+.PP
 MySQL table creation and population statements:
 .sp
 .if n \{\
@@ -60,9 +70,9 @@
     UNIQUE KEY uk (name)
 ) ENGINE=NDB;
 INSERT INTO fish VALUES
-    (\'\',\'guppy\', 35, 2), (\'\',\'tuna\', 2500, 150000),
-    (\'\',\'shark\', 3000, 110000), (\'\',\'manta ray\', 1500, 50000),
-    (\'\',\'grouper\', 900, 125000), (\'\',\'puffer\', 250, 2500);
+    (\*(Aq\*(Aq,\*(Aqguppy\*(Aq, 35, 2), (\*(Aq\*(Aq,\*(Aqtuna\*(Aq, 2500, 150000),
+    (\*(Aq\*(Aq,\*(Aqshark\*(Aq, 3000, 110000), (\*(Aq\*(Aq,\*(Aqmanta ray\*(Aq, 1500, 50000),
+    (\*(Aq\*(Aq,\*(Aqgrouper\*(Aq, 900, 125000), (\*(Aq\*(Aq,\*(Aqpuffer\*(Aq, 250, 2500);
 .fi
 .if n \{\
 .RE
@@ -103,9 +113,12 @@
 uk$unique(name) \- UniqueHashIndex
 uk(name) \- OrderedIndex
 \-\- Per partition info \-\-
-Partition  Row count  Commit count  Frag fixed memory  Frag varsized memory  Extent_space  Free extent_space
-0          2          2             32768              32768                 0             0
-1          4          4             32768              32768                 0             0
+Partition  Row count  Commit count  Frag fixed memory \&.\&.\&.
+0          2          2             32768             \&.\&.\&.
+1          4          4             32768             \&.\&.\&.
+\&.\&.\&. Frag varsized memory  Extent_space  Free extent_space
+\&.\&.\&. 32768                 0             0
+\&.\&.\&. 32768                 0             0
 NDBT_ProgramExit: 0 \- OK
 .fi
 .if n \{\
@@ -116,6 +129,66 @@
 \fBndb_desc\fR
 by using their names, separated by spaces\&. All of the tables must be in the same database\&.
 .PP
+You can obtain additional information about a specific index using the
+\fB\-\-table\fR
+(short form:
+\fB\-t\fR) option supplying the name of the index as the first argument to
+\fBndb_desc\fR, as shown here:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+shell> \fB\&./ndb_desc uk \-d test \-t fish\fR
+\-\- uk \-\-
+Version: 3
+Base table: fish
+Number of attributes: 1
+Logging: 0
+Index type: OrderedIndex
+Index status: Retrieved
+\-\- Attributes \-\-
+name Varchar(20;latin1_swedish_ci) NOT NULL AT=SHORT_VAR ST=MEMORY
+\-\- IndexTable 10/uk \-\-
+Version: 3
+Fragment type: FragUndefined
+K Value: 6
+Min load factor: 78
+Max load factor: 80
+Temporary table: yes
+Number of attributes: 2
+Number of primary keys: 1
+Length of frm data: 0
+Row Checksum: 1
+Row GCI: 1
+SingleUserMode: 2
+ForceVarPart: 0
+FragmentCount: 4
+ExtraRowGciBits: 0
+ExtraRowAuthorBits: 0
+TableStatus: Retrieved
+\-\- Attributes \-\-
+name Varchar(20;latin1_swedish_ci) NOT NULL AT=SHORT_VAR ST=MEMORY
+NDB$TNODE Unsigned [64] PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
+\-\- Indexes \-\- 
+PRIMARY KEY(NDB$TNODE) \- UniqueHashIndex
+NDBT_ProgramExit: 0 \- OK
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+When an index is specified in this way, the
+\fB\-\-extra\-partition\-info\fR
+and
+\fB\-\-extra\-node\-info\fR
+options have no effect\&.
+.PP
+The
+Version
+column in the output contains the table\*(Aqs schema object version\&. For information about interpreting this value, see
+\m[blue]\fBNDB Schema Object Versions\fR\m[]\&\s-2\u[1]\d\s+2\&.
+.PP
 The
 Extent_space
 and
@@ -132,21 +205,21 @@
 .\}
 .nf
 CREATE LOGFILE GROUP lg_1
-    ADD UNDOFILE \'undo_1\&.log\'
+    ADD UNDOFILE \*(Aqundo_1\&.log\*(Aq
     INITIAL_SIZE 16M
     UNDO_BUFFER_SIZE 2M
     ENGINE NDB;
 ALTER LOGFILE GROUP lg_1
-    ADD UNDOFILE \'undo_2\&.log\'
+    ADD UNDOFILE \*(Aqundo_2\&.log\*(Aq
     INITIAL_SIZE 12M
     ENGINE NDB;
 CREATE TABLESPACE ts_1
-    ADD DATAFILE \'data_1\&.dat\'
+    ADD DATAFILE \*(Aqdata_1\&.dat\*(Aq
     USE LOGFILE GROUP lg_1
     INITIAL_SIZE 32M
     ENGINE NDB;
 ALTER TABLESPACE ts_1
-    ADD DATAFILE \'data_2\&.dat\'
+    ADD DATAFILE \*(Aqdata_2\&.dat\*(Aq
     INITIAL_SIZE 48M
     ENGINE NDB;
 .fi
@@ -155,9 +228,9 @@
 .\}
 .PP
 (For more information on the statements just shown and the objects created by them, see
-Section\ \&16.5.11.1, \(lqMySQL Cluster Disk Data Objects\(rq, as well as
-Section\ \&12.1.14, \(lqCREATE LOGFILE GROUP Syntax\(rq, and
-Section\ \&12.1.18, \(lqCREATE TABLESPACE Syntax\(rq\&.)
+Section\ \&17.5.12.1, \(lqMySQL Cluster Disk Data Objects\(rq, as well as
+Section\ \&13.1.14, \(lqCREATE LOGFILE GROUP Syntax\(rq, and
+Section\ \&13.1.18, \(lqCREATE TABLESPACE Syntax\(rq\&.)
 .PP
 Now we can create and populate a version of the
 fish
@@ -177,9 +250,9 @@
 ) TABLESPACE ts_1 STORAGE DISK 
 ENGINE=NDB;
 INSERT INTO fish VALUES
-    (\'\',\'guppy\', 35, 2), (\'\',\'tuna\', 2500, 150000),
-    (\'\',\'shark\', 3000, 110000), (\'\',\'manta ray\', 1500, 50000),
-    (\'\',\'grouper\', 900, 125000), (\'\',\'puffer\', 250, 2500);
+    (\*(Aq\*(Aq,\*(Aqguppy\*(Aq, 35, 2), (\*(Aq\*(Aq,\*(Aqtuna\*(Aq, 2500, 150000),
+    (\*(Aq\*(Aq,\*(Aqshark\*(Aq, 3000, 110000), (\*(Aq\*(Aq,\*(Aqmanta ray\*(Aq, 1500, 50000),
+    (\*(Aq\*(Aq,\*(Aqgrouper\*(Aq, 900, 125000), (\*(Aq\*(Aq,\*(Aqpuffer\*(Aq, 250, 2500);
 .fi
 .if n \{\
 .RE
@@ -221,39 +294,136 @@
 uk$unique(name) \- UniqueHashIndex
 uk(name) \- OrderedIndex
 \-\- Per partition info \-\-
-Partition  Row count  Commit count  Frag fixed memory  Frag varsized memory  Extent_space  Free extent_space
-0          2          2             32768              32768                 1048576       1044440
-1          4          4             32768              32768                 1048576       1044400
+Partition  Row count  Commit count  Frag fixed memory \&.\&.\&.
+0          2          2             32768             \&.\&.\&.
+1          4          4             32768             \&.\&.\&.
+\&.\&.\&. Frag varsized memory  Extent_space  Free extent_space
+\&.\&.\&. 32768                 0             0
+\&.\&.\&. 32768                 0             0
 NDBT_ProgramExit: 0 \- OK
 .fi
 .if n \{\
 .RE
 .\}
 .PP
-This means that 1048576 bytes are allocated from the tablespace for this table on each partition, of which 1044440 bytes remain free for additional storage\&. In other words, 1048576 \- 1044440 = 4136 bytes per partition is currently being used to store the data from this table\'s disk\-based columns\&. The number of bytes shown as
+This means that 1048576 bytes are allocated from the tablespace for this table on each partition, of which 1044440 bytes remain free for additional storage\&. In other words, 1048576 \- 1044440 = 4136 bytes per partition is currently being used to store the data from this table\*(Aqs disk\-based columns\&. The number of bytes shown as
 Free extent_space
 is available for storing on\-disk column data from the
 fish
 table only; for this reason, it is not visible when selecting from the
 INFORMATION_SCHEMA\&.FILES
 table\&.
-          Additional Options
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.\" ndb_desc: extra-partition-info option
-.\" extra-partition-info option: ndb_desc
-\fB\-\-extra\-partition\-info\fR,
-\fB\-p\fR
-.sp
-Print additional information about the table\'s partitions\&.
-.RE
+.PP
+The following table includes options that are specific to
+\fBndb_desc\fR\&. Additional descriptions follow the table\&. For options common to most MySQL Cluster programs (including
+\fBndb_desc\fR), see
+Options Common to MySQL Cluster Programs(1)\&.
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&17.16.\ \&ndb_desc Options and Variables: MySQL Cluster NDB 7.3
+.TS
+allbox tab(:);
+lB lB lB.
+T{
+Format
+T}:T{
+Description
+T}:T{
+Added / Removed
+T}
+.T&
+l l l
+l l l
+l l l
+l l l
+l l l
+l l l
+l l l.
+T{
+.PP
+--blob-info,
+.PP
+-b
+T}:T{
+Include partition information for BLOB tables in output\&. Requires that
+            the \-p option also be used
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+--database=dbname,
+.PP
+-d
+T}:T{
+Name of database containing table
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+--extra-node-info,
+.PP
+-n
+T}:T{
+Include partition\-to\-data\-node mappings in output\&. Requires that the \-p
+            option also be used
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+--extra-partition-info,
+.PP
+-p
+T}:T{
+Display information about partitions
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+--retries=#,
+.PP
+-r
+T}:T{
+Number of times to retry the connection (once per second)
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+--table=tbl_name,
+.PP
+-t
+T}:T{
+Specify the table in which to find an index\&. When this option is used,
+            \-p and \-n have no effect and are ignored\&.
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+T{
+.PP
+--unqualified,
+.PP
+-u
+T}:T{
+Use unqualified table names
+T}:T{
+.PP
+All MySQL 5\&.6 based releases
+T}
+.TE
+.sp 1
 .sp
 .RS 4
 .ie n \{\
@@ -287,6 +457,22 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" ndb_desc: database option
+.\" database option: ndb_desc
+\fB\-\-database=\fR\fB\fIdb_name\fR\fR,
+\fB\-d\fR
+.sp
+Specify the database in which the table should be found\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" ndb_desc: extra-node-info option
 .\" extra-node-info option: ndb_desc
 \fB\-\-extra\-node\-info\fR,
@@ -298,17 +484,116 @@
 \fB\-\-extra\-partition\-info\fR
 (\fB\-p\fR) option\&.
 .RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" ndb_desc: extra-partition-info option
+.\" extra-partition-info option: ndb_desc
+\fB\-\-extra\-partition\-info\fR,
+\fB\-p\fR
+.sp
+Print additional information about the table\*(Aqs partitions\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" ndb_desc: retries option
+.\" retries option: ndb_desc
+\fB\-\-retries=\fR\fB\fI#\fR\fR,
+\fB\-r\fR
+.sp
+Try to connect this many times before giving up\&. One connect attempt is made per second\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" ndb_desc: table option
+.\" table option: ndb_desc
+\fB\-\-table=\fR\fB\fItbl_name\fR\fR,
+\fB\-t\fR
+.sp
+Specify the table in which to look for an index\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" ndb_desc: unqualified option
+.\" unqualified option: ndb_desc
+\fB\-\-unqualified\fR,
+\fB\-u\fR
+.sp
+Use unqualified table names\&.
+.RE
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2012, Oracle and/or its affiliates. All rights reserved.
-.PP
-This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
-.PP
-This documentation 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.
-.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/.
+Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.