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

[Laurynas Biveinis]

2nd MP: rebased on the correct branch.
http://jenkins.percona.com/job/percona-server-5.6-param/109/

Post-review fixes for the lp:percona-server/5.5 rev 397 merge to
lp:percona-server/5.6.

- Revert the spurious copyright comment changes, so that they match
  the ones at the current lp:mysql-server/5.6. Do not touch the ones
  that are fixed in the subsequent 5.6.11 merge.

- Revert the change introduced at the porting where SHOW SLAVE STATUS
  would check whether the slave is running, and returning
  WARN_NO_MASTER_INFO warning if it's not. Re-record
  disabled_replication test to match.

- Remove introduced-by-mistake debugging printf()s in sys_vars.h.

- Fix Percona InnoDB version in univ.i.

- Remove obsolete UNIV_SRV_PRINT_LATCH_WAITS code.

[Laurynas Biveinis (laurynas-biveinis)]

Local test and long and a hard stare at the diff instead of Jenkins. http://jenkins.percona.com/job/percona-server-5.6-param/107/ could be checked in a week's or so time though.

[Alexey Kopytov (akopytov)]

Jenkins test failures. Will be resubmitted as discussed on IRC.

review: Needs Resubmitting

[Laurynas Biveinis (laurynas-biveinis)]

Revisions 350--352 that are to be merged here do not contain sys_vars or doc/ changes. No idea why they appear in the diff.

[Alexey Kopytov (akopytov)]

Test failures.

review: Needs Fixing

[Alexey Kopytov (akopytov)]

As discussed on IRC, the changed page tests will be fixed after merging to trunk.

review: Approve

[Laurynas Biveinis (laurynas-biveinis)]

Thanks, the bitmap test failures are tracked at https://bugs.launchpad.net/percona-server/+bug/1182793

=== removed file '.bzrignore'
--- .bzrignore	2013-05-22 08:54:33 +0000
+++ .bzrignore	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-build

=== modified file 'Percona-Server/client/CMakeLists.txt'
--- Percona-Server/client/CMakeLists.txt	2013-05-22 08:54:33 +0000
+++ Percona-Server/client/CMakeLists.txt	2013-05-22 08:54:39 +0000
@@ -1,4 +1,3 @@
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify

=== modified file 'Percona-Server/mysql-test/r/disabled_replication.result'
--- Percona-Server/mysql-test/r/disabled_replication.result	2013-05-22 08:54:33 +0000
+++ Percona-Server/mysql-test/r/disabled_replication.result	2012-12-14 15:02:07 +0000
@@ -1,6 +1,5 @@
 SHOW SLAVE STATUS;
-Warnings:
-Warning	1617	The master info structure does not exist
+Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error	Replicate_Ignore_Server_Ids	Master_Server_Id	Master_UUID	Master_Info_File	SQL_Delay	SQL_Remaining_Delay	Slave_SQL_Running_State	Master_Retry_Count	Master_Bind	Last_IO_Error_Timestamp	Last_SQL_Error_Timestamp	Master_SSL_Crl	Master_SSL_Crlpath	Retrieved_Gtid_Set	Executed_Gtid_Set	Auto_Position
 RESET SLAVE;
 ERROR HY000: Slave is not configured or failed to initialize properly. You must at least set --server-id to enable either a master or a slave. Additional error messages can be found in the MySQL error log.
 SHOW RELAYLOG EVENTS;

=== added file 'Percona-Server/mysql-test/suite/sys_vars/r/innodb_page_size_basic.result'
--- Percona-Server/mysql-test/suite/sys_vars/r/innodb_page_size_basic.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/r/innodb_page_size_basic.result	2013-05-22 08:54:39 +0000
@@ -0,0 +1,3 @@
+SELECT @@global.innodb_page_size;
+@@global.innodb_page_size
+16384

=== modified file 'Percona-Server/sql/mysqld.h'
--- Percona-Server/sql/mysqld.h	2013-05-22 08:54:33 +0000
+++ Percona-Server/sql/mysqld.h	2013-05-22 08:54:39 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/sql/sql_connect.cc'
--- Percona-Server/sql/sql_connect.cc	2013-05-22 08:54:33 +0000
+++ Percona-Server/sql/sql_connect.cc	2013-05-22 08:54:39 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/sql/sql_parse.cc'
--- Percona-Server/sql/sql_parse.cc	2013-05-22 08:54:33 +0000
+++ Percona-Server/sql/sql_parse.cc	2013-05-22 08:54:39 +0000
@@ -2980,16 +2980,7 @@
     {
       mysql_mutex_lock(&LOCK_active_mi);
     }
-    if (active_mi != NULL)
-    {
-      res = show_slave_status(thd, active_mi);
-    }
-    else
-    {
-      push_warning(thd, Sql_condition::WARN_LEVEL_WARN,
-                   WARN_NO_MASTER_INFO, ER(WARN_NO_MASTER_INFO));
-      my_ok(thd);
-    }
+    res = show_slave_status(thd, active_mi);
     if(do_lock)
     {
       mysql_mutex_unlock(&LOCK_active_mi);

=== modified file 'Percona-Server/sql/sys_vars.h'
--- Percona-Server/sql/sys_vars.h	2013-05-22 08:54:33 +0000
+++ Percona-Server/sql/sys_vars.h	2013-05-22 08:54:39 +0000
@@ -193,9 +193,6 @@
       if (SIGNED)
       {
         longlong max_val= *max_var_ptr();
-        fprintf(stderr, "v = %lld, max_val = %lld\n", v, max_val);
-        fprintf(stderr, "save_result = %lld\n",
-                (longlong)(var->save_result.ulonglong_value));
         if (((longlong)(var->save_result.ulonglong_value)) > max_val)
           var->save_result.ulonglong_value= max_val;
         /*
@@ -218,12 +215,6 @@
       (getopt_constraint_get_min_value(option.name, 0, FALSE));
     vmax= static_cast<const T *>
       (getopt_constraint_get_max_value(option.name, 0, FALSE));
-    if (vmin)
-      fprintf(stderr, "vmin = signed %lld, unsigned %llu\n",
-              (long long)*vmin, (unsigned long long)*vmin);
-    if (vmax)
-      fprintf(stderr, "vmax = signed %lld, unsigned %llu\n",
-              (long long)*vmax, (unsigned long long)*vmax);
 
     if (SIGNED)
     {

=== modified file 'Percona-Server/storage/heap/hp_info.c'
--- Percona-Server/storage/heap/hp_info.c	2013-05-22 08:54:33 +0000
+++ Percona-Server/storage/heap/hp_info.c	2013-05-22 08:54:39 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (C) 2000-2004 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/storage/innobase/include/univ.i'
--- Percona-Server/storage/innobase/include/univ.i	2013-05-22 08:54:33 +0000
+++ Percona-Server/storage/innobase/include/univ.i	2013-05-22 08:54:39 +0000
@@ -47,7 +47,7 @@
 #define INNODB_VERSION_BUGFIX	MYSQL_VERSION_PATCH
 
 #ifndef PERCONA_INNODB_VERSION
-#define PERCONA_INNODB_VERSION 29.3
+#define PERCONA_INNODB_VERSION 60.3
 #endif
 
 /* Enable UNIV_LOG_ARCHIVE in XtraDB */

=== modified file 'Percona-Server/storage/innobase/sync/sync0rw.cc'
--- Percona-Server/storage/innobase/sync/sync0rw.cc	2013-05-22 08:54:33 +0000
+++ Percona-Server/storage/innobase/sync/sync0rw.cc	2013-05-22 08:54:39 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2012, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2011, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2008, Google Inc.
 
 Portions of this file contain modifications contributed and copyrighted by

=== modified file 'Percona-Server/storage/innobase/sync/sync0sync.cc'
--- Percona-Server/storage/innobase/sync/sync0sync.cc	2013-05-22 08:54:33 +0000
+++ Percona-Server/storage/innobase/sync/sync0sync.cc	2013-05-22 08:54:39 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2012, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2011, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2008, Google Inc.
 
 Portions of this file contain modifications contributed and copyrighted by
@@ -514,14 +514,6 @@
 		os_thread_yield();
 	}
 
-#ifdef UNIV_SRV_PRINT_LATCH_WAITS
-	fprintf(stderr,
-		"Thread " ULINTPF " spin wait mutex at %p"
-		" '%s' rnds " ULINTPF "\n",
-		os_thread_pf(os_thread_get_curr_id()), (void*) mutex,
-		mutex->cmutex_name, i);
-#endif
-
 	mutex_spin_round_count.add(counter_index, i);
 
 	if (ib_mutex_test_and_set(mutex) == 0) {
@@ -584,14 +576,6 @@
 	after the change in the wait array and the waiters field was made.
 	Now there is no risk of infinite wait on the event. */
 
-#ifdef UNIV_SRV_PRINT_LATCH_WAITS
-	fprintf(stderr,
-		"Thread " ULINTPF " OS wait mutex at %p '%s' rnds " ULINTPF
-		"\n",
-		os_thread_pf(os_thread_get_curr_id()), (void*) mutex,
-		mutex->cmutex_name, i);
-#endif
-
 	mutex_os_wait_count.add(counter_index, 1);
 
 	mutex->count_os_wait++;

=== modified file 'Percona-Server/storage/myisam/mi_check.c'
--- Percona-Server/storage/myisam/mi_check.c	2013-05-22 08:54:33 +0000
+++ Percona-Server/storage/myisam/mi_check.c	2013-03-05 12:46:43 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/storage/myisam/sort.c'
--- Percona-Server/storage/myisam/sort.c	2013-05-22 08:54:33 +0000
+++ Percona-Server/storage/myisam/sort.c	2013-05-22 08:54:39 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== removed file 'doc/Makefile'
--- doc/Makefile	2013-05-22 08:54:33 +0000
+++ doc/Makefile	1970-01-01 00:00:00 +0000
@@ -1,145 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-PAPER         =
-BUILDDIR      = build
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
-
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  offhtml    to make standalone HTML files without fetching the new theme files"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-
-clean:
-	-rm -rf $(BUILDDIR)/*
-
-html:
-	@echo "Downloading percona-theme ..."
-	@wget -O percona-theme.tar.gz http://percona.com/docs/theme/percona-server/5.6
-	@echo "Extracting theme."
-	@tar -zxf percona-theme.tar.gz
-	@rm -rf source/percona-theme
-	@mv percona-theme source/percona-theme
-	@rm percona-theme.tar.gz
-	@echo "Building html doc"
-
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-offhtml:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/PerconaServer.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/PerconaServer.qhc"
-
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/PerconaServer"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/PerconaServer"
-	@echo "# devhelp"
-
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-latexpdf:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	make -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-man:
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."

=== added file 'doc/make.bat'
--- doc/make.bat	1970-01-01 00:00:00 +0000
+++ doc/make.bat	2013-05-22 08:54:39 +0000
@@ -0,0 +1,170 @@
+@ECHO OFF
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set BUILDDIR=build
+set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% source
+if NOT "%PAPER%" == "" (
+	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
+)
+
+if "%1" == "" goto help
+
+if "%1" == "help" (
+	:help
+	echo.Please use `make ^<target^>` where ^<target^> is one of
+	echo.  html       to make standalone HTML files
+	echo.  dirhtml    to make HTML files named index.html in directories
+	echo.  singlehtml to make a single large HTML file
+	echo.  pickle     to make pickle files
+	echo.  json       to make JSON files
+	echo.  htmlhelp   to make HTML files and a HTML help project
+	echo.  qthelp     to make HTML files and a qthelp project
+	echo.  devhelp    to make HTML files and a Devhelp project
+	echo.  epub       to make an epub
+	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
+	echo.  text       to make text files
+	echo.  man        to make manual pages
+	echo.  changes    to make an overview over all changed/added/deprecated items
+	echo.  linkcheck  to check all external links for integrity
+	echo.  doctest    to run all doctests embedded in the documentation if enabled
+	goto end
+)
+
+if "%1" == "clean" (
+	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
+	del /q /s %BUILDDIR%\*
+	goto end
+)
+
+if "%1" == "html" (
+	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
+	goto end
+)
+
+if "%1" == "dirhtml" (
+	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
+	goto end
+)
+
+if "%1" == "singlehtml" (
+	%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
+	goto end
+)
+
+if "%1" == "pickle" (
+	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can process the pickle files.
+	goto end
+)
+
+if "%1" == "json" (
+	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can process the JSON files.
+	goto end
+)
+
+if "%1" == "htmlhelp" (
+	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can run HTML Help Workshop with the ^
+.hhp project file in %BUILDDIR%/htmlhelp.
+	goto end
+)
+
+if "%1" == "qthelp" (
+	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can run "qcollectiongenerator" with the ^
+.qhcp project file in %BUILDDIR%/qthelp, like this:
+	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\PerconaServer.qhcp
+	echo.To view the help file:
+	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\PerconaServer.ghc
+	goto end
+)
+
+if "%1" == "devhelp" (
+	%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished.
+	goto end
+)
+
+if "%1" == "epub" (
+	%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The epub file is in %BUILDDIR%/epub.
+	goto end
+)
+
+if "%1" == "latex" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "text" (
+	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The text files are in %BUILDDIR%/text.
+	goto end
+)
+
+if "%1" == "man" (
+	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The manual pages are in %BUILDDIR%/man.
+	goto end
+)
+
+if "%1" == "changes" (
+	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.The overview file is in %BUILDDIR%/changes.
+	goto end
+)
+
+if "%1" == "linkcheck" (
+	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Link check complete; look for any errors in the above output ^
+or in %BUILDDIR%/linkcheck/output.txt.
+	goto end
+)
+
+if "%1" == "doctest" (
+	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Testing of doctests in the sources finished, look at the ^
+results in %BUILDDIR%/doctest/output.txt.
+	goto end
+)
+
+:end

=== added directory 'doc/source/diagnostics'
=== added file 'doc/source/diagnostics/innodb_deadlock_count.rst'
--- doc/source/diagnostics/innodb_deadlock_count.rst	1970-01-01 00:00:00 +0000
+++ doc/source/diagnostics/innodb_deadlock_count.rst	2013-05-22 08:54:39 +0000
@@ -0,0 +1,57 @@
+.. _innodb_deadlocks_page:
+
+==========================
+ Count |InnoDB| Deadlocks
+==========================
+
+When running a transactional application you have to live with deadlocks. They are not problematic as long as they do not occur too frequently. The standard ``SHOW INNODB STATUS`` gives information on the latest deadlocks but it is not very useful when you want to know the total number of deadlocks or the number of deadlocks per unit of time. 
+
+This change adds a status variable that keeps track of the number of deadlocks since the server startup, opening the way to a better knowledge of your deadlocks.
+
+This feature was provided by Eric Bergen under BSD license (see `InnoDB Deadlock Count Patch <http://ebergen.net/wordpress/2009/08/27/innodb-deadlock-count-patch/>`_).
+
+It adds a new global status variable (:variable:`innodb_deadlocks`) showing the number of deadlocks.*
+
+You can use it with ``SHOW GLOBAL STATUS``, e.g.: ::
+
+  mysql> SHOW GLOBAL STATUS LIKE 'innodb_deadlocks';
+  +------------------+-------+
+  | Variable_name    | Value |
+  +------------------+-------+
+  | innodb_deadlocks | 323   |
+  +------------------+-------+
+
+or with ``INFORMATION_SCHEMA``, e.g.: ::
+
+  mysql> SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_deadlocks'; 
+  +----------------+
+  | VARIABLE_VALUE |
+  +----------------+
+  | 323            |
+  +----------------+
+
+A deadlock will occur when at least two transactions are mutually waiting for the other to finish, thus creating a circular dependency that lasts until something breaks it. |InnoDB| is quite good at detecting deadlocks and generally returns an error instantly. Most transactional systems have no way to prevent deadlocks from occurring and must be designed to handle them, for instance by retrying the transaction that failed.
+
+
+Version Specific Information
+============================
+
+  * 5.5.8-20.0:
+    Full functionality available.
+
+Status Variables
+================
+
+One new status variable was introduced by this feature.
+
+.. variable:: innodb_deadlocks
+
+     :vartype: LONG
+     :scope: Global
+
+
+Related Reading
+===============
+
+  * `Original post by Eric Bergen <http://ebergen.net/wordpress/2009/08/27/|InnoDB|-deadlock-count-patch/>`_
+

=== added file 'doc/source/diagnostics/innodb_show_lock_names.rst'
--- doc/source/diagnostics/innodb_show_lock_names.rst	1970-01-01 00:00:00 +0000
+++ doc/source/diagnostics/innodb_show_lock_names.rst	2013-05-22 08:54:39 +0000
@@ -0,0 +1,24 @@
+.. _innodb_show_lock_names:
+
+=================
+ Show Lock Names
+=================
+
+This feature is currently undocumented except for the following example.
+
+Example: ::
+
+  mysql> SHOW ENGINE INNODB MUTEX;
+  +--------+---------------------------+---------------+
+  | Type   | Name                      | Status        |
+  +--------+---------------------------+---------------+
+  | InnoDB | &rseg->mutex              | os_waits=210  |
+  | InnoDB | &dict_sys->mutex          | os_waits=3    |
+  | InnoDB | &trx_doublewrite->mutex   | os_waits=1    |
+  | InnoDB | &log_sys->mutex           | os_waits=1197 |
+  | InnoDB | &LRU_list_mutex           | os_waits=2    |
+  | InnoDB | &fil_system->mutex        | os_waits=5    |
+  | InnoDB | &kernel_mutex             | os_waits=242  |
+  | InnoDB | &new_index->lock          | os_waits=2    |
+  | InnoDB | &new_index->lock          | os_waits=415  |
+  .....

=== added file 'doc/source/diagnostics/innodb_show_status.rst'
--- doc/source/diagnostics/innodb_show_status.rst	1970-01-01 00:00:00 +0000
+++ doc/source/diagnostics/innodb_show_status.rst	2013-05-22 08:54:39 +0000
@@ -0,0 +1,475 @@
+.. _innodb_show_status:
+
+======================
+ Show |InnoDB| Status
+======================
+
+This feature reorganizes the output of ``SHOW INNODB STATUS`` for a better readability and prints the amount of memory used by the internal hash tables. In addition, new variables are available to control the output.
+
+This feature modified the ``SHOW INNODB STATUS`` command as follows:
+
+  * ``TRANSACTION`` section was moved to the end of the output, so that important information is not overlooked when the there is a large amount of it.
+
+  * Added two variables to control ``SHOW INNODB STATUS`` information presented (bugfix for `#29123 <http://bugs.mysql.com/bug.php?id=29126>`_):
+
+    * :variable:`innodb_show_verbose_locks` - Whether to show records locked
+
+    * :variable:`innodb_show_locks_held` - Number of locks held to print for each |InnoDB| transaction
+
+  * Added extended information about |InnoDB| internal hash table sizes (in bytes) in the ``BUFFER POOL AND MEMORY`` section; also added buffer pool size in bytes.
+
+  * Added additional LOG section information (beginning in release 5.5.8-20.0).
+
+Version Specific Information
+============================
+
+  * 5.5.8-20.0
+    Added status variables showing information from ``SHOW INNODB STATUS``.
+
+  * 5.5.8-20.0
+    Added additional information in the LOG section.
+
+  * 5.5.10-20.1:
+    Renamed status variable :variable:`innodb_row_lock_numbers` to :variable:`innodb_current_row_locks`.
+
+Other Information
+=================
+
+  * Author / Origin:
+    Baron Schwartz, http://lists.mysql.com/internals/35174
+
+
+System Variables
+================
+
+.. variable:: innodb_show_verbose_locks
+
+     :cli: Yes
+     :conf: Yes
+     :scope: Global
+     :dyn: Yes
+     :vartype: ULONG
+     :default: 0
+     :range: 0 - 1
+
+Specifies to show records locked in ``SHOW INNODB STATUS``. The default is 0, which means only the higher-level information about the lock (which table and index is locked, etc.) is printed. If set to 1, then traditional |InnoDB| behavior is enabled: the records that are locked are dumped to the output.
+
+.. variable:: innodb_show_locks_held
+
+     :cli: Yes
+     :conf: Yes
+     :scope: Global
+     :dyn: Yes
+     :vartype: ULONG
+     :default: 10
+     :range: 0 - 1000
+
+Specifies the number of locks held to print for each |InnoDB| transaction in SHOW INNODB STATUS.
+
+
+Status Variables
+================
+
+The status variables here contain information available in the output of ``SHOW INNODB STATUS``, organized by the sections ``SHOW INNODB STATUS`` displays. If you are familiar with the output of ``SHOW INNODB STATUS``, you will probably already recognize the information these variables contain.
+
+
+BACKGROUND THREAD
+-----------------
+
+The following variables contain information in the BACKGROUND THREAD section of the output from ``SHOW INNODB STATUS``. An example of that output is:
+
+ Insert an example of BACKGROUND THREAD section output here.
+
+.. variable:: innodb_master_thread_1_second_loops
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_master_thread_10_second_loops
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_master_thread_background_loops
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_master_thread_main_flush_loops
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_master_thread_sleeps
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_background_log_sync
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+SEMAPHORES
+----------
+
+The following variables contain information in the SEMAPHORES section of the output from ``SHOW INNODB STATUS``. An example of that output is: ::
+
+  ----------
+  SEMAPHORES
+  ----------
+  OS WAIT ARRAY INFO: reservation count 9664, signal count 11182
+  Mutex spin waits 20599, rounds 223821, OS waits 4479
+  RW-shared spins 5155, OS waits 1678; RW-excl spins 5632, OS waits 2592
+  Spin rounds per wait: 10.87 mutex, 15.01 RW-shared, 27.19 RW-excl
+
+.. variable:: innodb_mutex_os_waits
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_mutex_spin_rounds
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_mutex_spin_waits
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_s_lock_os_waits
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_s_lock_spin_rounds
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_s_lock_spin_waits
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_x_lock_os_waits
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_x_lock_spin_rounds
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_x_lock_spin_waits
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+INSERT BUFFER AND ADAPTIVE HASH INDEX
+-------------------------------------
+
+The following variables contain information in the INSERT BUFFER AND ADAPTIVE HASH INDEX section of the output from SHOW |InnoDB| STATUS. An example of that output is: ::
+
+  -------------------------------------
+  INSERT BUFFER AND ADAPTIVE HASH INDEX
+  -------------------------------------
+  Ibuf: size 1, free list len 6089, seg size 6091,
+  44497 inserts, 44497 merged recs, 8734 merges
+  Hash table size 276707, node heap has 1 buffer(s)
+  0.00 hash searches/s, 0.00 non-hash searches/s
+
+.. variable:: innodb_ibuf_discarded_delete_marks
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_ibuf_discarded_deletes
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_ibuf_discarded_inserts
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_ibuf_free_list
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_ibuf_merged_delete_marks
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_ibuf_merged_deletes
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_ibuf_merged_inserts
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_ibuf_merges
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_ibuf_segment_size
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_ibuf_size
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_adaptive_hash_cells
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_adaptive_hash_heap_buffers
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_adaptive_hash_hash_searches
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_adaptive_hash_non_hash_searches
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+LOG
+---
+
+The following variables contain information in the LOG section of the output from ``SHOW INNODB STATUS``. An example of that output is: ::
+
+  ---
+  LOG
+  ---
+  Log sequence number 28219393219
+  Log flushed up to 28219393219
+  Last checkpoint at 28212583337
+  Max checkpoint age 7782360
+  Checkpoint age target 7539162
+  Modified age 6809882
+  Checkpoint age 6809882
+  0 pending log writes, 0 pending chkp writes
+  8570 log i/o's done, 2000.00 log i/o's/second
+
+.. variable:: innodb_lsn_current
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_lsn_flushed
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_lsn_last_checkpoint
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_checkpoint_age
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_checkpoint_max_age
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_checkpoint_target_age
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+BUFFER POOL AND MEMORY
+----------------------
+
+The following variables contain information in the BUFFER POOL AND MEMORY section of the output from ``SHOW INNODB STATUS``. An example of that output is: ::
+
+  ----------------------
+  BUFFER POOL AND MEMORY
+  ----------------------
+  Total memory allocated 137625600; in additional pool allocated 0
+  Internal hash tables (constant factor + variable factor)
+      Adaptive hash index 3774352 (2213656 + 1560696)
+      Page hash 139144
+      Dictionary cache 629811 (554864 + 74947)
+      File system 83536 (82672 + 864)
+      Lock system 380792 (332872 + 47920)
+      Recovery system 0 (0 + 0)
+      Threads 84040 (82696 + 1344)
+  Dictionary memory allocated 74947
+  Buffer pool size 8192
+  Buffer pool size, bytes 134217728
+  Free buffers 0
+  Database pages 8095
+  Old database pages 2968
+  Modified db pages 5914
+  Pending reads 0
+  Pending writes: LRU 0, flush list 129, single page 0
+  Pages made young 372084, not young 0
+  2546000.00 youngs/s, 0.00 non-youngs/s
+  Pages read 103356, created 154787, written 979572
+  469000.00 reads/s, 78000.00 creates/s, 138000.00 writes/s
+  Buffer pool hit rate 994 / 1000, young-making rate 34 / 1000 not 0 / 1000
+  Pages read ahead 0.00/s, evicted without access 15000.00/s
+
+.. variable:: innodb_mem_adaptive_hash
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_mem_dictionary
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_mem_total
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_buffer_pool_pages_LRU_flushed
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_buffer_pool_pages_made_not_young
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_buffer_pool_pages_made_young
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_buffer_pool_pages_old
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+TRANSACTIONS
+------------
+
+The following variables contain information in the TRANSACTIONS section of the output from ``SHOW INNODB STATUS``. An example of that output is: ::
+
+  ------------
+  TRANSACTIONS
+  ------------
+  Trx id counter F561FD
+  Purge done for trx's n:o < F561EB undo n:o < 0
+  History list length 19
+  LIST OF TRANSACTIONS FOR EACH SESSION:
+  ---TRANSACTION 0, not started, process no 993, OS thread id 140213152634640
+  mysql thread id 15933, query id 32109 localhost root
+  show innodb status
+  ---TRANSACTION F561FC, ACTIVE 29 sec, process no 993, OS thread id 140213152769808 updating or deleting
+  mysql tables in use 1, locked 1
+
+.. variable:: innodb_history_list_length
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_max_trx_id
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_oldest_view_low_limit_trx_id
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_purge_trx_id
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_purge_undo_no
+
+     :version 5.5.8-20.0: Introduced.
+     :vartype: Numeric
+     :scope: Global
+
+.. variable:: innodb_current_row_locks
+
+     :version 5.5.8-20.0: Introduced.
+     :version 5.5.10-20.1: Renamed.
+     :vartype: Numeric
+     :scope: Global
+
+ This variable was named :variable:`innodb_row_lock_numbers` in release 5.5.8-20.0.
+
+
+Other reading
+=============
+
+  * `SHOW INNODB STATUS walk through <http://www.mysqlperformanceblog.com/2006/07/17/show-innodb-status-walk-through/>`_
+
+  * `Table locks in SHOW INNODB STATUS <http://www.mysqlperformanceblog.com/2010/06/08/table-locks-in-show-innodb-status/>`_

=== added file 'doc/source/diagnostics/misc_info_schema_tables.rst'
--- doc/source/diagnostics/misc_info_schema_tables.rst	1970-01-01 00:00:00 +0000
+++ doc/source/diagnostics/misc_info_schema_tables.rst	2013-03-05 12:46:43 +0000
@@ -0,0 +1,48 @@
+.. _misc_info_schema_tables:
+
+=================================
+ Misc. INFORMATION_SCHEMA Tables
+=================================
+
+This page lists the ``INFORMATION_SCHEMA`` tables added to standard |MySQL| by |Percona Server| that don't exist elsewhere in the documentation.
+
+.. _temp_tables:
+
+Temporary tables
+================
+
+ Only the temporary tables that were explicitly created with `CREATE TEMPORARY TABLE` or `ALTER TABLE` are shown, and not the ones created to process complex queries.
+
+.. table:: INFORMATION_SCHEMA.GLOBAL_TEMPORARY_TABLES
+ 
+   :version 5.6.5-60.0: Feature introduced
+   :column SESSION_ID: |MySQL| connection id
+   :column TABLE_SCHEMA: Schema in which the temporary table is created
+   :column TABLE_NAME: Name of the temporary table
+   :column ENGINE: Engine of the temporary table
+   :column NAME: Internal name of the temporary table
+   :column TABLE_ROWS: Number of rows of the temporary table
+   :column AVG_ROW_LENGTH: Average row length of the temporary table
+   :column DATA_LENGTH: Size of the data (Bytes)
+   :column INDEX_LENGTH: Size of the indexes (Bytes)
+   :column CREATE_TIME: Date and time of creation of the temporary table
+   :column UPDATE_TIME: Date and time of the latest update of the temporary table
+
+This table holds information on the temporary tables existing for all connections. You don't need the ``SUPER`` privilege to query this table.
+
+.. table:: INFORMATION_SCHEMA.TEMPORARY_TABLES
+
+   :version 5.6.5-60.0: Feature introduced
+   :column SESSION_ID: |MySQL| connection id
+   :column TABLE_SCHEMA: Schema in which the temporary table is created
+   :column TABLE_NAME: Name of the temporary table
+   :column ENGINE: Engine of the temporary table
+   :column NAME: Internal name of the temporary table
+   :column TABLE_ROWS: Number of rows of the temporary table
+   :column AVG_ROW_LENGTH: Average row length of the temporary table
+   :column DATA_LENGTH: Size of the data (Bytes)
+   :column INDEX_LENGTH: Size of the indexes (Bytes)
+   :column CREATE_TIME: Date and time of creation of the temporary table
+   :column UPDATE_TIME: Date and time of the latest update of the temporary table
+
+This table holds information on the temporary tables existing for the running connection.

=== added file 'doc/source/diagnostics/mysql_syslog.rst'
--- doc/source/diagnostics/mysql_syslog.rst	1970-01-01 00:00:00 +0000
+++ doc/source/diagnostics/mysql_syslog.rst	2013-05-22 08:54:39 +0000
@@ -0,0 +1,43 @@
+.. _mysql_syslog:
+
+======================================
+ Log All Client Commands (``syslog``)
+======================================
+
+When enabled, this feature causes all commands run by the command line client to be logged to syslog. If you want to enable this option permanently, add it to the [mysql] group in my.cnf.
+
+Version Specific Information
+============================
+
+  * :rn:`5.5.8-20.0`:
+    Full functionality available.
+
+Other Information
+=================
+
+  * Author / Origin:
+    Percona
+
+Client Variables
+================
+
+.. variable:: syslog
+
+     :cli: Yes
+     :conf: Yes
+     :server: No
+     :scope: Global
+     :dyn: Yes
+     :vartype: Boolean
+     :default: OFF
+     :range: ON/OFF
+
+The variable enables (ON)/disables (OFF) logging to syslog.
+
+
+Other Reading
+=============
+
+  * http://en.wikipedia.org/wiki/Syslog
+
+  * http://tools.ietf.org/html/rfc5424

=== added file 'doc/source/diagnostics/process_list.rst'
--- doc/source/diagnostics/process_list.rst	1970-01-01 00:00:00 +0000
+++ doc/source/diagnostics/process_list.rst	2013-03-05 12:46:43 +0000
@@ -0,0 +1,53 @@
+.. _process_list:
+
+=============
+Process List
+=============
+
+This page describes Percona changes to both the standard |MySQL| ``SHOW PROCESSLIST`` command and the standard |MySQL| ``INFORMATION_SCHEMA`` table ``PROCESSLIST``.
+
+The changes that have been made as of version 5.6 of the server are:
+
+  * :table:`PROCESSLIST` table:
+
+    * added column ``TIME_MS``
+
+Version Specific Information
+============================
+
+  * :rn:`5.6.5-60.0`:
+
+    * Added column ``TIME_MS`` to table ``PROCESSLIST``.
+
+
+INFORMATION_SCHEMA Tables
+=========================
+
+.. table:: INFORMATION_SCHEMA.PROCESSLIST
+
+   This table implements modifications to the standard |MySQL| ``INFORMATION_SCHEMA`` table ``PROCESSLIST``.
+
+   :column ID: The connection identifier.
+   :column USER: The |MySQL| user who issued the statement.
+   :column HOST: The host name of the client issuing the statement.
+   :column DB: The default database, if one is selected, otherwise NULL.
+   :column COMMAND: The type of command the thread is executing.
+   :column TIME: The time in seconds that the thread has been in its current state.
+   :column STATE: An action, event, or state that indicates what the thread is doing.
+   :column INFO: The statement that the thread is executing, or NULL if it is not executing any statement.
+   :column TIME_MS: The time in milliseconds that the thread has been in its current state.
+
+
+Example Output
+==============
+
+Table :table:`PROCESSLIST`: ::
+
+  mysql> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+
+  +----+------+-----------+--------------------+---------+------+-----------+----------------------------------------------+---------+
+  | ID | USER | HOST      | DB                 | COMMAND | TIME | STATE     | INFO                                         | TIME_MS |
+  +----+------+-----------+--------------------+---------+------+-----------+----------------------------------------------+---------+
+  |  5 | root | localhost | information_schema | Query   |    0 | executing | select * from information_schema.PROCESSLIST |       0 |
+  +----+------+-----------+--------------------+---------+------+-----------+----------------------------------------------+---------+
+ 

=== added file 'doc/source/diagnostics/show_engines.rst'
--- doc/source/diagnostics/show_engines.rst	1970-01-01 00:00:00 +0000
+++ doc/source/diagnostics/show_engines.rst	2013-05-22 08:54:39 +0000
@@ -0,0 +1,40 @@
+.. _show_engines:
+
+======================
+ Show Storage Engines
+======================
+
+This feature changes the comment field displayed when the ``SHOW STORAGE ENGINES`` command is executed and |XtraDB| is the storage engine.
+
+Before the Change: ::
+
+  mysql> show storage engines;
+  +------------+---------+----------------------------------------------------------------+--------------+------+------------+
+  | Engine     | Support | Comment                                                        | Transactions | XA   | Savepoints |
+  +------------+---------+----------------------------------------------------------------+--------------+------+------------+
+  | InnoDB     | YES     | Supports transactions, row-level locking, and foreign keys     | YES          | YES  | YES        |
+  ...
+  +------------+---------+----------------------------------------------------------------+--------------+------+------------+
+
+After the Change: ::
+
+  mysql> show storage engines;
+  +------------+---------+----------------------------------------------------------------------------+--------------+------+------------+ 
+  | Engine     | Support | Comment                                                                    | Transactions |   XA | Savepoints |
+  +------------+---------+----------------------------------------------------------------------------+--------------+------+------------+
+  | InnoDB     | YES     | Percona-XtraDB, Supports transactions, row-level locking, and foreign keys |          YES | YES  | YES        |
+  ...
+  +------------+---------+----------------------------------------------------------------------------+--------------+------+------------+
+
+Version-Specific Information
+============================
+
+  * 5.5.8-20.0:
+    Full functionality available.
+
+Other Information
+=================
+
+  * Author / Origin:
+    Percona
+

=== added file 'doc/source/diagnostics/slow_extended_55.rst'
--- doc/source/diagnostics/slow_extended_55.rst	1970-01-01 00:00:00 +0000
+++ doc/source/diagnostics/slow_extended_55.rst	2013-05-22 08:54:39 +0000
@@ -0,0 +1,377 @@
+.. _slow_extended_55:
+
+================
+ Slow Query Log
+================
+
+This feature adds microsecond time resolution and additional statistics to the slow query log output. It lets you enable or disable the slow query log at runtime, adds logging for the slave SQL thread, and adds fine-grained control over what and how much to log into the slow query log.
+
+The ability to log queries with microsecond precision is essential for measuring the work the |MySQL| server performs. The standard slow query log in |MySQL| 5.0 has only 1-second granularity, which is too coarse for all but the slowest queries. |MySQL| 5.1 has microsecond resolution, but does not have the extra information about query execution that is included in the |Percona Server|.
+
+You can use *Percona-Toolkit*'s `pt-query-digest <http://www.percona.com/doc/percona-toolkit/2.1/pt-query-digest.html>`_ tool to aggregate similar queries together and report on those that consume the most execution time.
+
+
+Version Specific Information
+============================
+
+  * 5.5.8-20.0:
+    Added values ``profiling`` and ``profiling_use_getrusage`` to variable log_slow_verbosity.
+
+  * 5.5.10-20.1:
+     * Renamed variable :variable:`slow_query_log_timestamp_always` to :variable:`slow_query_log_timestamp_always`.
+
+     * Renamed variable :variable:`slow_query_log_microseconds_timestamp` to :variable:`slow_query_log_timestamp_precision`.
+
+     * Renamed variable :variable:`use_global_log_slow_control` to :variable:`slow_query_log_use_global_control`.
+
+Other Information
+=================
+
+  * Author / Origin:
+    Maciej Dobrzanski, Percona
+
+System Variables
+================
+
+.. variable:: log_slow_admin_statements
+
+     :cli: Yes
+     :conf: Yes
+     :scope: Global
+     :dyn: yes
+
+When this variable is enabled, administrative statements will be logged to the slow query log. Upstream version of the |MySQL| server has implemented command line option with same name. Significant difference is that this feature is implemented as variable in |Percona Server|, that means it can be enabled/disabled dynamically without restarting the server.
+
+.. variable:: log_slow_filter
+
+     :cli: Yes
+     :conf: Yes
+     :scope: Global, Session
+     :dyn: Yes
+
+Filters the slow log by the query's execution plan. The value is a comma-delimited string, and can contain any combination of the following values:
+
+  * ``qc_miss``:
+    The query was not found in the query cache.
+
+  * ``full_scan``:
+    The query performed a full table scan.
+
+  * ``full_join``:
+    The query performed a full join (a join without indexes).
+
+  * ``tmp_table``:
+    The query created an implicit internal temporary table.
+
+  * ``tmp_table_on_disk``:
+    The query``s temporary table was stored on disk.
+
+  * ``filesort``:
+    The query used a filesort.
+
+  * ``filesort_on_disk``:
+    The filesort was performed on disk.
+
+Values are OR'ed together. If the string is empty, then the filter is disabled. If it is not empty, then queries will only be logged to the slow log if their execution plan matches one of the types of plans present in the filter.
+
+For example, to log only queries that perform a full table scan, set the value to ``full_scan``. To log only queries that use on-disk temporary storage for intermediate results, set the value to ``tmp_table_on_disk,filesort_on_disk``.
+
+.. variable:: log_slow_rate_type
+
+     :cli: Yes
+     :conf: Yes
+     :scope: Global
+     :dyn: Yes
+     :vartype: Enumerated
+     :default: ``session``
+     :range: ``session``, ``query``
+
+Specifies semantic of :variable:`log_slow_rate_limit` - ``session`` or ``query``.
+
+.. variable:: log_slow_rate_limit
+
+     :cli: Yes
+     :conf: Yes
+     :scope: Global, session
+     :dyn: Yes
+
+Behavior of this variable depends from :variable:`log_slow_rate_type`.
+
+Specifies that only a fraction of ``session/query`` should be logged. Logging is enabled for every nth ``session/query``. By default, n is 1, so logging is enabled for every ``session/query``. Please note: when :variable:`log_slow_rate_type` is ``session`` rate limiting is disabled for the replication thread.
+
+Logging all queries might consume I/O bandwidth and cause the log file to grow large.
+ * When :variable:`log_slow_rate_type` is ``session``, this option lets you log full sessions, so you have complete records of sessions for later analysis; but you can rate-limit the number of sessions that are logged. Note that this feature will not work well if your application uses any type of connection pooling or persistent connections. Note that you change :variable:`log_slow_rate_limit` in ``session`` mode, you should reconnect for get effect.
+
+ * When :variable:`log_slow_rate_type` is ``query``, this option lets you log just some queries for later analysis. For example, if you set the value to 100, then one percona of queryies will logged.
+
+Note that every query has global unique ``query_id`` and every connection can has it own (session) :variable:``log_slow_rate_limit``.
+Decision "log or no" calculated in following manner:
+
+ * if ``log_slow_rate_limit`` is 0 - log every query
+
+ * If ``log_slow_rate_limit`` > 0 - log query when (``query_id`` % ``log_slow_rate_limit``) is zero.
+
+This allows flexible setup logging behavior.
+
+For example, if you set the value to 100, then one percent of ``sessions/queries`` will be logged.
+
+.. variable:: log_slow_slave_statements
+
+     :cli: Yes
+     :conf: Yes
+     :scope: Global, session
+     :dyn: Yes (in 5.1 releases only)
+
+Specifies that slow queries replayed by the slave SQL thread on a |MySQL| slave will be logged. Upstream version of the |MySQL| server has implemented command line option with same name. Significant difference is that this feature is implemented as variable in |Percona Server|, that means it can be enabled/disabled dynamically without restarting the server.
+
+To start the logging from the slave thread, you should change the global value: set global :variable:`log_slow_slave_statements` ``=ON``; and then execute: ``STOP SLAVE; START SLAVE;``. This will destroy and recreate the slave SQL thread, so it will see the newly set global value.
+
+To stop the logging from the slave thread, you should just change the global value: set global :variable:`log_slow_slave_statements` ``=OFF``; the logging stops immediately.
+
+
+.. variable:: log_slow_sp_statements
+
+     :cli: Yes
+     :conf: Yes
+     :scope: Global
+     :dyn: Yes
+     :vartype: Boolean
+     :default: TRUE
+     :range: TRUE/FALSE
+
+If ``TRUE``, statements executed by stored procedures are logged to the slow if it is open.
+
+.. note::
+
+ Support for logging stored procedures doesn't involve triggers, so they won't be logged even if this feature is enabled.
+
+.. variable:: log_slow_verbosity
+
+     :version 5.5.8-20.0: Added ``profiling`` and ``profiling_use_getrusage``
+     :cli: Yes
+     :conf: Yes
+     :scope: Global, session
+     :dyn: Yes
+
+Specifies how much information to include in your slow log. The value is a comma-delimited string, and can contain any combination of the following values:
+
+  * ``microtime``:
+    Log queries with microsecond precision.
+
+  * ``query_plan``:
+    Log information about the query's execution plan.
+
+  * ``innodb``:
+    Log |InnoDB| statistics.
+
+  * ``minimal``:
+    Equivalent to enabling just ``microtime``.
+
+  * ``standard``:
+    Equivalent to enabling ``microtime,innodb``.
+
+  * ``full``:
+    Equivalent to all other values OR'ed together.
+
+  * ``profiling``:
+    Enables profiling of all queries in all connections.
+
+  * ``profiling_use_getrusage``:
+    Enables usage of the getrusage function.
+
+Values are OR'ed together.
+
+For example, to enable microsecond query timing and |InnoDB| statistics, set this option to ``microtime,innodb`` or ``standard``. To turn all options on, set the option to ``full``.
+
+.. variable:: slow_query_log_timestamp_always
+
+     :version 5.5.10-20.1: Introduced  (renamed from :variable:`log_slow_timestamp_every`)
+     :cli: Yes
+     :conf: Yes
+     :scope: Global
+     :dyn: Yes
+     :vartype: Boolean
+     :default: FALSE
+     :range: TRUE/FALSE
+
+If ``TRUE``, a timestamp is printed on every slow log record. Multiple records may have the same time.
+
+.. variable:: slow_query_log_timestamp_precision
+
+     :version 5.5.10-20.1: Introduced (renamed from ``slow_query_log_microseconds_timestamp``)
+     :cli: Yes
+     :conf: Yes
+     :scope: Global
+     :dyn: Yes
+     :vartype: Enumerated
+     :default: ``second``
+     :range: ``second``, ``microsecond``
+
+Normally, entries to the slow query log are in seconds precision, in this format: ::
+
+  # Time: 090402 9:23:36 # User@Host: XXX @ XXX [10.X.X.X]
+
+If :variable:`slow_query_log_timestamp_precision` ``=microsecond``, entries to the slow query log are in microsecond precision, in this format: ::
+
+  # Time: 090402 9:23:36.123456 # User@Host: XXX @ XXX [10.X.X.X]
+
+.. variable:: slow_query_log_use_global_control
+
+     :cli: Yes
+     :conf: Yes
+     :scope: Global
+     :dyn: Yes
+     :default: None
+     :version 5.5.10-20.1: Introduced (renamed from :variable:`log_slow_timestamp_every`)
+
+Specifies which variables have global scope instead of local. Value is a “flag” variable - you can specify multiple values separated by commas
+
+  * ``none``:
+    All variables use local scope
+
+  * ``log_slow_filter``:
+    Global variable :variable:`log_slow_filter` has effect (instead of local)
+
+  * ``log_slow_rate_limit``:
+    Global variable :variable:`log_slow_rate_limit` has effect (instead of local)
+
+  * ``log_slow_verbosity``:
+    Global variable :variable:`log_slow_verbosity` has effect (instead of local)
+
+  * ``long_query_time``:
+    Global variable :variable:`long_query_time` has effect (instead of local)
+
+  * ``min_examined_row_limit``:
+    Global variable ``min_examined_row_limit`` has effect (instead of local)
+
+  * ``all``
+    Global variables has effect (instead of local)
+
+**NOTE:** This variable has been renamed from :variable:`log_slow_timestamp_every` since 5.5.10-20.1.
+
+
+Other Information
+=================
+
+Changes to the Log Format
+-------------------------
+
+The feature adds more information to the slow log output. Here is a sample log entry: ::
+
+  # User@Host: mailboxer[mailboxer] @  [192.168.10.165]
+  # Thread_id: 11167745  Schema: board
+  # QC_Hit: No  Full_scan: No  Full_join: No  Tmp_table: Yes  Disk_tmp_table: No
+  # Filesort: Yes  Disk_filesort: No  Merge_passes: 0
+  # Query_time: 0.000659  Lock_time: 0.000070  Rows_sent: 0  Rows_examined: 30  Rows_affected: 0  Rows_read: 30
+  #   innodb_IO_r_ops: 1  innodb_IO_r_bytes: 16384  innodb_IO_r_wait: 0.028487
+  #   innodb_rec_lock_wait: 0.000000  innodb_queue_wait: 0.000000
+  #   innodb_pages_distinct: 5
+  select count(distinct author_id) from art87.article87 force index (forum_id) where forum_id = 240215 and thread_id = ``710575`` 
+
+Another example (:variable:`log_slow_verbosity` ``=profiling``): ::
+
+  # Query_time: 4.555235  Lock_time: 0.000000  Rows_sent: 1  Rows_examined: 0  Rows_affected: 0  Rows_read: 1
+  # Profile_starting: 4.554799 Profile_starting_cpu: 0.000000 Profile_checking_permissions: 0.000095 Profile_checking_permissions_cpu: 0.000000 Profile_Opening_tables: 0.000088 Profile_Opening_tables_cpu: 0.000000 Profile_init: 0.000056 Profile_init_cpu: 0.000000 Profile_optimizing: 0.000046 Profile_optimizing_cpu: 0.000000 Profile_executing: 0.000098 Profile_executing_cpu: 0.000000 Profile_end: 0.000049 Profile_end_cpu: 0.000000 Profile_query_end: 0.000045 Profile_query_end_cpu: 0.000000 Profile_freeing_items: 0.000084 Profile_freeing_items_cpu: 0.000000 Profile_logging_slow_query: 0.000045 Profile_logging_slow_query_cpu: 0.000000 
+  # Profile_total: 4.555405 Profile_total_cpu: 0.000000 
+  insert into teee4 select * from teee4 limit 10000000;
+
+Connection and Schema Identifier
+--------------------------------
+
+Each slow log entry now contains a connection identifier, so you can trace all the queries coming from a single connection. This is the same value that is shown in the Id column in ``SHOW FULL PROCESSLIST`` or returned from the ``CONNECTION_ID()`` function.
+
+Each entry also contains a schema name, so you can trace all the queries whose default database was set to a particular schema. ::
+
+  # Thread_id: 11167745  Schema: board
+
+Microsecond Time Resolution and Extra Row Information
+-----------------------------------------------------
+
+This is the original functionality offered by the ``microslow`` feature. ``Query_time`` and ``Lock_time`` are logged with microsecond resolution.
+
+The feature also adds information about how many rows were examined for ``SELECT`` queries, and how many were analyzed and affected for ``UPDATE``, ``DELETE``, and ``INSERT`` queries, ::
+
+  # Query_time: 0.000659  Lock_time: 0.000070  Rows_sent: 0  Rows_examined: 30  Rows_affected: 0  Rows_read: 30
+
+Values and context:
+
+  * ``Rows_examined``:
+    Number of rows scanned - ``SELECT``
+
+  * ``Rows_affected``:
+    Number of rows changed - ``UPDATE``, ``DELETE``, ``INSERT``
+
+  * ``Rows_read``:
+    Number of rows read - ``UPDATE``, ``DELETE``, ``INSERT``
+
+Memory Footprint
+----------------
+
+The feature provides information about the amount of bytes sent for the result of the query and the number of temporary tables created for its execution - differentiated by whether they were created on memory or on disk - with the total number of bytes used by them. ::
+
+  # Bytes_sent: 8053  Tmp_tables: 1  Tmp_disk_tables: 0  Tmp_table_sizes: 950528
+
+Values and context:
+
+  * ``Bytes_sent``:
+    The amount of bytes sent for the result of the query
+
+  * ``Tmp_tables``:
+    Number of temporary tables created on memory for the query
+
+  * ``Tmp_disk_tables``:
+    Number of temporary tables created on disk for the query
+
+  * ``Tmp_table_sizes``:
+    Total Size in bytes for all temporary tables used in the query
+
+
+Query Plan Information
+----------------------
+
+Each query can be executed in various ways. For example, it may use indexes or do a full table scan, or a temporary table may be needed. These are the things that you can usually see by running ``EXPLAIN`` on the query. The feature will now allow you to see the most important facts about the execution in the log file. ::
+
+  # QC_Hit: No  Full_scan: No  Full_join: No  Tmp_table: Yes  Disk_tmp_table: No
+  # Filesort: Yes  Disk_filesort: No  Merge_passes: 0
+
+The values and their meanings are documented with the :variable:`log_slow_filter` option.
+
+|InnoDB| Usage Information
+--------------------------
+
+The final part of the output is the |InnoDB| usage statistics. |MySQL| currently shows many per-session statistics for operations with ``SHOW SESSION STATUS``, but that does not include those of |InnoDB|, which are always global and shared by all threads. This feature lets you see those values for a given query. ::
+
+  # innodb_IO_r_ops: 1  innodb_IO_r_bytes: 16384  innodb_IO_r_wait: 0.028487
+  # innodb_rec_lock_wait: 0.000000  innodb_queue_wait: 0.000000
+  # innodb_pages_distinct: 5
+
+Values:
+
+  * ``innodb_IO_r_ops``:
+    Counts the number of page read operations scheduled. The actual number of read operations may be different, but since this can be done asynchronously, there is no good way to measure it.
+
+  * ``innodb_IO_r_bytes``:
+    Similar to innodb_IO_r_ops, but the unit is bytes.
+
+  * ``innodb_IO_r_wait``:
+    Shows how long (in seconds) it took |InnoDB| to actually read the data from storage.
+
+  * ``innodb_rec_lock_wait``:
+    Shows how long (in seconds) the query waited for row locks.
+
+  * ``innodb_queue_wait``:
+    Shows how long (in seconds) the query spent either waiting to enter the |InnoDB| queue or inside that queue waiting for execution.
+
+  * ``innodb_pages_distinct``:
+    Counts approximately the number of unique pages the query accessed. The approximation is based on a small hash array representing the entire buffer pool, because it could take a lot of memory to map all the pages. The inaccuracy grows with the number of pages accessed by a query, because there is a higher probability of hash collisions.
+
+If the query did not use |InnoDB| tables, that information is written into the log instead of the above statistics.
+
+Related Reading
+===============
+
+  * http://www.mysqlperformanceblog.com/2009/02/10/impact-of-logging-on-mysql%E2%80%99s-performance/
+
+  * `log_slow_filter Usage <http://www.mysqlperformanceblog.com/2008/09/22/finding-what-created_tmp_disk_tables-with-log_slow_filter/>`_
+
+  * `Blueprint in Launchpad <https://blueprints.launchpad.net/percona-server/+spec/microseconds-in-query-log>`_

=== added file 'doc/source/diagnostics/thread_based_profiling.rst'
--- doc/source/diagnostics/thread_based_profiling.rst	1970-01-01 00:00:00 +0000
+++ doc/source/diagnostics/thread_based_profiling.rst	2013-05-22 08:54:39 +0000
@@ -0,0 +1,17 @@
+.. _thread_based_profiling:
+
+=========================
+ Thread Based Profiling
+=========================
+
+|Percona Server| now uses thread based profiling by default, instead of process based profiling. This was implemented because with process based profiling, threads on the server, other than the one being profiled, can affect the profiling information. 
+
+Thread based profiling is using the information provided by the kernel `getrusage <http://kernel.org/doc/man-pages/online/pages/man2/getrusage.2.html>`_ function. Since the 2.6.26 kernel version, thread based resource usage is available with the **RUSAGE_THREAD**. This means that the thread based profiling will be used if you're running the 2.6.26 kernel or newer, or if the **RUSAGE_THREAD** has been ported back.
+
+This feature is enabled by default if your system supports it, in other cases it uses process based profiling.
+
+Version Specific Information
+============================
+
+  * :rn:`5.5.25a-27.1`:
+    Thread based profiling introduced

=== added file 'doc/source/diagnostics/user_stats.rst'
--- doc/source/diagnostics/user_stats.rst	1970-01-01 00:00:00 +0000
+++ doc/source/diagnostics/user_stats.rst	2013-05-22 08:54:39 +0000
@@ -0,0 +1,242 @@
+.. _user_stats:
+
+=================
+ User Statistics
+=================
+
+This feature adds several ``INFORMATION_SCHEMA`` tables, several commands, and the userstat variable. The tables and commands can be used to understand the server activity better and identify the source of the load.
+
+The functionality is disabled by default, and must be enabled by setting ``userstat`` to ``ON``. It works by keeping several hash tables in memory. To avoid contention over global mutexes, each connection has its own local statistics, which are occasionally merged into the global statistics, and the local statistics are then reset to 0.
+
+
+Version Specific Information
+============================
+
+  * :rn:`5.5.10-20.1`:
+     Renamed variable :variable:`userstat_running` to :variable:`userstat`.
+
+Other Information
+=================
+
+  * Author/Origin:
+     *Google*; *Percona* added the ``INFORMATION_SCHEMA`` tables and the :variable:`userstat_running` variable.
+
+System Variables
+================
+
+.. variable:: userstat_running
+
+     :version 5.5.10-20.1: Renamed to :variable:`userstat`
+     :cli: Yes
+     :conf: Yes
+     :scope: Global
+     :dyn: Yes
+     :vartype: BOOLEAN
+     :default: OFF
+     :range: ON/OFF
+
+Enables or disables collection of statistics. The default is ``OFF``, meaning no statistics are gathered. This is to ensure that the statistics collection doesn't cause any extra load on the server unless desired.
+
+
+INFORMATION_SCHEMA Tables
+=========================
+
+.. table:: INFORMATION_SCHEMA.CLIENT_STATISTICS
+
+  :column CLIENT: The IP address or hostname from which the connection originated.
+  :column TOTAL_CONNECTIONS: The number of connections created for this client.
+  :column CONCURRENT_CONNECTIONS: The number of concurrent connections for this client.
+  :column CONNECTED_TIME: The cumulative number of seconds elapsed while there were connections from this client.
+  :column BUSY_TIME: The cumulative number of seconds there was activity on connections from this client.
+  :column CPU_TIME: The cumulative CPU time elapsed, in seconds, while servicing this client``s connections.
+  :column BYTES_RECEIVED: The number of bytes received from this client's connections.
+  :column BYTES_SENT: The number of bytes sent to this client's connections.
+  :column BINLOG_BYTES_WRITTEN:	The number of bytes written to the binary log from this client's connections.
+  :column ROWS_FETCHED: The number of rows fetched by this client's connections.
+  :column ROWS_UPDATED: The number of rows updated by this client's connections.
+  :column TABLE_ROWS_READ: The number of rows read from tables by this client's connections. (It may be different from ``ROWS_FETCHED``.)
+  :column SELECT_COMMANDS: The number of ``SELECT`` commands executed from this client's connections.
+  :column UPDATE_COMMANDS: The number of ``UPDATE`` commands executed from this client's connections.
+  :column OTHER_COMMANDS: The number of other commands executed from this client's connections.
+  :column COMMIT_TRANSACTIONS: The number of ``COMMIT`` commands issued by this client's connections.
+  :column ROLLBACK_TRANSACTIONS: The number of ``ROLLBACK`` commands issued by this client's connections.
+  :column DENIED_CONNECTIONS: The number of connections denied to this client.
+  :column LOST_CONNECTIONS: The number of this client's connections that were terminated uncleanly.
+  :column ACCESS_DENIED: The number of times this client's connections issued commands that were denied.
+  :column EMPTY_QUERIES: The number of times this client's connections sent empty queries to the server.
+
+This table holds statistics about client connections. The Percona version of the feature restricts this table's visibility to users who have the ``SUPER`` or ``PROCESS`` privilege.
+
+Example: ::
+
+  mysql> SELECT * FROM INFORMATION_SCHEMA.CLIENT_STATISTICS\G
+  *************************** 1. row ***************************
+                  CLIENT: 10.1.12.30
+       TOTAL_CONNECTIONS: 20
+  CONCURRENT_CONNECTIONS: 0
+          CONNECTED_TIME: 0
+               BUSY_TIME: 93
+                CPU_TIME: 48
+          BYTES_RECEIVED: 5031
+              BYTES_SENT: 276926
+    BINLOG_BYTES_WRITTEN: 217
+            ROWS_FETCHED: 81
+            ROWS_UPDATED: 0
+         TABLE_ROWS_READ: 52836023
+         SELECT_COMMANDS: 26
+         UPDATE_COMMANDS: 1
+          OTHER_COMMANDS: 145
+     COMMIT_TRANSACTIONS: 1
+   ROLLBACK_TRANSACTIONS: 0
+      DENIED_CONNECTIONS: 0
+        LOST_CONNECTIONS: 0
+           ACCESS_DENIED: 0
+           EMPTY_QUERIES: 0
+
+
+.. table:: INFORMATION_SCHEMA.INDEX_STATISTICS
+
+  :column TABLE_SCHEMA: The schema (database) name.
+  :column TABLE_NAME: The table name.
+  :column INDEX_NAME: The index name (as visible in ``SHOW CREATE TABLE``).
+  :column ROWS_READ: The number of rows read from this index.
+
+This table shows statistics on index usage. An older version of the feature contained a single column that had the ``TABLE_SCHEMA``, ``TABLE_NAME`` and ``INDEX_NAME`` columns concatenated together. The |Percona| version of the feature separates these into three columns. Users can see entries only for tables to which they have ``SELECT`` access.
+
+This table makes it possible to do many things that were difficult or impossible previously. For example, you can use it to find unused indexes and generate DROP commands to remove them.
+
+Example: ::
+
+  mysql> SELECT * FROM INFORMATION_SCHEMA.INDEX_STATISTICS
+     WHERE TABLE_NAME='tables_priv';
+  +--------------+-----------------------+--------------------+-----------+
+  | TABLE_SCHEMA | TABLE_NAME            | INDEX_NAME         | ROWS_READ |
+  +--------------+-----------------------+--------------------+-----------+
+  | mysql        | tables_priv           | PRIMARY            |         2 |
+  +--------------+-----------------------+--------------------+-----------+
+
+
+
+.. table:: INFORMATION_SCHEMA.TABLE_STATISTICS
+
+  :column TABLE_SCHEMA: The schema (database) name.
+  :column TABLE_NAME: The table name.
+  :column ROWS_READ: The number of rows read from the table.
+  :column ROWS_CHANGED: The number of rows changed in the table.
+  :column ROWS_CHANGED_X_INDEXES: The number of rows changed in the table, multiplied by the number of indexes changed.
+
+This table is similar in function to the ``INDEX_STATISTICS`` table.
+
+Example: ::
+
+  mysql> SELECT * FROM INFORMATION_SCHEMA.TABLE_STATISTICS
+     WHERE TABLE_NAME=``tables_priv``;
+  +--------------+-------------------------------+-----------+--------------+------------------------+
+  | TABLE_SCHEMA | TABLE_NAME                    | ROWS_READ | ROWS_CHANGED | ROWS_CHANGED_X_INDEXES |
+  +--------------+-------------------------------+-----------+--------------+------------------------+
+  | mysql        | tables_priv                   |         2 |            0 |                      0 | 
+  +--------------+-------------------------------+-----------+--------------+------------------------+
+
+
+.. table:: INFORMATION_SCHEMA.THREAD_STATISTICS
+
+  :column THREAD_ID: int(21)
+  :column TOTAL_CONNECTIONS: int(21)
+  :column CONCURRENT_CONNECTIONS: int(21)
+  :column CONNECTED_TIME: int(21)
+  :column BUSY_TIME: int(21)
+  :column CPU_TIME: int(21)
+  :column BYTES_RECEIVED: int(21)
+  :column BYTES_SENT: int(21)
+  :column BINLOG_BYTES_WRITTEN: int(21)
+  :column ROWS_FETCHED: int(21)
+  :column ROWS_UPDATED: int(21)
+  :column TABLE_ROWS_READ: int(21)
+  :column SELECT_COMMANDS: int(21)
+  :column UPDATE_COMMANDS: int(21)
+  :column OTHER_COMMANDS: int(21)
+  :column COMMIT_TRANSACTIONS: int(21)
+  :column ROLLBACK_TRANSACTIONS: int(21)
+  :column DENIED_CONNECTIONS: int(21)
+  :column LOST_CONNECTIONS: int(21)
+  :column ACCESS_DENIED: int(21)
+  :column EMPTY_QUERIES: int(21)
+
+.. table:: INFORMATION_SCHEMA.USER_STATISTICS
+
+  :column USER: The username. The value ``#mysql_system_user#`` appears when there is no username (such as for the slave SQL thread).
+  :column TOTAL_CONNECTIONS: The number of connections created for this user.
+  :column CONCURRENT_CONNECTIONS: The number of concurrent connections for this user.
+  :column CONNECTED_TIME: The cumulative number of seconds elapsed while there were connections from this user.
+  :column BUSY_TIME: The cumulative number of seconds there was activity on connections from this user.
+  :column CPU_TIME: The cumulative CPU time elapsed, in seconds, while servicing this user's connections.
+  :column BYTES_RECEIVED: The number of bytes received from this user's connections.
+  :column BYTES_SENT: The number of bytes sent to this user's connections.
+  :column BINLOG_BYTES_WRITTEN: The number of bytes written to the binary log from this user's connections.
+  :column ROWS_FETCHED: The number of rows fetched by this user's connections.
+  :column ROWS_UPDATED: The number of rows updated by this user's connections.
+  :column TABLE_ROWS_READ: The number of rows read from tables by this user's connections. (It may be different from ``ROWS_FETCHED``.)
+  :column SELECT_COMMANDS: The number of ``SELECT`` commands executed from this user's connections.
+  :column UPDATE_COMMANDS: The number of ``UPDATE`` commands executed from this user's connections.
+  :column OTHER_COMMANDS: The number of other commands executed from this user's connections.
+  :column COMMIT_TRANSACTIONS: The number of ``COMMIT`` commands issued by this user's connections.
+  :column ROLLBACK_TRANSACTIONS: The number of ``ROLLBACK`` commands issued by this user's connections.
+  :column DENIED_CONNECTIONS: The number of connections denied to this user.
+  :column LOST_CONNECTIONS: The number of this user's connections that were terminated uncleanly.
+  :column ACCESS_DENIED: The number of times this user's connections issued commands that were denied.
+  :column EMPTY_QUERIES: The number of times this user's connections sent empty queries to the server.
+
+This table contains information about user activity. The |Percona| version of the patch restricts this table's visibility to users who have the ``SUPER`` or ``PROCESS`` privilege.
+
+The table gives answers to questions such as which users cause the most load, and whether any users are being abusive. It also lets you measure how close to capacity the server may be. For example, you can use it to find out whether replication is likely to start falling behind.
+
+Example: ::
+
+  mysql> SELECT * FROM INFORMATION_SCHEMA.USER_STATISTICS\G
+  *************************** 1. row ***************************
+                    USER: root
+       TOTAL_CONNECTIONS: 5592
+  CONCURRENT_CONNECTIONS: 0
+          CONNECTED_TIME: 6844
+               BUSY_TIME: 179
+                CPU_TIME: 72
+          BYTES_RECEIVED: 603344
+              BYTES_SENT: 15663832
+    BINLOG_BYTES_WRITTEN: 217
+            ROWS_FETCHED: 9793
+            ROWS_UPDATED: 0
+         TABLE_ROWS_READ: 52836023
+         SELECT_COMMANDS: 9701
+         UPDATE_COMMANDS: 1
+          OTHER_COMMANDS: 2614
+     COMMIT_TRANSACTIONS: 1
+   ROLLBACK_TRANSACTIONS: 0
+      DENIED_CONNECTIONS: 0
+        LOST_CONNECTIONS: 0
+           ACCESS_DENIED: 0
+           EMPTY_QUERIES: 0
+
+Commands Provided
+=================
+
+  * ``FLUSH CLIENT_STATISTICS``
+
+  * ``FLUSH INDEX_STATISTICS``
+
+  * ``FLUSH TABLE_STATISTICS``
+
+  * ``FLUSH THREAD_STATISTICS``
+
+  * ``FLUSH USER_STATISTICS``
+
+These commands discard the specified type of stored statistical information.
+
+  * ``SHOW CLIENT_STATISTICS``
+  * ``SHOW INDEX_STATISTICS``
+  * ``SHOW TABLE_STATISTICS``
+  * ``SHOW THREAD_STATISTICS``
+  * ``SHOW USER_STATISTICS``
+
+These commands are another way to display the information you can get from the ``INFORMATION_SCHEMA`` tables. The commands accept ``WHERE`` clauses. They also accept but ignore ``LIKE`` clauses.
+
+

=== added file 'doc/source/flexibility/mysqldump_ignore_create_error.rst'
--- doc/source/flexibility/mysqldump_ignore_create_error.rst	1970-01-01 00:00:00 +0000
+++ doc/source/flexibility/mysqldump_ignore_create_error.rst	2013-05-22 08:54:39 +0000
@@ -0,0 +1,22 @@
+.. _mysqldump_ignore_create_error:
+
+======================================
+ Ignoring missing tables in mysqldump
+======================================
+
+In case table name was changed during the :command:`mysqldump` process taking place, :command:`mysqldump` would stop with error: :: 
+
+   Couldn't execute 'show create table testtable'
+   Table 'testdb.tabletest' doesn't exist (1146)\n")
+
+This could happen if :command:`mysqldump` was taking a backup of a working slave and during that process table name would get changed. This error happens because :command:`mysqldump` takes the list of the tables at the beginning of the dump process but the ``SHOW CREATE TABLE`` happens just before the table is being dumped.
+
+With this option :command:`mysqldump` will still show error to ``stderr``, but it will continue to work and dump the rest of the tables.
+
+Version Specific Information
+============================
+
+  * :rn:`5.6.5-60.0`
+    :command:`mysqldump` option :option:`--ignore-create-error` introduced
+
+

=== removed directory 'doc/source/reliability'
=== removed file 'doc/source/reliability/error_pad.rst'
--- doc/source/reliability/error_pad.rst	2013-05-22 08:54:33 +0000
+++ doc/source/reliability/error_pad.rst	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-.. _error_pad:
-
-==========================
- Error Code Compatibility
-==========================
-
-|Percona Server| with |XtraDB| has error code incompatibilities with |MySQL| 5.5. It is important to maintain compatibility in the error codes used by the servers. For example, scripts that may be run on both servers could contain references to error codes.
-
-The reasons for the current incompatibilities are:
-
-  * |Percona Server| with |XtraDB| contains features that have been backported from MyQL 5.5. Some of the |MySQL| 5.5 features added new error codes.
-
-  * Some |Percona Server| with |XtraDB| features have added new error codes.
-
-The solution to the first problem is to preserve |MySQL| 5.5 error codes in the |Percona Server|. An example of where this has been done is |Percona Server| feature Query Cache Enhancements. This feature adds error ``ER_QUERY_CACHE_DISABLED`` to the |Percona Server|, which is defined as error code 1651 in |MySQL| 5.5.
-
-After migrating |Percona Server| / |XtraDB| to |MySQL| 5.5, users might experience troubles because of this.
-
-The solution to the second problem is to insure that unique error codes are chosen, when adding new ones to |Percona Server|, that will never be duplicated during |MySQL| development.
-
-For example, |MySQL| has a tool ``comp_err`` that generates:
-
-  - :file:`errmsg.sys` files
-
-  - header file :file:`include/mysqld_error.h`
-
-  - header file :file:`include/mysqld_ername.h`
-
-from the file :file:`errmsg.txt`.
-
-To keep error numbers consistent, we should add some fictive errors to :file:`errmsg.txt`, because ``comp_err`` assigns error code numbers sequentially, without gaps.
-
-I propose patch to ``comp_err``.
-
-This patch allows usage of a new syntax, with prefix ``PADD``, for example: ::
-
-  PADD_QUERY_CACHE_DISABLED 1651
-    eng "ER_QUERY_CACHE_DISABLED padding to 1651 error"
-  ER_QUERY_CACHE_DISABLED
-    eng "Query cache is disabled; restart the server with query_cache_type=1 to enable it"
-
-comp_err with my patch padds empty intervals (from last error code number to 1651) by error message ``ER_QUERY_CACHE_DISABLED padding to 1651 error``, i.e. and ``ER_QUERY_CACHE_DISABLED`` now has error code 1651 (as desired). I propose to use this patch for Percona errors, for example: ::
-
-  PADD_PERCONA_NEW_ERROR_CODE 4000
-    end "Padd empty space to error code number 4000 (Percona error codes)"
-  ...some percona error codes...
-
-Patch only adds prefix ``PADD_`` and padds error in sys files. All other |MySQL| code (load*.sys files, my_error, etc) works as old one.
-
-
-Version-Specific Information
-============================
-
-  * 5.5.8-20.0
-    Full functionality available.

=== removed file 'doc/source/reliability/innodb_corrupt_table_action.rst'
--- doc/source/reliability/innodb_corrupt_table_action.rst	2013-04-10 14:43:41 +0000
+++ doc/source/reliability/innodb_corrupt_table_action.rst	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-.. _innodb_corrupt_table_action_page:
-
-=========================
- Handle Corrupted Tables
-=========================
-
-Instead of crashing the server as they used to do, corrupted |InnoDB| tables are simply disabled, so that the database remains available while the corruption is being fixed.
-
-This feature adds a new system variable.
-
-Version Specific Information
-============================
-
-  * 5.6.10-60.2:
-    Feature ported from |Percona Server| 5.5
-
-System Variables
-================
-
-.. variable:: innodb_corrupt_table_action
-
-     :version 5.6.10-60.2: Introduced.
-     :cli: Yes
-     :conf: Yes
-     :scope: Global
-     :dyn: Yes
-     :vartype: ULONG
-     :range: ``assert``, ``warn``, ``salvage``
-
-* With the default value |XtraDB| will intentionally crash the server with an assertion failure as it would normally do when detecting corrupted data in a single-table tablespace.
-
-* If the ``warn`` value is used it will pass corruption of the table as ``corrupt table`` instead of crashing itself. For this to work :option:`innodb_file_per_table` should be enabled. All file I/O for the datafile after detected as corrupt is disabled, except for the deletion. 
-
-* When the option value is ``salvage``, |XtraDB| allows read access to a corrupted tablespace, but ignores corrupted pages".
-

=== removed file 'doc/source/reliability/log_connection_error.rst'
--- doc/source/reliability/log_connection_error.rst	2013-05-22 08:54:33 +0000
+++ doc/source/reliability/log_connection_error.rst	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-.. _log_connection_error:
-
-==============================
- Too Many Connections Warning
-==============================
-
-
-This feature issues the warning ``Too many connections`` to the log, if ``log_warnings`` is enabled.
-
-Version-Specific Information
-============================
-
-  * 5.5.8-20.0:
-    Full functionality available.

=== removed file 'doc/source/reliability/show_slave_status_nolock.rst'
--- doc/source/reliability/show_slave_status_nolock.rst	2013-05-22 08:54:33 +0000
+++ doc/source/reliability/show_slave_status_nolock.rst	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-.. _show_slave_status_nolock:
-
-=================================
- Lock-Free ``SHOW SLAVE STATUS``
-=================================
-
-The ``STOP SLAVE`` and ``SHOW SLAVE STATUS`` commands can conflict due to a global lock in the situation where one thread on a slave attempts to execute a ``STOP SLAVE`` command, while a second thread on the slave is already running a command that takes a long time to execute.
-
-If a ``STOP SLAVE`` command is given in this situation, it will wait and not complete execution until the long-executing thread has completed its task. If another thread now executes a ``SHOW SLAVE STATUS`` command while the STOP SLAVE command is waiting to complete, the ``SHOW SLAVE STATUS`` command will not be able to execute while the ``STOP SLAVE`` command is waiting.
-
-This features modifies the ``SLOW SLAVE STATUS`` syntax to allow: ::
-
-  SLOW SLAVE STATUS NOLOCK
-
-This will display the slave's status as if there were no lock, allowing the user to detect and understand the situation that is occurring.
-
-**NOTE:** The information given when ``NOLOCK`` is used may be slightly inconsistent with the actual situation while the lock is being held.
-
-
-Version Specific Information
-============================
-
-  * 5.5.8-20.0:

=== removed file 'doc/source/upstream-bug-fixes.rst'
--- doc/source/upstream-bug-fixes.rst	2013-05-22 08:54:33 +0000
+++ doc/source/upstream-bug-fixes.rst	1970-01-01 00:00:00 +0000
@@ -1,133 +0,0 @@
-.. _upstream_bug_fixes:
-
-=============================================================
- List of upstream |MySQL| bugs fixed in |Percona Server| 5.6
-=============================================================
-
-+-------------------------------------------------------------------------------------------------------------+
-|:Upstream bug: :mysqlbug:`67504` - Duplicate error in replication with slave triggers and auto increment     |
-|:Launchpad bug: :bug:`1068210`                                                                               |
-|:Upstream state: Verified (checked on 2013-02-21)                                                            |
-|:Fix Released: :rn:`5.6.11-60.3`                                                                             |
-|:Upstream fix: N/A                                                                                           |
-+-------------------------------------------------------------------------------------------------------------+
-|:Upstream bug: :mysqlbug:`67974` - Server crashes in add_identifier on concurrent ALTER TABLE and SHOW ENGINE|
-|:Launchpad bug: :bug:`1017192`                                                                               |
-|:Upstream state: N/A                                                                                         |
-|:Fix Released: :rn:`5.6.11-60.3`                                                                             |
-|:Upstream fix: N/A                                                                                           |
-+-------------------------------------------------------------------------------------------------------------+
-|:Upstream bug: :mysqlbug:`68045` - security vulnerability CVE-2012-4414                                      |
-|:Launchpad bug: :bug:`1049871`                                                                               |
-|:Upstream state: N/A                                                                                         |
-|:Fix Released: :rn:`5.6.11-60.3`                                                                             |
-|:Upstream fix: N/A                                                                                           |
-+-------------------------------------------------------------------------------------------------------------+
-|:Upstream bug: :mysqlbug:`66550` - security vulnerability CVE-2012-4414                                      |
-|:Launchpad bug: :bug:`1049871`                                                                               |
-|:Upstream state: N/A                                                                                         |
-|:Fix Released: :rn:`5.6.11-60.3`                                                                             |
-|:Upstream fix: N/A                                                                                           |
-+-------------------------------------------------------------------------------------------------------------+
-|:Upstream bug: :mysqlbug:`67685` - security vulnerability CVE-2012-5611                                      |
-|:Launchpad bug: :bug:`1083377`                                                                               |
-|:Upstream state: N/A                                                                                         |
-|:Fix Released: :rn:`5.6.11-60.3`                                                                             |
-|:Upstream fix: N/A                                                                                           |
-+-------------------------------------------------------------------------------------------------------------+
-|:Upstream bug: :mysqlbug:`66237` - Temporary files created by binary log cache are not purged after transa...|
-|:Launchpad bug: :bug:`1070856`                                                                               |
-|:Upstream state: Verified (checked on 2013-02-21)                                                            |
-|:Fix Released: :rn:`5.6.11-60.3`                                                                             |
-|:Upstream fix: N/A                                                                                           |
-+-------------------------------------------------------------------------------------------------------------+
-|:Upstream bug: :mysqlbug:`67606` - MySQL crashes with segmentation fault when disk quota is reached          |
-|:Launchpad bug: :bug:`1079596`                                                                               |
-|:Upstream state: Duplicate                                                                                   |
-|:Fix Released: :rn:`5.6.11-60.3`                                                                             |
-|:Upstream fix: N/A                                                                                           |
-+-------------------------------------------------------------------------------------------------------------+
-|:Upstream bug: :mysqlbug:`62856` - Check for "stack overrun" doesn't work with gcc-4.6, server crashes       |
-|:Launchpad bug: :bug:`1042517`                                                                               |
-|:Upstream state: Verified (checked on 2013-02-21)                                                            |
-|:Fix Released: :rn:`5.6.11-60.3`                                                                             |
-|:Upstream fix: N/A                                                                                           |
-+-------------------------------------------------------------------------------------------------------------+
-|:Upstream bug: :mysqlbug:`61180` - korr/store macros in my_global.h assume the argument to be a char pointer |
-|:Launchpad bug: :bug:`1042517`                                                                               |
-|:Upstream state: Verified (checked on 2013-02-21)                                                            |
-|:Fix Released: :rn:`5.6.11-60.3`                                                                             |
-|:Upstream fix: N/A                                                                                           |
-+-------------------------------------------------------------------------------------------------------------+
-|:Upstream bug: :mysqlbug:`61179` - Unoptimized versions of korr/store macros in my_global.h are used on ...  |
-|:Launchpad bug: :bug:`1042517`                                                                               |
-|:Upstream state: Verified (checked on 2013-02-21)                                                            |
-|:Fix Released: :rn:`5.6.11-60.3`                                                                             |
-|:Upstream fix: N/A                                                                                           |
-+-------------------------------------------------------------------------------------------------------------+
-|:Upstream bug: :mysqlbug:`61178` - Incorrect implementation of intersect(ulonglong) in non-optimized Bitmap..|
-|:Launchpad bug: :bug:`1042517`                                                                               |
-|:Upstream state: Verified (checked on 2013-02-21)                                                            |
-|:Fix Released: :rn:`5.6.11-60.3`                                                                             |
-|:Upstream fix: N/A                                                                                           |
-+-------------------------------------------------------------------------------------------------------------+
-|:Upstream bug: :mysqlbug:`54127` - mysqld segfaults when built using --with-max-indexes=128                  |
-|:Launchpad bug: :bug:`1042517`                                                                               |
-|:Upstream state: Verified (checked on 2013-02-21)                                                            |
-|:Fix Released: :rn:`5.5.10-60.3`                                                                             |
-|:Upstream fix: N/A                                                                                           |
-+-------------------------------------------------------------------------------------------------------------+
-|:Upstream bug: :mysqlbug:`64800` - mysqldump with --include-master-host-port putting quotes around port no.  | 
-|:Launchpad bug: :bug:`1013432`                                                                               |
-|:Upstream state: Verified (checked on 2013-02-21)                                                            |
-|:Fix Released: :rn:`5.6.11-60.3`                                                                             |
-|:Upstream fix: N/A                                                                                           |
-+-------------------------------------------------------------------------------------------------------------+
-|:Upstream bug: :mysqlbug:`66301` - INSERT ... ON DUPLICATE KEY UPDATE + innodb_autoinc_lock_mode=1 is broken |
-|:Launchpad bug: :bug:`1035225`                                                                               |
-|:Upstream state: Verified (checked on 2013-02-21)                                                            |
-|:Fix Released: :rn:`5.6.11-60.3`                                                                             |
-|:Upstream fix: N/A                                                                                           |
-+-------------------------------------------------------------------------------------------------------------+
-|:Upstream bug: :mysqlbug:`60743` - typo in cmake/dtrace.cmake                                                |
-|:Launchpad bug: :bug:`1013455`                                                                               |
-|:Upstream state: Verified (checked on 2013-02-21)                                                            |
-|:Fix Released: :rn:`5.6.11-60.3`                                                                             |
-|:Upstream fix: N/A                                                                                           |
-+-------------------------------------------------------------------------------------------------------------+
-|:Upstream bug: :mysqlbug:`64663` - Segfault when adding indexes to InnoDB temporary tables                   |
-|:Launchpad bug: :bug:`999147`                                                                                |
-|:Upstream state: Verified (checked on 2013-02-21)                                                            |
-|:Fix Released: :rn:`5.6.11-60.3`                                                                             |
-|:Upstream fix: N/A                                                                                           |
-+-------------------------------------------------------------------------------------------------------------+
-|:Upstream bug: :mysqlbug:`64432` - Bug :mysqlbug:`54330` (Broken fast index creation) was never fixed in 5.5 |
-|:Launchpad bug: :bug:`939485`                                                                                |
-|:Upstream state: Documenting (checked on 2013-02-21)                                                         |
-|:Fix Released: :rn:`5.6.11-60.3`                                                                             |
-|:Upstream fix: N/A                                                                                           |
-+-------------------------------------------------------------------------------------------------------------+
-|:Upstream bug: :mysqlbug:`61595` - mysql-test/include/wait_for_slave_param.inc timeout logic is incorrect    |
-|:Launchpad bug: :bug:`800035`                                                                                |
-|:Upstream state: Verified (checked on 2013-02-21)                                                            |
-|:Fix Released: :rn:`5.6.11-60.3`                                                                             |
-|:Upstream fix: N/A                                                                                           |
-+-------------------------------------------------------------------------------------------------------------+
-|:Upstream bug: :mysqlbug:`60788` - InnoDB crashes with an assertion failure when receiving a signal on pwrite|
-|:Launchpad bug: :bug:`764395`                                                                                |
-|:Upstream state: Duplicate                                                                                   |
-|:Fix Released: :rn:`5.6.11-60.3`                                                                             |
-|:Upstream fix: N/A                                                                                           |
-+-------------------------------------------------------------------------------------------------------------+
-|:Upstream bug: :mysqlbug:`68116` - InnoDB monitor may hit an assertion error in buf_page_get_gen in debug ...|
-|:Launchpad bug: :bug:`1100178`                                                                               |
-|:Upstream state: Analyzing (checked on 2013-02-21)                                                           |
-|:Fix Released: :rn:`5.6.10-60.2`                                                                             |
-|:Upstream fix: N/A                                                                                           |
-+-------------------------------------------------------------------------------------------------------------+
-|:Upstream bug: :mysqlbug:`65946` - Sid_map::Sid_map calls DBUG which may have unitialized THR_KEY_mysys and..|
-|:Launchpad bug: :bug:`1050758`                                                                               |
-|:Upstream state: Duplicate                                                                                   |
-|:Fix Released: :rn:`5.6.5-60.0`                                                                              |
-|:Upstream fix: N/A                                                                                           |
-+-------------------------------------------------------------------------------------------------------------+