Merge lp:~laurynas-biveinis/percona-server/xtradb-changed-page-tracking-55 into lp:percona-server/5.5

[Laurynas Biveinis]

Manual merge of XtraDB changed page tracker from 5.1.

Changes from the 5.1 version:
- The log tracker thread and the bitmap file I/O were instrumented for
  PFS.
- Tweaks for very fast InnoDB shutdown changes in 5.5: since 5.5
  closes the log files earlier, make sure that the log reader thread
  quits before then.
- More workload in the test case to reflect larger minimum log file
  sizes in 5.5.
- Ported 64-bit atomic operations checks from Autoconf to CMake.
- New test in sys_vars suite: innodb_track_changed_pages_basic.test,
  re-recorded all_vars.test.
- Removed superfluous 64-bit atomic operations checks from the
  non-64-bit check snippet.
- Included contents of 5.1 revisions 458.1.1 for bug 1032483 and
  458.2.1 for bug 1032606. These revisions must be null-merged now.
  Also included the fix for bug 1036530 that is not merged yet to
  5.1.

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

[Laurynas Biveinis (laurynas-biveinis)]

Issue #16274.

[Stewart Smith (stewart)]

review: Approve

=== modified file 'Percona-Server/mysql-test/r/percona_server_variables_debug.result'
--- Percona-Server/mysql-test/r/percona_server_variables_debug.result	2012-08-09 06:49:56 +0000
+++ Percona-Server/mysql-test/r/percona_server_variables_debug.result	2012-08-22 13:19:13 +0000
@@ -165,6 +165,7 @@
 INNODB_THREAD_CONCURRENCY
 INNODB_THREAD_CONCURRENCY_TIMER_BASED
 INNODB_THREAD_SLEEP_DELAY
+INNODB_TRACK_CHANGED_PAGES
 INNODB_TRX_RSEG_N_SLOTS_DEBUG
 INNODB_USE_GLOBAL_FLUSH_LOG_AT_TRX_COMMIT
 INNODB_USE_NATIVE_AIO

=== modified file 'Percona-Server/mysql-test/r/percona_server_variables_release.result'
--- Percona-Server/mysql-test/r/percona_server_variables_release.result	2012-08-07 06:10:00 +0000
+++ Percona-Server/mysql-test/r/percona_server_variables_release.result	2012-08-22 13:19:13 +0000
@@ -161,6 +161,7 @@
 INNODB_THREAD_CONCURRENCY
 INNODB_THREAD_CONCURRENCY_TIMER_BASED
 INNODB_THREAD_SLEEP_DELAY
+INNODB_TRACK_CHANGED_PAGES
 INNODB_USE_GLOBAL_FLUSH_LOG_AT_TRX_COMMIT
 INNODB_USE_NATIVE_AIO
 INNODB_USE_SYS_MALLOC

=== added file 'Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp.result'
--- Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp.result	2012-08-22 13:19:13 +0000
@@ -0,0 +1,26 @@
+DROP TABLE IF EXISTS t1, t2;
+CREATE TABLE t1 (x INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+CREATE TABLE t2 (x INT) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (1),(2),(3),(4),(5);
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+SET GLOBAL INNODB_FAST_SHUTDOWN=2;
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
+call mtr.add_suppression("InnoDB: Warning: truncated block detected.*");
+INSERT INTO t1 SELECT x FROM t1;
+ERROR HY000: Lost connection to MySQL server during query
+DROP TABLE t1, t2;

=== added file 'Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_no_restart.result'
--- Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_no_restart.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_no_restart.result	2012-08-22 13:19:13 +0000
@@ -0,0 +1,6 @@
+DROP TABLE IF EXISTS t1, t2;
+CREATE TABLE t1 (x INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
+CREATE TABLE t2 (x INT) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (1),(2),(3),(4),(5);
+DROP TABLE t1, t2;

=== added file 'Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp-master.opt'
--- Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp-master.opt	2012-08-22 13:19:13 +0000
@@ -0,0 +1,1 @@
+--innodb_track_changed_pages=TRUE --innodb_log_file_size=5M --innodb_file_per_table --skip-stack-trace --skip-core-file

=== added file 'Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp.test'
--- Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp.test	2012-08-22 13:19:13 +0000
@@ -0,0 +1,126 @@
+# Tests for the changed page tracking bitmap.
+--source include/not_embedded.inc
+--source include/not_crashrep.inc
+--source include/have_debug.inc
+--source include/have_innodb.inc
+# Valgrind reports useless errors on very fast server shutdowns
+--source include/not_valgrind.inc
+
+let $MYSQLD_DATADIR= `select @@datadir`;
+let $BITMAP_FILE= $MYSQLD_DATADIR/ib_modified_log.1;
+
+--disable_warnings
+DROP TABLE IF EXISTS t1, t2;
+--enable_warnings
+
+# Create some log data, less than log capacity
+CREATE TABLE t1 (x INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
+
+# Check that the bitmap file has been created
+file_exists $BITMAP_FILE;
+
+# Test that an empty existing bitmap file is handled properly when it's
+# possible to re-read the entire missing range.
+
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server 10
+--source include/wait_until_disconnected.inc
+remove_file $BITMAP_FILE;
+write_file $BITMAP_FILE;
+EOF
+--enable_reconnect
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/wait_until_connected_again.inc
+
+# TODO: check the tracked LSN range continuity once this info is exposed through
+# INFORMATION_SCHEMA.
+
+# Create more log data, larger amount than the log group capacity. At the same time test second space id.
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+CREATE TABLE t2 (x INT) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (1),(2),(3),(4),(5);
+
+file_exists $BITMAP_FILE;
+
+# Restart the server to check that the bitmap file is properly read on the startup
+# to resume tracking.
+
+# TODO: check the tracked LSN range continuity once this info is exposed through
+# INFORMATION_SCHEMA.
+--source include/restart_mysqld.inc
+
+file_exists $BITMAP_FILE;
+
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+
+# Restart the server again with the very fast shutdown
+SET GLOBAL INNODB_FAST_SHUTDOWN=2;
+
+--source include/restart_mysqld.inc
+
+file_exists $BITMAP_FILE;
+
+# TODO: check the tracked LSN range continuity once this info is exposed through
+# INFORMATION_SCHEMA.
+
+# Test that an empty existing bitmap file is handled properly when it's impossible to re-read the full missing range.
+
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server 10
+--source include/wait_until_disconnected.inc
+remove_file $BITMAP_FILE;
+write_file $BITMAP_FILE;
+EOF
+--enable_reconnect
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/wait_until_connected_again.inc
+
+file_exists $BITMAP_FILE;
+
+# Create at least one more bitmap page on shutdown
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
+
+# Test that the bitmap file is read in block size multiples with junk at the end discarded
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server 10
+--source include/wait_until_disconnected.inc
+append_file $BITMAP_FILE;
+junk junk junk junk
+EOF
+--enable_reconnect
+--exec echo "restart:-#d,crash_before_bitmap_write" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/wait_until_connected_again.inc
+call mtr.add_suppression("InnoDB: Warning: truncated block detected.*");
+
+file_exists $BITMAP_FILE;
+
+# TODO: check the tracked LSN range continuity once this info is exposed through
+# INFORMATION_SCHEMA.
+
+# Test crashing before writing of new bitmap data
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--error 2013
+INSERT INTO t1 SELECT x FROM t1;
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+file_exists $BITMAP_FILE;
+
+# TODO: check the tracked LSN range continuity once this info is exposed through
+# INFORMATION_SCHEMA.
+
+DROP TABLE t1, t2;

=== added file 'Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_no_restart-master.opt'
--- Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_no_restart-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_no_restart-master.opt	2012-08-22 13:19:13 +0000
@@ -0,0 +1,1 @@
+--innodb_track_changed_pages=TRUE --innodb-file-per-table

=== added file 'Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_no_restart.test'
--- Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_no_restart.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_no_restart.test	2012-08-22 13:19:13 +0000
@@ -0,0 +1,21 @@
+# Tests for the changed page tracking bitmap. A valgrindable subset of
+# percona_changed_page_bmp test, which contains the full functional tests.
+--source include/have_innodb.inc
+
+let $MYSQLD_DATADIR= `select @@datadir`;
+let $BITMAP_FILE= $MYSQLD_DATADIR/ib_modified_log.1;
+
+--disable_warnings
+DROP TABLE IF EXISTS t1, t2;
+--enable_warnings
+
+# Create some log data with several space ids to have more than bitmap poge.
+CREATE TABLE t1 (x INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
+CREATE TABLE t2 (x INT) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (1),(2),(3),(4),(5);
+
+# Check that the bitmap file has been created
+file_exists $BITMAP_FILE;
+
+DROP TABLE t1, t2;

=== added file 'Percona-Server/mysql-test/suite/sys_vars/r/innodb_track_changed_pages_basic.result'
--- Percona-Server/mysql-test/suite/sys_vars/r/innodb_track_changed_pages_basic.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/r/innodb_track_changed_pages_basic.result	2012-08-22 13:19:13 +0000
@@ -0,0 +1,21 @@
+SELECT COUNT(@@GLOBAL.innodb_track_changed_pages);
+COUNT(@@GLOBAL.innodb_track_changed_pages)
+1
+SET @@GLOBAL.innodb_track_changed_pages=1;
+ERROR HY000: Variable 'innodb_track_changed_pages' is a read only variable
+SELECT @@GLOBAL.innodb_track_changed_pages = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='innodb_track_changed_pages';
+@@GLOBAL.innodb_track_changed_pages = VARIABLE_VALUE
+1
+Warnings:
+Warning	1292	Truncated incorrect DOUBLE value: 'OFF'
+SELECT @@innodb_track_changed_pages = @@GLOBAL.innodb_track_changed_pages;
+@@innodb_track_changed_pages = @@GLOBAL.innodb_track_changed_pages
+1
+SELECT COUNT(@@SESSION.innodb_track_changed_pages);
+ERROR HY000: Variable 'innodb_track_changed_pages' is a GLOBAL variable
+SELECT COUNT(@@LOCAL.innodb_track_changed_pages);
+ERROR HY000: Variable 'innodb_track_changed_pages' is a GLOBAL variable
+SELECT innodb_track_changed_pages = @@SESSION.innodb_track_changed_pages;
+ERROR 42S22: Unknown column 'innodb_track_changed_pages' in 'field list'

=== added file 'Percona-Server/mysql-test/suite/sys_vars/t/innodb_track_changed_pages_basic.test'
--- Percona-Server/mysql-test/suite/sys_vars/t/innodb_track_changed_pages_basic.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/t/innodb_track_changed_pages_basic.test	2012-08-22 13:19:13 +0000
@@ -0,0 +1,21 @@
+# Tests for innodb_track_changed_pages variable
+
+--source include/have_innodb.inc
+
+SELECT COUNT(@@GLOBAL.innodb_track_changed_pages);
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SET @@GLOBAL.innodb_track_changed_pages=1;
+
+SELECT @@GLOBAL.innodb_track_changed_pages = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='innodb_track_changed_pages';
+
+SELECT @@innodb_track_changed_pages = @@GLOBAL.innodb_track_changed_pages;
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT COUNT(@@SESSION.innodb_track_changed_pages);
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT COUNT(@@LOCAL.innodb_track_changed_pages);
+--error ER_BAD_FIELD_ERROR
+SELECT innodb_track_changed_pages = @@SESSION.innodb_track_changed_pages;

=== modified file 'Percona-Server/storage/innobase/CMakeLists.txt'
--- Percona-Server/storage/innobase/CMakeLists.txt	2011-03-24 12:00:14 +0000
+++ Percona-Server/storage/innobase/CMakeLists.txt	2012-08-22 13:19:13 +0000
@@ -85,12 +85,41 @@
   }"
   HAVE_IB_GCC_ATOMIC_BUILTINS
   )
+  CHECK_C_SOURCE_RUNS(
+  "
+  #include <stdint.h>
+  int main()
+  {
+    int64_t x, y, res;
+
+    x = 10;
+    y = 123;
+    res = __sync_bool_compare_and_swap(&x, x, y);
+    if (!res || x != y) {
+      return(1);
+    }
+
+    x = 10;
+    y = 123;
+    res = __sync_add_and_fetch(&x, y);
+    if (res != 123 + 10 || x != 123 + 10) {
+      return(1);
+    }
+
+    return(0);
+  }"
+  HAVE_IB_GCC_ATOMIC_BUILTINS_64
+  )
 ENDIF()
 
 IF(HAVE_IB_GCC_ATOMIC_BUILTINS)
  ADD_DEFINITIONS(-DHAVE_IB_GCC_ATOMIC_BUILTINS=1)
 ENDIF()
 
+IF(HAVE_IB_GCC_ATOMIC_BUILTINS_64)
+ ADD_DEFINITIONS(-DHAVE_IB_GCC_ATOMIC_BUILTINS_64=1)
+ENDIF()
+
  # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not
 IF(NOT CMAKE_CROSSCOMPILING)
   CHECK_C_SOURCE_RUNS(
@@ -227,7 +256,7 @@
 			ibuf/ibuf0ibuf.c
 			pars/lexyy.c pars/pars0grm.c pars/pars0opt.c pars/pars0pars.c pars/pars0sym.c
 			lock/lock0lock.c lock/lock0iter.c
-			log/log0log.c log/log0recv.c
+			log/log0log.c log/log0recv.c log/log0online.c
 			mach/mach0data.c
 			mem/mem0mem.c mem/mem0pool.c
 			mtr/mtr0log.c mtr/mtr0mtr.c

=== modified file 'Percona-Server/storage/innobase/handler/ha_innodb.cc'
--- Percona-Server/storage/innobase/handler/ha_innodb.cc	2012-08-07 06:10:00 +0000
+++ Percona-Server/storage/innobase/handler/ha_innodb.cc	2012-08-22 13:19:13 +0000
@@ -361,7 +361,8 @@
 	{&srv_error_monitor_thread_key, "srv_error_monitor_thread", 0},
 	{&srv_monitor_thread_key, "srv_monitor_thread", 0},
 	{&srv_master_thread_key, "srv_master_thread", 0},
-	{&srv_purge_thread_key, "srv_purge_thread", 0}
+	{&srv_purge_thread_key, "srv_purge_thread", 0},
+	{&srv_log_tracking_thread_key, "srv_redo_log_follow_thread", 0}
 };
 # endif /* UNIV_PFS_THREAD */
 
@@ -371,7 +372,8 @@
 static PSI_file_info	all_innodb_files[] = {
 	{&innodb_file_data_key, "innodb_data_file", 0},
 	{&innodb_file_log_key, "innodb_log_file", 0},
-	{&innodb_file_temp_key, "innodb_temp_file", 0}
+	{&innodb_file_temp_key, "innodb_temp_file", 0},
+	{&innodb_file_bmp_key, "innodb_bmp_file", 0}
 };
 # endif /* UNIV_PFS_IO */
 #endif /* HAVE_PSI_INTERFACE */
@@ -12658,6 +12660,11 @@
   "NULLS_UNEQUAL and NULLS_IGNORED",
    NULL, NULL, SRV_STATS_NULLS_EQUAL, &innodb_stats_method_typelib);
 
+static MYSQL_SYSVAR_BOOL(track_changed_pages, srv_track_changed_pages,
+    PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
+    "Track the redo log for changed pages and output a changed page bitmap",
+    NULL, NULL, FALSE);
+
 #if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
 static MYSQL_SYSVAR_UINT(change_buffering_debug, ibuf_debug,
   PLUGIN_VAR_RQCMDARG,
@@ -12942,6 +12949,7 @@
   MYSQL_SYSVAR(use_sys_malloc),
   MYSQL_SYSVAR(use_native_aio),
   MYSQL_SYSVAR(change_buffering),
+  MYSQL_SYSVAR(track_changed_pages),
 #if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
   MYSQL_SYSVAR(change_buffering_debug),
 #endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */

=== modified file 'Percona-Server/storage/innobase/include/log0log.h'
--- Percona-Server/storage/innobase/include/log0log.h	2012-08-07 06:10:00 +0000
+++ Percona-Server/storage/innobase/include/log0log.h	2012-08-22 13:19:13 +0000
@@ -962,6 +962,11 @@
 					become signaled */
 	/* @} */
 #endif /* UNIV_LOG_ARCHIVE */
+	ib_uint64_t	tracked_lsn;	/*!< log tracking has advanced to this
+					lsn.  Field accessed atomically where
+					64-bit atomic ops are supported,
+					protected by the log sys mutex
+					otherwise. */
 };
 
 /** Test if flush order mutex is owned. */

=== added file 'Percona-Server/storage/innobase/include/log0online.h'
--- Percona-Server/storage/innobase/include/log0online.h	1970-01-01 00:00:00 +0000
+++ Percona-Server/storage/innobase/include/log0online.h	2012-08-22 13:19:13 +0000
@@ -0,0 +1,51 @@
+/*****************************************************************************
+
+Copyright (c) 2011-2012, Percona Inc. All Rights Reserved.
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place, Suite 330, Boston, MA 02111-1307 USA
+
+*****************************************************************************/
+
+/**************************************************//**
+@file include/log0online.h
+Online database log parsing for changed page tracking
+*******************************************************/
+
+#ifndef log0online_h
+#define log0online_h
+
+#include "univ.i"
+
+/*********************************************************************//**
+Initializes the online log following subsytem. */
+UNIV_INTERN
+void
+log_online_read_init();
+/*===================*/
+
+/*********************************************************************//**
+Shuts down the online log following subsystem. */
+UNIV_INTERN
+void
+log_online_read_shutdown();
+/*=======================*/
+
+/*********************************************************************//**
+Reads and parses the redo log up to last checkpoint LSN to build the changed
+page bitmap which is then written to disk.  */
+UNIV_INTERN
+void
+log_online_follow_redo_log();
+/*=========================*/
+
+#endif

=== modified file 'Percona-Server/storage/innobase/include/log0recv.h'
--- Percona-Server/storage/innobase/include/log0recv.h	2012-05-10 07:49:14 +0000
+++ Percona-Server/storage/innobase/include/log0recv.h	2012-08-22 13:19:13 +0000
@@ -32,6 +32,28 @@
 #include "hash0hash.h"
 #include "log0log.h"
 
+/******************************************************//**
+Checks the 4-byte checksum to the trailer checksum field of a log
+block.  We also accept a log block in the old format before
+InnoDB-3.23.52 where the checksum field contains the log block number.
+@return TRUE if ok, or if the log block may be in the format of InnoDB
+version predating 3.23.52 */
+UNIV_INTERN
+ibool
+log_block_checksum_is_ok_or_old_format(
+/*===================================*/
+	const byte*	block);	/*!< in: pointer to a log block */
+
+/*******************************************************//**
+Calculates the new value for lsn when more data is added to the log. */
+UNIV_INTERN
+ib_uint64_t
+recv_calc_lsn_on_data_add(
+/*======================*/
+	ib_uint64_t	lsn,	/*!< in: old lsn */
+	ib_uint64_t	len);	/*!< in: this many bytes of data is
+				added, log block headers not included */
+
 #ifdef UNIV_HOTBACKUP
 extern ibool	recv_replay_file_ops;
 
@@ -182,6 +204,21 @@
 void
 recv_recovery_rollback_active(void);
 /*===============================*/
+
+/*******************************************************************//**
+Tries to parse a single log record and returns its length.
+@return	length of the record, or 0 if the record was not complete */
+UNIV_INTERN
+ulint
+recv_parse_log_rec(
+/*===============*/
+	byte*	ptr,	/*!< in: pointer to a buffer */
+	byte*	end_ptr,/*!< in: pointer to the buffer end */
+	byte*	type,	/*!< out: type */
+	ulint*	space,	/*!< out: space id */
+	ulint*	page_no,/*!< out: page number */
+	byte**	body);	/*!< out: log record body start */
+
 /*******************************************************//**
 Scans log from a buffer and stores new log data to the parsing buffer.
 Parses and hashes the log records if new data found.  Unless

=== modified file 'Percona-Server/storage/innobase/include/os0file.h'
--- Percona-Server/storage/innobase/include/os0file.h	2012-08-07 06:10:00 +0000
+++ Percona-Server/storage/innobase/include/os0file.h	2012-08-22 13:19:13 +0000
@@ -197,6 +197,7 @@
 extern mysql_pfs_key_t	innodb_file_data_key;
 extern mysql_pfs_key_t	innodb_file_log_key;
 extern mysql_pfs_key_t	innodb_file_temp_key;
+extern mysql_pfs_key_t	innodb_file_bmp_key;
 
 /* Following four macros are instumentations to register
 various file I/O operations with performance schema.
@@ -867,6 +868,14 @@
 /*============*/
 	FILE*		file);	/*!< in: file to be truncated */
 /***********************************************************************//**
+Truncates a file at the specified position.
+@return TRUE if success */
+UNIV_INTERN
+ibool
+os_file_set_eof_at(
+	os_file_t	file,	/*!< in: handle to a file */
+	ib_uint64_t	new_len);/*!< in: new file length */
+/***********************************************************************//**
 NOTE! Use the corresponding macro os_file_flush(), not directly this function!
 Flushes the write buffers of a given file to the disk.
 @return	TRUE if success */

=== modified file 'Percona-Server/storage/innobase/include/os0sync.h'
--- Percona-Server/storage/innobase/include/os0sync.h	2012-05-10 07:49:14 +0000
+++ Percona-Server/storage/innobase/include/os0sync.h	2012-08-22 13:19:13 +0000
@@ -265,7 +265,11 @@
 
 #if defined(HAVE_IB_GCC_ATOMIC_BUILTINS)
 
-#define HAVE_ATOMIC_BUILTINS
+# define HAVE_ATOMIC_BUILTINS
+
+# ifdef HAVE_IB_GCC_ATOMIC_BUILTINS_64
+#  define HAVE_ATOMIC_BUILTINS_64
+# endif
 
 /**********************************************************//**
 Returns true if swapped, ptr is pointer to target, old_val is value to
@@ -304,6 +308,9 @@
 # define os_atomic_increment_ulint(ptr, amount) \
 	os_atomic_increment(ptr, amount)
 
+# define os_atomic_increment_uint64(ptr, amount) \
+	os_atomic_increment(ptr, amount)
+
 /**********************************************************//**
 Returns the old value of *ptr, atomically sets *ptr to new_val */
 
@@ -312,12 +319,13 @@
 
 #elif defined(HAVE_IB_SOLARIS_ATOMICS)
 
-#define HAVE_ATOMIC_BUILTINS
+# define HAVE_ATOMIC_BUILTINS
+# define HAVE_ATOMIC_BUILTINS_64
 
 /* If not compiling with GCC or GCC doesn't support the atomic
 intrinsics and running on Solaris >= 10 use Solaris atomics */
 
-#include <atomic.h>
+# include <atomic.h>
 
 /**********************************************************//**
 Returns true if swapped, ptr is pointer to target, old_val is value to
@@ -357,6 +365,9 @@
 # define os_atomic_increment_ulint(ptr, amount) \
 	atomic_add_long_nv(ptr, amount)
 
+# define os_atomic_increment_uint64(ptr, amount) \
+	atomic_add_64_nv(ptr, amount)
+
 /**********************************************************//**
 Returns the old value of *ptr, atomically sets *ptr to new_val */
 
@@ -365,7 +376,11 @@
 
 #elif defined(HAVE_WINDOWS_ATOMICS)
 
-#define HAVE_ATOMIC_BUILTINS
+# define HAVE_ATOMIC_BUILTINS
+
+# ifndef _WIN32
+#  define HAVE_ATOMIC_BUILTINS_64
+# endif
 
 /* On Windows, use Windows atomics / interlocked */
 # ifdef _WIN64
@@ -403,6 +418,11 @@
 # define os_atomic_increment_ulint(ptr, amount) \
 	((ulint) (win_xchg_and_add(ptr, amount) + amount))
 
+# define os_atomic_increment_uint64(ptr, amount)		\
+	((ib_uint64_t) (InterlockedExchangeAdd64(		\
+				 (ib_int64_t*) ptr,		\
+				 (ib_int64_t) amount) + amount))
+
 /**********************************************************//**
 Returns the old value of *ptr, atomically sets *ptr to new_val.
 InterlockedExchange() operates on LONG, and the LONG will be

=== modified file 'Percona-Server/storage/innobase/include/srv0srv.h'
--- Percona-Server/storage/innobase/include/srv0srv.h	2012-08-07 06:10:00 +0000
+++ Percona-Server/storage/innobase/include/srv0srv.h	2012-08-22 13:19:13 +0000
@@ -66,6 +66,14 @@
 /* The error monitor thread waits on this event. */
 extern os_event_t	srv_error_event;
 
+/* This event is set on checkpoint completion to wake the redo log parser
+thread */
+extern os_event_t	srv_checkpoint_completed_event;
+
+/* This event is set on the online redo log following thread exit to signal
+that the (slow) shutdown may proceed */
+extern os_event_t	srv_redo_log_thread_finished_event;
+
 /* If the last data file is auto-extended, we add this many pages to it
 at a time */
 #define SRV_AUTO_EXTEND_INCREMENT	\
@@ -133,6 +141,8 @@
 
 extern ibool	srv_recovery_stats;
 
+extern my_bool	srv_track_changed_pages;
+
 extern ibool	srv_auto_extend_last_data_file;
 extern ulint	srv_last_file_size_max;
 extern char**	srv_log_group_home_dirs;
@@ -399,6 +409,7 @@
 extern mysql_pfs_key_t	srv_monitor_thread_key;
 extern mysql_pfs_key_t	srv_master_thread_key;
 extern mysql_pfs_key_t	srv_purge_thread_key;
+extern mysql_pfs_key_t	srv_log_tracking_thread_key;
 
 /* This macro register the current thread and its key with performance
 schema */
@@ -694,6 +705,15 @@
 	void*	arg);	/*!< in: a dummy parameter required by
 			os_thread_create */
 /******************************************************************//**
+A thread which follows the redo log and outputs the changed page bitmap.
+@return a dummy value */
+UNIV_INTERN
+os_thread_ret_t
+srv_redo_log_follow_thread(
+/*=======================*/
+	void*	arg);	/*!< in: a dummy parameter required by
+			os_thread_create */
+/******************************************************************//**
 Outputs to a file the output of the InnoDB Monitor.
 @return FALSE if not all information printed
 due to failure to obtain necessary mutex */

=== modified file 'Percona-Server/storage/innobase/include/ut0rbt.h'
--- Percona-Server/storage/innobase/include/ut0rbt.h	2010-09-27 17:08:12 +0000
+++ Percona-Server/storage/innobase/include/ut0rbt.h	2012-08-22 13:19:13 +0000
@@ -116,6 +116,10 @@
 /* Compare a key with the node value (t is tree, k is key, n is node)*/
 #define rbt_compare(t, k, n) (t->compare(k, n->value))
 
+/* Node size. FIXME: name might clash, but currently it does not, so for easier
+   maintenance do not rename it for now. */
+#define	SIZEOF_NODE(t)	((sizeof(ib_rbt_node_t) + t->sizeof_value) - 1)
+
 /**********************************************************************//**
 Free an instance of  a red black tree */
 UNIV_INTERN
@@ -187,6 +191,17 @@
 	ib_rbt_bound_t*	parent,			/*!< in: parent */
 	const void*	value);			/*!< in: this value is copied
 						to the node */
+/****************************************************************//**
+Add a new caller-provided node to tree at the specified position.
+The node must have its key fields initialized correctly.
+@return added node */
+UNIV_INTERN
+const ib_rbt_node_t*
+rbt_add_preallocated_node(
+/*======================*/
+	ib_rbt_t*	tree,			/*!< in: rb tree */
+	ib_rbt_bound_t*	parent,			/*!< in: parent */
+	ib_rbt_node_t*	node);			/*!< in: node */
 /**********************************************************************//**
 Return the left most data node in the tree
 @return	left most node */
@@ -273,6 +288,13 @@
 rbt_clear(
 /*======*/
 	ib_rbt_t*	tree);			/*!< in: rb tree */
+/****************************************************************//**
+Clear the tree without deleting and freeing its nodes. */
+UNIV_INTERN
+void
+rbt_reset(
+/*======*/
+	ib_rbt_t*	tree);			/*!< in: rb tree */
 /**********************************************************************//**
 Merge the node from dst into src. Return the number of nodes merged.
 @return	no. of recs merged */

=== modified file 'Percona-Server/storage/innobase/log/log0log.c'
--- Percona-Server/storage/innobase/log/log0log.c	2012-05-10 07:49:14 +0000
+++ Percona-Server/storage/innobase/log/log0log.c	2012-08-22 13:19:13 +0000
@@ -214,6 +214,54 @@
 	return(lsn);
 }
 
+/****************************************************************//**
+Safely reads the log_sys->tracked_lsn value.  Uses atomic operations
+if available, otherwise this field is protected with the log system
+mutex.  The writer counterpart function is log_set_tracked_lsn() in
+log0online.c.
+
+@return log_sys->tracked_lsn value. */
+UNIV_INLINE
+ib_uint64_t
+log_get_tracked_lsn()
+{
+#ifdef HAVE_ATOMIC_BUILTINS_64
+	return os_atomic_increment_uint64(&log_sys->tracked_lsn, 0);
+#else
+	ut_ad(mutex_own(&(log_sys->mutex)));
+	return log_sys->tracked_lsn;
+#endif
+}
+
+/****************************************************************//**
+Checks if the log groups have a big enough margin of free space in
+so that a new log entry can be written without overwriting log data
+that is not read by the changed page bitmap thread.
+@return TRUE if there is not enough free space. */
+static
+ibool
+log_check_tracking_margin(
+	ulint	lsn_advance)	/*!< in: an upper limit on how much log data we
+				plan to write.  If zero, the margin will be
+				checked for the already-written log. */
+{
+	ib_uint64_t	tracked_lsn;
+	ulint		tracked_lsn_age;
+
+	if (!srv_track_changed_pages) {
+		return FALSE;
+	}
+
+	ut_ad(mutex_own(&(log_sys->mutex)));
+
+	tracked_lsn = log_get_tracked_lsn();
+	tracked_lsn_age = log_sys->lsn - tracked_lsn;
+
+	/* The overwrite would happen when log_sys->log_group_capacity is
+	exceeded, but we use max_checkpoint_age for an extra safety margin. */
+	return tracked_lsn_age + lsn_advance > log_sys->max_checkpoint_age;
+}
+
 /************************************************************//**
 Opens the log for log_write_low. The log must be closed with log_close and
 released with log_release.
@@ -230,9 +278,7 @@
 	ulint	archived_lsn_age;
 	ulint	dummy;
 #endif /* UNIV_LOG_ARCHIVE */
-#ifdef UNIV_DEBUG
 	ulint	count			= 0;
-#endif /* UNIV_DEBUG */
 
 	ut_a(len < log->buf_size / 2);
 loop:
@@ -260,6 +306,19 @@
 		goto loop;
 	}
 
+	if (log_check_tracking_margin(len_upper_limit) && (++count < 50)) {
+
+		/* This log write would violate the untracked LSN free space
+		margin.  Limit this to 50 retries as there might be situations
+		where we have no choice but to proceed anyway, i.e. if the log
+		is about to be overflown, log tracking or not. */
+		mutex_exit(&(log->mutex));
+
+		os_thread_sleep(10000);
+
+		goto loop;
+	}
+
 #ifdef UNIV_LOG_ARCHIVE
 	if (log->archiving_state != LOG_ARCH_OFF) {
 
@@ -398,6 +457,8 @@
 	ulint		first_rec_group;
 	ib_uint64_t	oldest_lsn;
 	ib_uint64_t	lsn;
+	ib_uint64_t	tracked_lsn;
+	ulint		tracked_lsn_age;
 	log_t*		log	= log_sys;
 	ib_uint64_t	checkpoint_age;
 
@@ -424,6 +485,19 @@
 		log->check_flush_or_checkpoint = TRUE;
 	}
 
+	if (srv_track_changed_pages) {
+
+		tracked_lsn = log_get_tracked_lsn();
+		tracked_lsn_age = lsn - tracked_lsn;
+
+		if (tracked_lsn_age >= log->log_group_capacity) {
+
+			fprintf(stderr, " InnoDB: Error: the age of the "
+				"oldest untracked record exceeds the log "
+				"group capacity!\n");
+		}
+	}
+
 	checkpoint_age = lsn - log->last_checkpoint_lsn;
 
 	if (checkpoint_age >= log->log_group_capacity) {
@@ -891,6 +965,8 @@
 	log_sys->archiving_on = os_event_create(NULL);
 #endif /* UNIV_LOG_ARCHIVE */
 
+	log_sys->tracked_lsn = 0;
+
 	/*----------------------------*/
 
 	log_block_init(log_sys->buf, log_sys->lsn);
@@ -1740,6 +1816,12 @@
 	}
 
 	mutex_exit(&(log_sys->mutex));
+
+	/* Wake the redo log watching thread to parse the log up to this
+	checkpoint. */
+	if (srv_track_changed_pages) {
+		os_event_set(srv_checkpoint_completed_event);
+	}
 }
 
 /*******************************************************************//**
@@ -3086,6 +3168,15 @@
 
 	log_checkpoint_margin();
 
+	mutex_enter(&(log_sys->mutex));
+	if (log_check_tracking_margin(0)) {
+
+		mutex_exit(&(log_sys->mutex));
+		os_thread_sleep(10000);
+		goto loop;
+	}
+	mutex_exit(&(log_sys->mutex));
+
 #ifdef UNIV_LOG_ARCHIVE
 	log_archive_margin();
 #endif /* UNIV_LOG_ARCHIVE */
@@ -3114,6 +3205,7 @@
 /*=======================================*/
 {
 	ib_uint64_t		lsn;
+	ib_uint64_t		tracked_lsn;
 	ulint			arch_log_no;
 	ibool			server_busy;
 	ulint			count = 0;
@@ -3299,6 +3391,12 @@
 		}
 
 		srv_shutdown_state = SRV_SHUTDOWN_LAST_PHASE;
+		/* Wake the log tracking thread which will then immediatelly
+		quit because of srv_shutdown_state value */
+		if (srv_track_changed_pages) {
+			os_event_set(srv_checkpoint_completed_event);
+			os_event_wait(srv_redo_log_thread_finished_event);
+		}
 		fil_close_all_files();
 		ut_a(srv_get_active_thread_type() == ULINT_UNDEFINED);
 		return;
@@ -3308,9 +3406,12 @@
 
 	mutex_enter(&log_sys->mutex);
 
+	tracked_lsn = log_get_tracked_lsn();
+
 	lsn = log_sys->lsn;
 
 	if (lsn != log_sys->last_checkpoint_lsn
+	    || (srv_track_changed_pages	&& (tracked_lsn != log_sys->last_checkpoint_lsn))
 #ifdef UNIV_LOG_ARCHIVE
 	    || (srv_log_archive_on
 		&& lsn != log_sys->archived_lsn + LOG_BLOCK_HDR_SIZE)
@@ -3368,6 +3469,11 @@
 
 	srv_shutdown_state = SRV_SHUTDOWN_LAST_PHASE;
 
+	/* Signal the log following thread to quit */
+	if (srv_track_changed_pages) {
+		os_event_set(srv_checkpoint_completed_event);
+	}
+
 	/* Make some checks that the server really is quiet */
 	ut_a(srv_get_active_thread_type() == ULINT_UNDEFINED);
 
@@ -3388,6 +3494,10 @@
 
 	fil_flush_file_spaces(FIL_TABLESPACE);
 
+	if (srv_track_changed_pages) {
+		os_event_wait(srv_redo_log_thread_finished_event);
+	}
+
 	fil_close_all_files();
 
 	/* Make some checks that the server really is quiet */
@@ -3514,6 +3624,18 @@
 		((log_sys->n_log_ios - log_sys->n_log_ios_old)
 		 / time_elapsed));
 
+	if (srv_track_changed_pages) {
+
+		/* The maximum tracked LSN age is equal to the maximum
+		checkpoint age */
+		fprintf(file,
+			"Log tracking enabled\n"
+			"Log tracked up to   %llu\n"
+			"Max tracked LSN age %lu\n",
+			log_get_tracked_lsn(),
+			log_sys->max_checkpoint_age);
+	}
+
 	log_sys->n_log_ios_old = log_sys->n_log_ios;
 	log_sys->last_printout_time = current_time;
 

=== added file 'Percona-Server/storage/innobase/log/log0online.c'
--- Percona-Server/storage/innobase/log/log0online.c	1970-01-01 00:00:00 +0000
+++ Percona-Server/storage/innobase/log/log0online.c	2012-08-22 13:19:13 +0000
@@ -0,0 +1,927 @@
+/*****************************************************************************
+
+Copyright (c) 2011-2012 Percona Inc. All Rights Reserved.
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place, Suite 330, Boston, MA 02111-1307 USA
+
+*****************************************************************************/
+
+/**************************************************//**
+@file log/log0online.c
+Online database log parsing for changed page tracking
+
+*******************************************************/
+
+#include "log0online.h"
+
+#include "my_dbug.h"
+
+#include "log0recv.h"
+#include "mach0data.h"
+#include "mtr0log.h"
+#include "os0file.h"
+#include "srv0srv.h"
+#include "srv0start.h"
+#include "trx0sys.h"
+#include "ut0rbt.h"
+
+enum { FOLLOW_SCAN_SIZE = 4 * (UNIV_PAGE_SIZE_MAX) };
+
+/** Log parsing and bitmap output data structure */
+struct log_bitmap_struct {
+	byte		read_buf[FOLLOW_SCAN_SIZE];
+					/*!< log read buffer */
+	byte		parse_buf[RECV_PARSING_BUF_SIZE];
+					/*!< log parse buffer */
+	byte*		parse_buf_end;  /*!< parse buffer position where the
+					next read log data should be copied to.
+					If the previous log records were fully
+					parsed, it points to the start,
+					otherwise points immediatelly past the
+					end of the incomplete log record. */
+	char*		out_name;	/*!< the file name for bitmap output */
+	os_file_t	out;		/*!< the bitmap output file */
+	ib_uint64_t	out_offset;	/*!< the next write position in the
+					bitmap output file */
+	ib_uint64_t	start_lsn;	/*!< the LSN of the next unparsed
+					record and the start of the next LSN
+					interval to be parsed.  */
+	ib_uint64_t	end_lsn;	/*!< the end of the LSN interval to be
+					parsed, equal to the next checkpoint
+					LSN at the time of parse */
+	ib_uint64_t	next_parse_lsn;	/*!< the LSN of the next unparsed
+					record in the current parse */
+	ib_rbt_t*	modified_pages; /*!< the current modified page set,
+					organized as the RB-tree with the keys
+					of (space, 4KB-block-start-page-id)
+					pairs */
+	ib_rbt_node_t*	page_free_list; /*!< Singly-linked list of freed nodes
+					of modified_pages tree for later
+					reuse.  Nodes are linked through
+					ib_rbt_node_t.left as this field has
+					both the correct type and the tree does
+					not mind its overwrite during
+					rbt_next() tree traversal. */
+};
+
+/* The log parsing and bitmap output struct instance */
+static struct log_bitmap_struct* log_bmp_sys;
+
+/* File name stem for modified page bitmaps */
+static const char* modified_page_stem = "ib_modified_log.";
+
+/* On server startup with empty database srv_start_lsn == 0, in
+which case the first LSN of actual log records will be this. */
+#define MIN_TRACKED_LSN ((LOG_START_LSN) + (LOG_BLOCK_HDR_SIZE))
+
+/** The bitmap file block size in bytes.  All writes will be multiples of this.
+ */
+enum {
+	MODIFIED_PAGE_BLOCK_SIZE = 4096
+};
+
+
+/** Offsets in a file bitmap block */
+enum {
+	MODIFIED_PAGE_IS_LAST_BLOCK = 0,/* 1 if last block in the current
+					write, 0 otherwise. */
+	MODIFIED_PAGE_START_LSN = 4,	/* The starting tracked LSN of this and
+					other blocks in the same write */
+	MODIFIED_PAGE_END_LSN = 12,	/* The ending tracked LSN of this and
+					other blocks in the same write */
+	MODIFIED_PAGE_SPACE_ID = 20,	/* The space ID of tracked pages in
+					this block */
+	MODIFIED_PAGE_1ST_PAGE_ID = 24,	/* The page ID of the first tracked
+					page in this block */
+	MODIFIED_PAGE_BLOCK_UNUSED_1 = 28,/* Unused in order to align the start
+					of bitmap at 8 byte boundary */
+	MODIFIED_PAGE_BLOCK_BITMAP = 32,/* Start of the bitmap itself */
+	MODIFIED_PAGE_BLOCK_UNUSED_2 = MODIFIED_PAGE_BLOCK_SIZE - 8,
+					/* Unused in order to align the end of
+					bitmap at 8 byte boundary */
+	MODIFIED_PAGE_BLOCK_CHECKSUM = MODIFIED_PAGE_BLOCK_SIZE - 4
+					/* The checksum of the current block */
+};
+
+/** Length of the bitmap data in a block in bytes */
+enum { MODIFIED_PAGE_BLOCK_BITMAP_LEN
+       = MODIFIED_PAGE_BLOCK_UNUSED_2 - MODIFIED_PAGE_BLOCK_BITMAP };
+
+/** Length of the bitmap data in a block in page ids */
+enum { MODIFIED_PAGE_BLOCK_ID_COUNT = MODIFIED_PAGE_BLOCK_BITMAP_LEN * 8 };
+
+/****************************************************************//**
+Provide a comparisson function for the RB-tree tree (space,
+block_start_page) pairs.  Actual implementation does not matter as
+long as the ordering is full.
+@return -1 if p1 < p2, 0 if p1 == p2, 1 if p1 > p2
+*/
+static
+int
+log_online_compare_bmp_keys(
+/*========================*/
+	const void* p1,	/*!<in: 1st key to compare */
+	const void* p2)	/*!<in: 2nd key to compare */
+{
+	const byte *k1 = (const byte *)p1;
+	const byte *k2 = (const byte *)p2;
+
+	ulint k1_space = mach_read_from_4(k1 + MODIFIED_PAGE_SPACE_ID);
+	ulint k2_space = mach_read_from_4(k2 + MODIFIED_PAGE_SPACE_ID);
+	if (k1_space == k2_space) {
+		ulint k1_start_page
+			= mach_read_from_4(k1 + MODIFIED_PAGE_1ST_PAGE_ID);
+		ulint k2_start_page
+			= mach_read_from_4(k2 + MODIFIED_PAGE_1ST_PAGE_ID);
+		return k1_start_page < k2_start_page
+			? -1 : k1_start_page > k2_start_page ? 1 : 0;
+	}
+	return k1_space < k2_space ? -1 : 1;
+}
+
+/****************************************************************//**
+Set a bit for tracked page in the bitmap. Expand the bitmap tree as
+necessary. */
+static
+void
+log_online_set_page_bit(
+/*====================*/
+	ulint	space,	/*!<in: log record space id */
+	ulint	page_no)/*!<in: log record page id */
+{
+	ulint		block_start_page;
+	ulint		block_pos;
+	uint		bit_pos;
+	ib_rbt_bound_t	tree_search_pos;
+	byte		search_page[MODIFIED_PAGE_BLOCK_SIZE];
+	byte		*page_ptr;
+
+	ut_a(space != ULINT_UNDEFINED);
+	ut_a(page_no != ULINT_UNDEFINED);
+
+	block_start_page = page_no / MODIFIED_PAGE_BLOCK_ID_COUNT
+		* MODIFIED_PAGE_BLOCK_ID_COUNT;
+	block_pos = block_start_page ? (page_no % block_start_page / 8)
+		: (page_no / 8);
+	bit_pos = page_no % 8;
+
+	mach_write_to_4(search_page + MODIFIED_PAGE_SPACE_ID, space);
+	mach_write_to_4(search_page + MODIFIED_PAGE_1ST_PAGE_ID,
+			block_start_page);
+
+	if (!rbt_search(log_bmp_sys->modified_pages, &tree_search_pos,
+			search_page)) {
+		page_ptr = rbt_value(byte, tree_search_pos.last);
+	}
+	else {
+		ib_rbt_node_t *new_node;
+
+		if (log_bmp_sys->page_free_list) {
+			new_node = log_bmp_sys->page_free_list;
+			log_bmp_sys->page_free_list = new_node->left;
+		}
+		else {
+			new_node = ut_malloc(SIZEOF_NODE(
+				  log_bmp_sys->modified_pages));
+		}
+		memset(new_node, 0, SIZEOF_NODE(log_bmp_sys->modified_pages));
+
+		page_ptr = rbt_value(byte, new_node);
+		mach_write_to_4(page_ptr + MODIFIED_PAGE_SPACE_ID, space);
+		mach_write_to_4(page_ptr + MODIFIED_PAGE_1ST_PAGE_ID,
+				block_start_page);
+
+		rbt_add_preallocated_node(log_bmp_sys->modified_pages,
+					  &tree_search_pos, new_node);
+	}
+	page_ptr[MODIFIED_PAGE_BLOCK_BITMAP + block_pos] |= (1U << bit_pos);
+}
+
+/****************************************************************//**
+Calculate a bitmap block checksum.  Algorithm borrowed from
+log_block_calc_checksum.
+@return checksum */
+UNIV_INLINE
+ulint
+log_online_calc_checksum(
+/*=====================*/
+	const byte*	block)	/*!<in: bitmap block */
+{
+	ulint	sum;
+	ulint	sh;
+	ulint	i;
+
+	sum = 1;
+	sh = 0;
+
+	for (i = 0; i < MODIFIED_PAGE_BLOCK_CHECKSUM; i++) {
+
+		ulint	b = block[i];
+		sum &= 0x7FFFFFFFUL;
+		sum += b;
+		sum += b << sh;
+		sh++;
+		if (sh > 24) {
+			sh = 0;
+		}
+	}
+
+	return sum;
+}
+
+/****************************************************************//**
+Get the last tracked fully LSN from the bitmap file by reading
+backwards untile a correct end page is found.  Detects incomplete
+writes and corrupted data.  Sets the start output position for the
+written bitmap data.
+@return the last fully tracked LSN */
+static
+ib_uint64_t
+log_online_read_last_tracked_lsn()
+/*==============================*/
+{
+	byte		page[MODIFIED_PAGE_BLOCK_SIZE];
+	ib_uint64_t	read_offset	= log_bmp_sys->out_offset;
+	/* Initialize these to nonequal values so that file size == 0 case with
+	zero loop repetitions is handled correctly */
+	ulint		checksum	= 0;
+	ulint		actual_checksum = !checksum;
+	ibool		is_last_page	= FALSE;
+	ib_uint64_t	result;
+
+	ut_ad(log_bmp_sys->out_offset % MODIFIED_PAGE_BLOCK_SIZE == 0);
+
+	while (checksum != actual_checksum && read_offset > 0 && !is_last_page)
+	{
+
+		ulint		offset_low, offset_high;
+		ibool		success;
+
+		read_offset -= MODIFIED_PAGE_BLOCK_SIZE;
+		offset_high = (ulint)(read_offset >> 32);
+		offset_low = (ulint)(read_offset & 0xFFFFFFFF);
+
+		success = os_file_read(log_bmp_sys->out, page, offset_low,
+				       offset_high, MODIFIED_PAGE_BLOCK_SIZE);
+		if (!success) {
+
+			/* The following call prints an error message */
+			os_file_get_last_error(TRUE);
+			/* Here and below assume that bitmap file names do not
+			contain apostrophes, thus no need for
+			ut_print_filename(). */
+			fprintf(stderr, "InnoDB: Warning: failed reading "
+				"changed page bitmap file \'%s\'\n",
+				log_bmp_sys->out_name);
+			return MIN_TRACKED_LSN;
+		}
+
+		is_last_page
+			= mach_read_from_4(page + MODIFIED_PAGE_IS_LAST_BLOCK);
+		checksum = mach_read_from_4(page
+					    + MODIFIED_PAGE_BLOCK_CHECKSUM);
+		actual_checksum = log_online_calc_checksum(page);
+		if (checksum != actual_checksum) {
+
+			fprintf(stderr, "InnoDB: Warning: corruption "
+				"detected in \'%s\' at offset %llu\n",
+				log_bmp_sys->out_name, read_offset);
+		}
+
+	};
+
+	if (UNIV_LIKELY(checksum == actual_checksum && is_last_page)) {
+
+		log_bmp_sys->out_offset = read_offset
+			+ MODIFIED_PAGE_BLOCK_SIZE;
+		result = mach_read_from_8(page + MODIFIED_PAGE_END_LSN);
+	}
+	else {
+		log_bmp_sys->out_offset = read_offset;
+		result = 0;
+	}
+
+	/* Truncate the output file to discard the corrupted bitmap data, if
+	any */
+	if (!os_file_set_eof_at(log_bmp_sys->out,
+				log_bmp_sys->out_offset)) {
+		fprintf(stderr, "InnoDB: Warning: failed truncating "
+			"changed page bitmap file \'%s\' to %llu bytes\n",
+			log_bmp_sys->out_name, log_bmp_sys->out_offset);
+		result = 0;
+	}
+	return result;
+}
+
+/****************************************************************//**
+Safely write the log_sys->tracked_lsn value.  Uses atomic operations
+if available, otherwise this field is protected with the log system
+mutex.  The reader counterpart function is log_get_tracked_lsn() in
+log0log.c. */
+UNIV_INLINE
+void
+log_set_tracked_lsn(
+/*================*/
+	ib_uint64_t	tracked_lsn)	/*!<in: new value */
+{
+#ifdef HAVE_ATOMIC_BUILTINS_64
+	/* Single writer, no data race here */
+	ib_uint64_t old_value
+		= os_atomic_increment_uint64(&log_sys->tracked_lsn, 0);
+	(void) os_atomic_increment_uint64(&log_sys->tracked_lsn,
+					  tracked_lsn - old_value);
+#else
+	mutex_enter(&log_sys->mutex);
+	log_sys->tracked_lsn = tracked_lsn;
+	mutex_exit(&log_sys->mutex);
+#endif
+}
+
+/****************************************************************//**
+Diagnose a gap in tracked LSN range on server startup due to crash or
+very fast shutdown and try to close it by tracking the data
+immediatelly, if possible. */
+static
+void
+log_online_track_missing_on_startup(
+/*================================*/
+	ib_uint64_t	last_tracked_lsn,	/*!<in: last tracked LSN read
+						from the bitmap file */
+	ib_uint64_t	tracking_start_lsn)	/*!<in: last checkpoint LSN of
+						the current server startup */
+{
+	ut_ad(last_tracked_lsn != tracking_start_lsn);
+
+	fprintf(stderr, "InnoDB: last tracked LSN in \'%s\' is %llu, but "
+		"last checkpoint LSN is %llu.  This might be due to a server "
+		"crash or a very fast shutdown.  ", log_bmp_sys->out_name,
+		last_tracked_lsn, tracking_start_lsn);
+
+	/* last_tracked_lsn might be < MIN_TRACKED_LSN in the case of empty
+	   bitmap file, handle this too. */
+	last_tracked_lsn = ut_max(last_tracked_lsn, MIN_TRACKED_LSN);
+
+	/* See if we can fully recover the missing interval */
+	if (log_sys->lsn - last_tracked_lsn < log_sys->log_group_capacity) {
+
+		fprintf(stderr,
+			"Reading the log to advance the last tracked LSN.\n");
+
+		log_bmp_sys->start_lsn = last_tracked_lsn;
+		log_set_tracked_lsn(log_bmp_sys->start_lsn);
+		log_online_follow_redo_log();
+		ut_ad(log_bmp_sys->end_lsn >= tracking_start_lsn);
+
+		fprintf(stderr,
+			"InnoDB: continuing tracking changed pages from LSN "
+			"%llu\n", log_bmp_sys->end_lsn);
+	}
+	else {
+		fprintf(stderr,
+			"The age of last tracked LSN exceeds log capacity, "
+			"tracking-based incremental backups will work only "
+			"from the higher LSN!\n");
+
+		log_bmp_sys->end_lsn = log_bmp_sys->start_lsn
+			= tracking_start_lsn;
+		log_set_tracked_lsn(log_bmp_sys->start_lsn);
+
+		fprintf(stderr,
+			"InnoDB: starting tracking changed pages from LSN "
+			"%llu\n", log_bmp_sys->end_lsn);
+	}
+}
+
+/*********************************************************************//**
+Initialize the online log following subsytem. */
+UNIV_INTERN
+void
+log_online_read_init()
+/*==================*/
+{
+	char		buf[FN_REFLEN];
+	ibool		success;
+	ib_uint64_t	tracking_start_lsn
+		= ut_max(log_sys->last_checkpoint_lsn, MIN_TRACKED_LSN);
+
+	/* Assert (could be compile-time assert) that bitmap data start and end
+	in a bitmap block is 8-byte aligned */
+	ut_a(MODIFIED_PAGE_BLOCK_BITMAP % 8 == 0);
+	ut_a(MODIFIED_PAGE_BLOCK_BITMAP_LEN % 8 == 0);
+
+	log_bmp_sys = ut_malloc(sizeof(*log_bmp_sys));
+
+	ut_snprintf(buf, FN_REFLEN, "%s%s%d", srv_data_home,
+		    modified_page_stem, 1);
+	log_bmp_sys->out_name = ut_malloc(strlen(buf) + 1);
+	ut_strcpy(log_bmp_sys->out_name, buf);
+
+	log_bmp_sys->modified_pages = rbt_create(MODIFIED_PAGE_BLOCK_SIZE,
+						 log_online_compare_bmp_keys);
+	log_bmp_sys->page_free_list = NULL;
+
+	log_bmp_sys->out
+		= os_file_create_simple_no_error_handling
+		(innodb_file_bmp_key, log_bmp_sys->out_name, OS_FILE_OPEN,
+		 OS_FILE_READ_WRITE, &success);
+
+	if (!success) {
+
+		/* New file, tracking from scratch */
+		log_bmp_sys->out
+			= os_file_create_simple_no_error_handling
+			(innodb_file_bmp_key, log_bmp_sys->out_name,
+			 OS_FILE_CREATE, OS_FILE_READ_WRITE, &success);
+		if (!success) {
+
+			/* The following call prints an error message */
+			os_file_get_last_error(TRUE);
+			fprintf(stderr,
+				"InnoDB: Error: Cannot create \'%s\'\n",
+				log_bmp_sys->out_name);
+			exit(1);
+		}
+
+		log_bmp_sys->out_offset = 0;
+	}
+	else {
+
+		/* Old file, read last tracked LSN and continue from there */
+		ulint		size_low;
+		ulint		size_high;
+		ib_uint64_t	last_tracked_lsn;
+
+		success = os_file_get_size(log_bmp_sys->out, &size_low,
+					   &size_high);
+		ut_a(success);
+
+		log_bmp_sys->out_offset
+			= ((ib_uint64_t)size_high << 32) | size_low;
+
+		if (log_bmp_sys->out_offset % MODIFIED_PAGE_BLOCK_SIZE != 0) {
+
+			fprintf(stderr,
+				"InnoDB: Warning: truncated block detected "
+				"in \'%s\' at offset %llu\n",
+				log_bmp_sys->out_name,
+				log_bmp_sys->out_offset);
+			log_bmp_sys->out_offset -=
+				log_bmp_sys->out_offset
+				% MODIFIED_PAGE_BLOCK_SIZE;
+		}
+
+		last_tracked_lsn = log_online_read_last_tracked_lsn();
+
+		if (last_tracked_lsn < tracking_start_lsn) {
+
+			log_online_track_missing_on_startup(last_tracked_lsn,
+							    tracking_start_lsn);
+			return;
+		}
+
+		if (last_tracked_lsn > tracking_start_lsn) {
+
+			fprintf(stderr, "InnoDB: last tracked LSN in \'%s\' "
+				"is %llu, but last checkpoint LSN is %llu. "
+				"The tracking-based incremental backups will "
+				"work only from the latter LSN!\n",
+				log_bmp_sys->out_name, last_tracked_lsn,
+				tracking_start_lsn);
+		}
+
+	}
+
+	fprintf(stderr, "InnoDB: starting tracking changed pages from "
+		"LSN %llu\n", tracking_start_lsn);
+	log_bmp_sys->start_lsn = tracking_start_lsn;
+	log_set_tracked_lsn(tracking_start_lsn);
+}
+
+/*********************************************************************//**
+Shut down the online log following subsystem. */
+UNIV_INTERN
+void
+log_online_read_shutdown()
+/*======================*/
+{
+	ib_rbt_node_t *free_list_node = log_bmp_sys->page_free_list;
+
+	os_file_close(log_bmp_sys->out);
+
+	rbt_free(log_bmp_sys->modified_pages);
+
+	while (free_list_node) {
+		ib_rbt_node_t *next = free_list_node->left;
+		ut_free(free_list_node);
+		free_list_node = next;
+	}
+
+	ut_free(log_bmp_sys->out_name);
+	ut_free(log_bmp_sys);
+}
+
+/*********************************************************************//**
+For the given minilog record type determine if the record has (space; page)
+associated with it.
+@return TRUE if the record has (space; page) in it */
+static
+ibool
+log_online_rec_has_page(
+/*====================*/
+	byte	type)	/*!<in: the minilog record type */
+{
+	return type != MLOG_MULTI_REC_END && type != MLOG_DUMMY_RECORD;
+}
+
+/*********************************************************************//**
+Check if a page field for a given log record type actually contains a page
+id. It does not for file operations and MLOG_LSN.
+@return TRUE if page field contains actual page id, FALSE otherwise */
+static
+ibool
+log_online_rec_page_means_page(
+/*===========================*/
+	byte	type)	/*!<in: log record type */
+{
+	return log_online_rec_has_page(type)
+#ifdef UNIV_LOG_LSN_DEBUG
+		&& type != MLOG_LSN
+#endif
+		&& type != MLOG_FILE_CREATE
+		&& type != MLOG_FILE_RENAME
+		&& type != MLOG_FILE_DELETE
+		&& type != MLOG_FILE_CREATE2;
+}
+
+/*********************************************************************//**
+Parse the log data in the parse buffer for the (space, page) pairs and add
+them to the modified page set as necessary.  Removes the fully-parsed records
+from the buffer.  If an incomplete record is found, moves it to the end of the
+buffer. */
+static
+void
+log_online_parse_redo_log()
+/*=======================*/
+{
+	byte *ptr = log_bmp_sys->parse_buf;
+	byte *end = log_bmp_sys->parse_buf_end;
+
+	ulint len = 0;
+
+	while (ptr != end
+	       && log_bmp_sys->next_parse_lsn < log_bmp_sys->end_lsn) {
+
+		byte	type;
+		ulint	space;
+		ulint	page_no;
+		byte*	body;
+
+		/* recv_sys is not initialized, so on corrupt log we will
+		SIGSEGV.  But the log of a live database should not be
+		corrupt. */
+		len = recv_parse_log_rec(ptr, end, &type, &space, &page_no,
+					 &body);
+		if (len > 0) {
+
+			if (log_online_rec_page_means_page(type)
+			    && (space != TRX_DOUBLEWRITE_SPACE)) {
+
+				ut_a(len >= 3);
+				log_online_set_page_bit(space, page_no);
+			}
+
+			ptr += len;
+			ut_ad(ptr <= end);
+			log_bmp_sys->next_parse_lsn
+			    = recv_calc_lsn_on_data_add
+				(log_bmp_sys->next_parse_lsn, len);
+		}
+		else {
+
+			/* Incomplete log record.  Shift it to the
+			beginning of the parse buffer and leave it to be
+			completed on the next read.  */
+			ut_memmove(log_bmp_sys->parse_buf, ptr, end - ptr);
+			log_bmp_sys->parse_buf_end
+				= log_bmp_sys->parse_buf + (end - ptr);
+			ptr = end;
+		}
+	}
+
+	if (len > 0) {
+
+		log_bmp_sys->parse_buf_end = log_bmp_sys->parse_buf;
+	}
+}
+
+/*********************************************************************//**
+Check the log block checksum.
+@return TRUE if the log block checksum is OK, FALSE otherwise.  */
+static
+ibool
+log_online_is_valid_log_seg(
+/*========================*/
+	const byte* log_block)	/*!< in: read log data */
+{
+	ibool checksum_is_ok
+		= log_block_checksum_is_ok_or_old_format(log_block);
+
+	if (!checksum_is_ok) {
+
+		fprintf(stderr,
+			"InnoDB Error: log block checksum mismatch"
+			"expected %lu, calculated checksum %lu\n",
+			(ulong) log_block_get_checksum(log_block),
+			(ulong) log_block_calc_checksum(log_block));
+	}
+
+	return checksum_is_ok;
+}
+
+/*********************************************************************//**
+Copy new log data to the parse buffer while skipping log block header,
+trailer and already parsed data.  */
+static
+void
+log_online_add_to_parse_buf(
+/*========================*/
+	const byte*	log_block,	/*!< in: read log data */
+	ulint		data_len,	/*!< in: length of read log data */
+	ulint		skip_len)	/*!< in: how much of log data to
+					skip */
+{
+	ulint start_offset = skip_len ? skip_len : LOG_BLOCK_HDR_SIZE;
+	ulint end_offset
+		= (data_len == OS_FILE_LOG_BLOCK_SIZE)
+		? data_len - LOG_BLOCK_TRL_SIZE
+		: data_len;
+	ulint actual_data_len = (end_offset >= start_offset)
+		? end_offset - start_offset : 0;
+
+	ut_memcpy(log_bmp_sys->parse_buf_end, log_block + start_offset,
+		  actual_data_len);
+
+	log_bmp_sys->parse_buf_end += actual_data_len;
+
+	ut_a(log_bmp_sys->parse_buf_end - log_bmp_sys->parse_buf
+	     <= RECV_PARSING_BUF_SIZE);
+}
+
+/*********************************************************************//**
+Parse the log block: first copies the read log data to the parse buffer while
+skipping log block header, trailer and already parsed data.  Then it actually
+parses the log to add to the modified page bitmap. */
+static
+void
+log_online_parse_redo_log_block(
+/*============================*/
+	const byte*	log_block,		  /*!< in: read log data */
+	ulint		skip_already_parsed_len)  /*!< in: how many bytes of
+						  log data should be skipped as
+						  they were parsed before */
+{
+	ulint block_data_len;
+
+	block_data_len = log_block_get_data_len(log_block);
+
+	ut_ad(block_data_len % OS_FILE_LOG_BLOCK_SIZE == 0
+	      || block_data_len < OS_FILE_LOG_BLOCK_SIZE);
+
+	log_online_add_to_parse_buf(log_block, block_data_len,
+				    skip_already_parsed_len);
+	log_online_parse_redo_log();
+}
+
+/*********************************************************************//**
+Read and parse one redo log chunk and updates the modified page bitmap. */
+static
+void
+log_online_follow_log_seg(
+/*======================*/
+	log_group_t*	group,		       /*!< in: the log group to use */
+	ib_uint64_t	block_start_lsn,       /*!< in: the LSN to read from */
+	ib_uint64_t	block_end_lsn)	       /*!< in: the LSN to read to */
+{
+	/* Pointer to the current OS_FILE_LOG_BLOCK-sized chunk of the read log
+	data to parse */
+	byte* log_block = log_bmp_sys->read_buf;
+	byte* log_block_end = log_bmp_sys->read_buf
+		+ (block_end_lsn - block_start_lsn);
+
+	mutex_enter(&log_sys->mutex);
+	log_group_read_log_seg(LOG_RECOVER, log_bmp_sys->read_buf,
+			       group, block_start_lsn, block_end_lsn);
+	mutex_exit(&log_sys->mutex);
+
+	while (log_block < log_block_end
+	       && log_bmp_sys->next_parse_lsn < log_bmp_sys->end_lsn) {
+
+		/* How many bytes of log data should we skip in the current log
+		block.  Skipping is necessary because we round down the next
+		parse LSN thus it is possible to read the already-processed log
+		data many times */
+		ulint skip_already_parsed_len = 0;
+
+		if (!log_online_is_valid_log_seg(log_block)) {
+			break;
+		}
+
+		if ((block_start_lsn <= log_bmp_sys->next_parse_lsn)
+		    && (block_start_lsn + OS_FILE_LOG_BLOCK_SIZE
+			> log_bmp_sys->next_parse_lsn)) {
+
+			/* The next parse LSN is inside the current block, skip
+			data preceding it. */
+			skip_already_parsed_len
+				= log_bmp_sys->next_parse_lsn
+				- block_start_lsn;
+		}
+		else {
+
+			/* If the next parse LSN is not inside the current
+			block, then the only option is that we have processed
+			ahead already. */
+			ut_a(block_start_lsn > log_bmp_sys->next_parse_lsn);
+		}
+
+		/* TODO: merge the copying to the parse buf code with
+		skip_already_len calculations */
+		log_online_parse_redo_log_block(log_block,
+						skip_already_parsed_len);
+
+		log_block += OS_FILE_LOG_BLOCK_SIZE;
+		block_start_lsn += OS_FILE_LOG_BLOCK_SIZE;
+	}
+
+	return;
+}
+
+/*********************************************************************//**
+Read and parse the redo log in a given group in FOLLOW_SCAN_SIZE-sized
+chunks and updates the modified page bitmap. */
+static
+void
+log_online_follow_log_group(
+/*========================*/
+	log_group_t*	group,		/*!< in: the log group to use */
+	ib_uint64_t	contiguous_lsn)	/*!< in: the LSN of log block start
+					containing the log_parse_start_lsn */
+{
+	ib_uint64_t block_start_lsn = contiguous_lsn;
+	ib_uint64_t block_end_lsn;
+
+	log_bmp_sys->next_parse_lsn = log_bmp_sys->start_lsn;
+	log_bmp_sys->parse_buf_end = log_bmp_sys->parse_buf;
+
+	do {
+		block_end_lsn = block_start_lsn + FOLLOW_SCAN_SIZE;
+
+		log_online_follow_log_seg(group, block_start_lsn,
+					  block_end_lsn);
+
+		/* Next parse LSN can become higher than the last read LSN
+		only in the case when the read LSN falls right on the block
+		boundary, in which case next parse lsn is bumped to the actual
+		data LSN on the next (not yet read) block.  This assert is
+		slightly conservative.  */
+		ut_a(log_bmp_sys->next_parse_lsn
+		     <= block_end_lsn + LOG_BLOCK_HDR_SIZE
+		     + LOG_BLOCK_TRL_SIZE);
+
+		block_start_lsn = block_end_lsn;
+	} while (block_end_lsn < log_bmp_sys->end_lsn);
+
+	/* Assert that the last read log record is a full one */
+	ut_a(log_bmp_sys->parse_buf_end == log_bmp_sys->parse_buf);
+}
+
+/*********************************************************************//**
+Write, flush one bitmap block to disk and advance the output position if
+successful. */
+static
+void
+log_online_write_bitmap_page(
+/*=========================*/
+	const byte *block)	/*!< in: block to write */
+{
+	ibool	success;
+
+	success = os_file_write(log_bmp_sys->out_name,log_bmp_sys->out,
+				block,
+				(ulint)(log_bmp_sys->out_offset & 0xFFFFFFFF),
+				(ulint)(log_bmp_sys->out_offset << 32),
+				MODIFIED_PAGE_BLOCK_SIZE);
+	if (UNIV_UNLIKELY(!success)) {
+
+		/* The following call prints an error message */
+		os_file_get_last_error(TRUE);
+		fprintf(stderr, "InnoDB: Error: failed writing changed page "
+			"bitmap file \'%s\'\n", log_bmp_sys->out_name);
+		return;
+	}
+
+	success = os_file_flush(log_bmp_sys->out, FALSE);
+	if (UNIV_UNLIKELY(!success)) {
+
+		/* The following call prints an error message */
+		os_file_get_last_error(TRUE);
+		fprintf(stderr, "InnoDB: Error: failed flushing "
+			"changed page bitmap file \'%s\'\n",
+			log_bmp_sys->out_name);
+		return;
+	}
+
+	log_bmp_sys->out_offset += MODIFIED_PAGE_BLOCK_SIZE;
+}
+
+/*********************************************************************//**
+Append the current changed page bitmap to the bitmap file.  Clears the
+bitmap tree and recycles its nodes to the free list. */
+static
+void
+log_online_write_bitmap()
+/*=====================*/
+{
+	ib_rbt_node_t		*bmp_tree_node;
+	const ib_rbt_node_t	*last_bmp_tree_node;
+
+	bmp_tree_node = (ib_rbt_node_t *)
+		rbt_first(log_bmp_sys->modified_pages);
+	last_bmp_tree_node = rbt_last(log_bmp_sys->modified_pages);
+
+	while (bmp_tree_node) {
+
+		byte *page = rbt_value(byte, bmp_tree_node);
+
+		if (bmp_tree_node == last_bmp_tree_node) {
+			mach_write_to_4(page + MODIFIED_PAGE_IS_LAST_BLOCK, 1);
+		}
+
+		mach_write_to_8(page + MODIFIED_PAGE_START_LSN,
+				log_bmp_sys->start_lsn);
+		mach_write_to_8(page + MODIFIED_PAGE_END_LSN,
+				log_bmp_sys->end_lsn);
+		mach_write_to_4(page + MODIFIED_PAGE_BLOCK_CHECKSUM,
+				log_online_calc_checksum(page));
+
+		log_online_write_bitmap_page(page);
+
+		bmp_tree_node->left = log_bmp_sys->page_free_list;
+		log_bmp_sys->page_free_list = bmp_tree_node;
+
+		bmp_tree_node = (ib_rbt_node_t*)
+			rbt_next(log_bmp_sys->modified_pages, bmp_tree_node);
+	}
+
+	rbt_reset(log_bmp_sys->modified_pages);
+}
+
+/*********************************************************************//**
+Read and parse the redo log up to last checkpoint LSN to build the changed
+page bitmap which is then written to disk.  */
+UNIV_INTERN
+void
+log_online_follow_redo_log()
+/*========================*/
+{
+	ib_uint64_t	contiguous_start_lsn;
+	log_group_t*	group;
+
+	/* Grab the LSN of the last checkpoint, we will parse up to it */
+	mutex_enter(&(log_sys->mutex));
+	log_bmp_sys->end_lsn = log_sys->last_checkpoint_lsn;
+	mutex_exit(&(log_sys->mutex));
+
+	if (log_bmp_sys->end_lsn == log_bmp_sys->start_lsn) {
+		return;
+	}
+
+	group = UT_LIST_GET_FIRST(log_sys->log_groups);
+	ut_a(group);
+
+	contiguous_start_lsn = ut_uint64_align_down(log_bmp_sys->start_lsn,
+						    OS_FILE_LOG_BLOCK_SIZE);
+
+	while (group) {
+		log_online_follow_log_group(group, contiguous_start_lsn);
+		group = UT_LIST_GET_NEXT(log_groups, group);
+	}
+
+	/* A crash injection site that ensures last checkpoint LSN > last
+	tracked LSN, so that LSN tracking for this interval is tested. */
+	DBUG_EXECUTE_IF("crash_before_bitmap_write", DBUG_SUICIDE(););
+
+	log_online_write_bitmap();
+	log_bmp_sys->start_lsn = log_bmp_sys->end_lsn;
+	log_set_tracked_lsn(log_bmp_sys->start_lsn);
+}

=== modified file 'Percona-Server/storage/innobase/log/log0recv.c'
--- Percona-Server/storage/innobase/log/log0recv.c	2012-05-10 07:49:14 +0000
+++ Percona-Server/storage/innobase/log/log0recv.c	2012-08-22 13:19:13 +0000
@@ -850,7 +850,7 @@
 InnoDB-3.23.52 where the checksum field contains the log block number.
 @return TRUE if ok, or if the log block may be in the format of InnoDB
 version predating 3.23.52 */
-static
+UNIV_INTERN
 ibool
 log_block_checksum_is_ok_or_old_format(
 /*===================================*/
@@ -2095,7 +2095,7 @@
 /*******************************************************************//**
 Tries to parse a single log record and returns its length.
 @return	length of the record, or 0 if the record was not complete */
-static
+UNIV_INTERN
 ulint
 recv_parse_log_rec(
 /*===============*/
@@ -2166,7 +2166,7 @@
 
 /*******************************************************//**
 Calculates the new value for lsn when more data is added to the log. */
-static
+UNIV_INTERN
 ib_uint64_t
 recv_calc_lsn_on_data_add(
 /*======================*/
@@ -3562,6 +3562,8 @@
 	log_sys->archived_lsn = log_sys->lsn;
 #endif /* UNIV_LOG_ARCHIVE */
 
+	log_sys->tracked_lsn = log_sys->lsn;
+
 	log_block_init(log_sys->buf, log_sys->lsn);
 	log_block_set_first_rec_group(log_sys->buf, LOG_BLOCK_HDR_SIZE);
 

=== modified file 'Percona-Server/storage/innobase/os/os0file.c'
--- Percona-Server/storage/innobase/os/os0file.c	2012-08-07 06:10:00 +0000
+++ Percona-Server/storage/innobase/os/os0file.c	2012-08-22 13:19:13 +0000
@@ -154,6 +154,7 @@
 UNIV_INTERN mysql_pfs_key_t  innodb_file_data_key;
 UNIV_INTERN mysql_pfs_key_t  innodb_file_log_key;
 UNIV_INTERN mysql_pfs_key_t  innodb_file_temp_key;
+UNIV_INTERN mysql_pfs_key_t  innodb_file_bmp_key;
 #endif /* UNIV_PFS_IO */
 
 /** The asynchronous i/o array slot structure */
@@ -2046,6 +2047,25 @@
 #endif /* __WIN__ */
 }
 
+/***********************************************************************//**
+Truncates a file at the specified position.
+@return TRUE if success */
+UNIV_INTERN
+ibool
+os_file_set_eof_at(
+	os_file_t	file, /*!< in: handle to a file */
+	ib_uint64_t	new_len)/*!< in: new file length */
+{
+#ifdef __WIN__
+	/* TODO: untested! */
+	return(!_chsize_s(file, new_len));
+#else
+	/* TODO: works only with -D_FILE_OFFSET_BITS=64 ? */
+	return(!ftruncate(file, new_len));
+#endif
+}
+
+
 #ifndef __WIN__
 /***********************************************************************//**
 Wrapper to fsync(2) that retries the call on some errors.

=== modified file 'Percona-Server/storage/innobase/srv/srv0srv.c'
--- Percona-Server/storage/innobase/srv/srv0srv.c	2012-05-10 07:49:14 +0000
+++ Percona-Server/storage/innobase/srv/srv0srv.c	2012-08-22 13:19:13 +0000
@@ -67,6 +67,7 @@
 #include "mem0pool.h"
 #include "sync0sync.h"
 #include "que0que.h"
+#include "log0online.h"
 #include "log0recv.h"
 #include "pars0pars.h"
 #include "usr0sess.h"
@@ -176,6 +177,8 @@
 
 UNIV_INTERN ibool	srv_recovery_stats = FALSE;
 
+UNIV_INTERN my_bool	srv_track_changed_pages = TRUE;
+
 /* if TRUE, then we auto-extend the last data file */
 UNIV_INTERN ibool	srv_auto_extend_last_data_file	= FALSE;
 /* if != 0, this tells the max size auto-extending may increase the
@@ -769,6 +772,10 @@
 
 UNIV_INTERN os_event_t	srv_lock_timeout_thread_event;
 
+UNIV_INTERN os_event_t	srv_checkpoint_completed_event;
+
+UNIV_INTERN os_event_t	srv_redo_log_thread_finished_event;
+
 UNIV_INTERN srv_sys_t*	srv_sys	= NULL;
 
 /* padding to prevent other memory update hotspots from residing on
@@ -1107,6 +1114,9 @@
 
 	srv_lock_timeout_thread_event = os_event_create(NULL);
 
+	srv_checkpoint_completed_event = os_event_create(NULL);
+	srv_redo_log_thread_finished_event = os_event_create(NULL);
+
 	for (i = 0; i < SRV_MASTER + 1; i++) {
 		srv_n_threads_active[i] = 0;
 		srv_n_threads[i] = 0;
@@ -3031,6 +3041,46 @@
         }
 }
 
+/******************************************************************//**
+A thread which follows the redo log and outputs the changed page bitmap.
+@return a dummy value */
+os_thread_ret_t
+srv_redo_log_follow_thread(
+/*=======================*/
+	void*	arg __attribute__((unused)))	/*!< in: a dummy parameter
+						     required by
+						     os_thread_create */
+{
+#ifdef UNIV_DEBUG_THREAD_CREATION
+	fprintf(stderr, "Redo log follower thread starts, id %lu\n",
+		os_thread_pf(os_thread_get_curr_id()));
+#endif
+
+#ifdef UNIV_PFS_THREAD
+	pfs_register_thread(srv_log_tracking_thread_key);
+#endif
+
+	my_thread_init();
+
+	do {
+		os_event_wait(srv_checkpoint_completed_event);
+		os_event_reset(srv_checkpoint_completed_event);
+
+		if (srv_shutdown_state < SRV_SHUTDOWN_LAST_PHASE) {
+			log_online_follow_redo_log();
+		}
+
+	} while (srv_shutdown_state < SRV_SHUTDOWN_LAST_PHASE);
+
+	log_online_read_shutdown();
+	os_event_set(srv_redo_log_thread_finished_event);
+
+	my_thread_end();
+	os_thread_exit(NULL);
+
+	OS_THREAD_DUMMY_RETURN;
+}
+
 /*******************************************************************//**
 Tells the InnoDB server that there has been activity in the database
 and wakes up the master thread if it is suspended (not sleeping). Used

=== modified file 'Percona-Server/storage/innobase/srv/srv0start.c'
--- Percona-Server/storage/innobase/srv/srv0start.c	2012-06-05 10:36:15 +0000
+++ Percona-Server/storage/innobase/srv/srv0start.c	2012-08-22 13:19:13 +0000
@@ -51,6 +51,7 @@
 #include "rem0rec.h"
 #include "mtr0mtr.h"
 #include "log0log.h"
+#include "log0online.h"
 #include "log0recv.h"
 #include "page0page.h"
 #include "page0cur.h"
@@ -121,9 +122,9 @@
 static os_file_t	files[1000];
 
 /** io_handler_thread parameters for thread identification */
-static ulint		n[SRV_MAX_N_IO_THREADS + 7];
+static ulint		n[SRV_MAX_N_IO_THREADS + 8];
 /** io_handler_thread identifiers */
-static os_thread_id_t	thread_ids[SRV_MAX_N_IO_THREADS + 7];
+static os_thread_id_t	thread_ids[SRV_MAX_N_IO_THREADS + 8];
 
 /** We use this mutex to test the return value of pthread_mutex_trylock
    on successful locking. HP-UX does NOT return 0, though Linux et al do. */
@@ -145,6 +146,7 @@
 UNIV_INTERN mysql_pfs_key_t	srv_monitor_thread_key;
 UNIV_INTERN mysql_pfs_key_t	srv_master_thread_key;
 UNIV_INTERN mysql_pfs_key_t	srv_purge_thread_key;
+UNIV_INTERN mysql_pfs_key_t	srv_log_tracking_thread_key;
 #endif /* UNIV_PFS_THREAD */
 
 /*********************************************************************//**
@@ -2034,6 +2036,19 @@
 	if (srv_auto_lru_dump && srv_blocking_lru_restore)
 		buf_LRU_file_restore();
 
+	if (srv_track_changed_pages) {
+
+		/* Initialize the log tracking subsystem here to block
+		server startup until it's completed due to the potential
+		need to re-read previous server run's log. */
+		log_online_read_init();
+
+		/* Create the thread that follows the redo log to output the
+		changed page bitmap */
+		os_thread_create(&srv_redo_log_follow_thread, NULL,
+				 thread_ids + 6 + SRV_MAX_N_IO_THREADS);
+	}
+
 	srv_is_being_started = FALSE;
 
 	err = dict_create_or_check_foreign_constraint_tables();

=== modified file 'Percona-Server/storage/innobase/ut/ut0rbt.c'
--- Percona-Server/storage/innobase/ut/ut0rbt.c	2010-04-19 15:44:15 +0000
+++ Percona-Server/storage/innobase/ut/ut0rbt.c	2012-08-22 13:19:13 +0000
@@ -55,7 +55,6 @@
 #endif
 
 #define ROOT(t)		(t->root->left)
-#define	SIZEOF_NODE(t)	((sizeof(ib_rbt_node_t) + t->sizeof_value) - 1)
 
 /**********************************************************************//**
 Print out the sub-tree recursively. */
@@ -834,6 +833,21 @@
 	node = (ib_rbt_node_t*) ut_malloc(SIZEOF_NODE(tree));
 
 	memcpy(node->value, value, tree->sizeof_value);
+	return(rbt_add_preallocated_node(tree, parent, node));
+}
+
+/****************************************************************//**
+Add a new caller-provided node to tree at the specified position.
+The node must have its key fields initialized correctly.
+@return added node */
+UNIV_INTERN
+const ib_rbt_node_t*
+rbt_add_preallocated_node(
+/*======================*/
+	ib_rbt_t*	tree,			/*!< in: rb tree */
+	ib_rbt_bound_t*	parent,			/*!< in: parent */
+	ib_rbt_node_t*	node)			/*!< in: node */
+{
 	node->parent = node->left = node->right = tree->nil;
 
 	/* If tree is empty */
@@ -842,7 +856,7 @@
 	}
 
 	/* Append the node, the hope here is that the caller knows
-	what s/he is doing. */
+	   what s/he is doing. */
 	rbt_tree_add_child(tree, parent, node);
 	rbt_balance_tree(tree, node);
 
@@ -854,6 +868,7 @@
 	return(node);
 }
 
+
 /**********************************************************************//**
 Find a matching node in the rb tree.
 @return	NULL if not found else the node where key was found */
@@ -1142,7 +1157,17 @@
 	ib_rbt_t*	tree)			/*!< in: rb tree */
 {
 	rbt_free_node(ROOT(tree), tree->nil);
+	rbt_reset(tree);
+}
 
+/****************************************************************//**
+Clear the tree without deleting and freeing its nodes. */
+UNIV_INTERN
+void
+rbt_reset(
+/*======*/
+	ib_rbt_t*	tree)			/*!< in: rb tree */
+{
 	tree->n_nodes = 0;
 	tree->root->left = tree->root->right = tree->nil;
 }

=== removed directory 'doc'
=== removed file 'doc/Makefile'
--- doc/Makefile	2012-08-22 13:19:13 +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 "  offhtml    to make standalone HTML files without fetching fresh percona-them 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 "  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.5
-	@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."

=== removed file 'doc/make.bat'
--- doc/make.bat	2011-09-20 07:03:00 +0000
+++ doc/make.bat	1970-01-01 00:00:00 +0000
@@ -1,170 +0,0 @@
-@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

=== removed directory 'doc/source'
=== removed directory 'doc/source/_static'
=== removed directory 'doc/source/_templates'
=== removed file 'doc/source/compatibility.rst'
--- doc/source/compatibility.rst	2012-02-24 09:51:35 +0000
+++ doc/source/compatibility.rst	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-.. _compatibility: 
-
-==============================================================
-Options that make XtraDB tablespaces not compatible with MySQL
-==============================================================
-
-Fast checksums
-==============
-
-Enabling :variable:`innodb_fast_checksum` will use more CPU-efficient algorithm, based on 4-byte words which can be beneficial for some workloads. Once enabled, turning it off will require table to be dump/imported again, since |Percona Server| will fail to start on data files created when :variable:`innodb_fast_checksums` was enabled.
-
-In case you've migrated from |Percona Server| to |MySQL| you could get the "corrupted checksum" error message. In order to recover that table you'll need to:
-
-  1) Reinstall Percona Server to read your tables that were created with fast checksums. 
-  2) Dump the tables (or temporarily convert them to MyISAM). 
-  3) Install stock MySQL (or at least disable fast checksums). 
-  4) Restore the InnoDB tables (or convert back from MyISAM). 
-
-Page sizes other than 16KiB
-===========================
-
-This is controlled by variable :variable:`innodb_page_size`. Changing the page size for an existing database is not supported. Table will need to be dumped/imported again if compatibility with |MySQL| is required.
-
-Relocation of the doublewrite buffer
-====================================
-
-Variable :variable:`innodb_doublewrite_file` provides an option to put the buffer on a dedicated disk in order to parallelize I/O activity on the buffer and on the tablespace. Only in case of crash recovery this variable cannot be changed, in all other cases it can be turned on/off without breaking the compatibility. 

=== removed file 'doc/source/conf.py'
--- doc/source/conf.py	2012-08-22 13:19:13 +0000
+++ doc/source/conf.py	1970-01-01 00:00:00 +0000
@@ -1,268 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Percona Server documentation build configuration file, created by
-# sphinx-quickstart on Mon Aug  8 01:24:46 2011.
-#
-# This file is execfile()d with the current directory set to its containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys, os
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
-
-sys.path.append(os.path.abspath('ext'))
-
-# -- General configuration -----------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.todo', 
-              'sphinx.ext.coverage', 'sphinx.ext.ifconfig', 
-              'sphinx.ext.extlinks', 'psdom']
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix of source filenames.
-source_suffix = '.rst'
-
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = 'index'
-
-# General information about the project.
-project = u'Percona Server'
-copyright = u'2011-2012, Percona Inc'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = '5.5'
-# The full version, including alpha/beta/rc tags.
-release = '5.5.25a-27.1'
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#language = None
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = []
-
-# The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
-
-primary_domain = 'psdom'
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-rst_prolog = '''
-.. |check|  replace:: ``|[[---CHECK---]]|``
-
-.. |xtrabackup|  replace:: :program:`xtrabackup`
-
-.. |innobackupex|  replace:: :program:`innobackupex`
-
-.. |XtraDB|  replace:: *XtraDB*
-
-.. |Jenkins|  replace:: :term:`Jenkins`
-
-.. |InnoDB|  replace:: *InnoDB*
-
-.. |MyISAM|  replace:: *MyISAM*
-
-.. |LSN|  replace:: *LSN*
-
-.. |XtraBackup|  replace:: *XtraBackup*
-
-.. |Percona Server|  replace:: *Percona Server*
-
-.. |Percona|  replace:: *Percona*
-
-.. |MySQL|  replace:: *MySQL*
-
-.. |Drizzle|  replace:: *Drizzle*
-
-.. |MariaDB|  replace:: *MariaDB*
-
-.. |tar4ibd|  replace:: :program:`tar4ibd`
-
-.. |tar|  replace:: :program:`tar`
-
-'''
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-extlinks = {'bug': ('https://bugs.launchpad.net/percona-server/+bug/%s',
-                      '#')}
-
-
-# -- Options for HTML output ---------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-html_theme = 'percona-theme'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-html_theme_path = ['.', './percona-theme']
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-html_title = 'Percona Server 5.5 Documentation'
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-html_short_title = 'Percona Server 5.5'
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-html_logo = 'percona-server-logo.jpg'
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'PerconaServer55doc'
-
-
-# -- Options for LaTeX output --------------------------------------------------
-
-# The paper size ('letter' or 'a4').
-#latex_paper_size = 'letter'
-
-# The font size ('10pt', '11pt' or '12pt').
-#latex_font_size = '10pt'
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [
-  ('index', 'PerconaServer-5.5.tex', u'Percona Server Documentation',
-   u'Percona Inc', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Additional stuff for the LaTeX preamble.
-#latex_preamble = ''
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output --------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    ('index', 'perconaserver55', u'Percona Server 5.5 Documentation',
-     [u'Percona Inc'], 1)
-]
-
-
-# Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {
-    'ps51' : ('http://www.percona.com/doc/percona-server/5.1/', None),
-    'xtrabackup' : ('http://www.percona.com/doc/percona-xtrabackup', None),
-    'ptoolkit' : ('http://www.percona.com/doc/percona-toolkit/2.0/', None)
- }

=== removed file 'doc/source/development.rst'
--- doc/source/development.rst	2012-01-27 08:36:38 +0000
+++ doc/source/development.rst	1970-01-01 00:00:00 +0000
@@ -1,266 +0,0 @@
-=============================
-Development of Percona Server
-=============================
-
-|Percona Server| is an open source project to produce a distribution
-of the |MySQL| server with improved performance, scalability and
-diagnostics.
-
-Submitting Changes
-==================
-This process is very much modeled on what is being used by
-`Drizzle <http://www.drizzle.org>`_. The Drizzle project went through
-several iterations and refinements before settling on this process. It
-has been found to both keep trunk in a constant state of stability
-(allowing for a release at any time) and minimizing wasted time by
-developers due to broken code from somebody else interfering with their day.
-
-You should also be familiar with our |Jenkins| setup.
-
-Overview
-~~~~~~~~
-At Percona we use `Bazaar <http://www.bazaar-vcs.org>`_ for source
-control and `launchpad <http://www.launchpad.net>`_ for both
-code hosting and release management.
-
-Changes to our software projects could be because of a new feature
-(blueprint) or fixing a bug (bug). Projects such as refactoring could
-be classed as a blueprint or a bug depending on the scope of the work.
-
-Blueprints and bugs are targeted to specific milestones (releases). A
-milestone is part of a series - e.g. 1.6 is a series in Percona
-XtraBackup and 1.6.1, 1.6.2 and 1.6.3 are milestones in the 1.6 series.
-
-Code is proposed for merging in the form of merge requests on launchpad.
-
-Some software (such as Percona Xtrabackup) we maintain both a
-development branch and a stable branch. For example: Xtrabackup 1.6 is
-the current stable series, and changes that should make it into bugfix
-releases of 1.6 should be proposed for the 1.6 tree. However, most new
-features or more invasive (or smaller) bug fixes should be targeted to
-the next release, currently 1.7. If submitting something to 1.6, you
-should also propose a branch that has these changes merged to the
-development release (1.7). This way somebody else doesn't have to
-attempt to merge your code and we get to run any extra tests that may
-be in the tree (and check compatibility with all platforms).
-
-For Percona Server, we have two current bzr branches on which
-development occurs: 5.1 and 5.5. As Percona Server is not a
-traditional project, instead being a set of patches against an
-existing product, these two branches are not related. That is, we do
-not merge from one to the other. To have your changes in both, you
-must propose two branches: one for 5.1 version of patch and one for
-5.5.
-
-Making a change to a project
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-In this case we're going to use percona-xtrabackup as an
-example. workflow is similar for Percona Server, but patch will need
-to be modified both in 5.1 and 5.5 branches.
-
-* ``bzr branch lp:percona-xtrabackup featureX`` (where 'featureX' is a
-  sensible name for the task at hand)
-* (developer makes changes in featureX, testing locally)
-* Developer pushes to ``lp:~username/percona-xtrabackup/featureX``
-* When the developer thinks the branch may be ready to be merged, they
-  will run the branch through param build.
-* If there are any build or test failures, developer fixes them (in
-  the case of failing tests in trunk... no more tests should
-  fail. Eventually all tests will pass in trunk)
-* Developer can then submit a merge proposal to lp:percona-xtrabackup,
-  referencing URL for the param build showing that build and test
-  passes
-* Code undergoes review
-* Once code is accepted, it can be merged (see other section)
-
-If the change also applies to a stable release (e.g. 1.6) then changes
-should be made on a branch of 1.6 and merged to a branch of trunk. In
-this case there should be two branches run through param build and two
-merge proposals (one for 1.6 and one with the changes merged to
-trunk). This prevents somebody else having to guess how to merge your
-changes.
-
-Merging approved branches
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Before code hits trunk, it goes through a "staging" branch, where some
-extra tests may be run (e.g. valgrind) along with testing that all
-branches behave well together (build and test) before pushing to
-trunk.
-
-To ensure quality, **DO NOT push directly to trunk!** everything must go through adequate testing first. This ensures that at any point trunk is in a releasable state.
-
-Please note that **ALL changes must go through staging first** This is to ensure that several approved merge requests do not interact badly with each
-other.
-
-* Merge captain (for lack of a better term for the person merging
-  approved code into trunk) may collate several approved branches that
-  have individually passed param-build as run by the original
-  developers.
-
-  * Workflow would look something like this:
-
-    * ``bzr branch lp:percona-xtrabackup staging``
-    * ``bzr merge lp:~user/percona-xtrabackup/featureX``
-    * ``bzr commit -m "merge feature X"``
-    * ``bzr merge lp:~user/percona-xtrabackup/featureY``
-    * ``bzr commit -m "merge feature Y"``
-    * ``bzr push --overwrite lp:percona-xtrabackup/staging'``
-    * Run ``lp:percona-xtrabackup/staging`` through param build (in
-      future, we'll likely have a Jenkins job specifically for this)
-    * If build succeeds, ``bzr push lp:percona-server`` (and branches
-      will be automatically marked as 'merged'.. although bug reports
-      will need to be manually changed to 'Fix Released')
-    * If build or test fails, attempt to find which branch may be the
-      cause, and repeat process but without that branch.
-
-* Any failing branch will be set to 'Work in Progress' with a 'Needs
-  fixing' review with the URL of the build in jenkins where the
-  failure occured. This will allow developers to fix their code.
-
-Resubmitting a merge request
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-In the event of a merge request being marked as 'Work In Progress' due
-to build/test failures when merging, the developer should fix up the
-branch, run through param build and then 'Resubmit' the merge
-proposal.
-
-There is a link on launchpad to resubmit the merge proposal, this means it appears in the list of merge requests to review again rather than off in the "work in progress" section.
-
-
-Percona Server
-~~~~~~~~~~~~~~
-
-The same process for Percona Server, but we have different branches (and merge requests) for 5.1 and 5.5 series.
-
-Upgrading MySQL base version
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* Same process as other modifications.
-* create local branch
-* make changes
-* param build
-* merge request
-
-We will need some human processes to ensure that we do not merge extra
-things during the time when base MySQL version is being updated to
-avoid making life harder for the person doing the update.
-
-
-
-Making a release
-================
-
-* ``bzr branch lp:project release-project-VERSION``
-* build packages
-* perform any final tests (as we transition, this will already have
-  been done by jenkins)
-* ``bzr tag project-version``
-* merge request back to lp:project including the tag (TODO: write
-  exact bzr commands for this)
-
-This way anybody can easily check out an old release by just using bzr
-to branch the specific tag.
-
-Jenkins
-=======
-
-Our Jenkins instance uses a mixture of VMs on physical hosts that
-Percona runs and Virtual Machines in Amazon EC2 that are launched on
-demand.
-
-Basic Concepts
-~~~~~~~~~~~~~~
-We have some jobs that are activated based on source control changes
-(new commits in a bzr repository). We have some that are "param
-build" - that is, a user specifies parameters for the build (e.g. the
-bzr tree). A param-build allows developers to ensure their branch
-compiles and passes tests on all supported platforms *before*
-submitting a merge request. This helps us maintain the quality of the
-main bzr branches and not block other developers work.
-
-Jenkins is a Master/Slave system and the jenkins master schedules the
-builds across available machines (and may launch new VMs in EC2 to
-meet demand).
-
-Most of our jobs are what's known as "matrix builds". That is, a job
-that will be run with several different configurations of the project
-(e.g. release, debug) across several platforms (e.g. on a host
-matching the label of "centos5-32" and a host matching label of
-"ubuntu-natty-32bit"). Matrix builds show a table of lights to
-indicate their status. Clicking "build now" on one of these queues up
-builds for all of the combinations.
-
-We have some integration of our regression test suites (currently
-xtrabackup) with Jenkins ability to parse JUnitXML, presenting a nice
-user interface to any test failures.
-
-Because building some projects is non-trivial, in order to not
-duplicate the list of compile instructions for each job, we use
-template builds. You'll see builds such as percona-xtrabackup-template
-which is a disabled job, but all current xtrabackup jobs point to it
-for the commands to build and run the test suite.
-
-Percona Xtrabackup
-~~~~~~~~~~~~~~~~~~
-
-`<http://jenkins.percona.com/view/Percona%20Xtrabackup/>`_
-
-We currently build both xtrabackup 1.6 and xtrabackup trunk (will become 1.7).
-
-There are param-builds for 1.6 and trunk too. These should be run for each merge request (and before any collection of merged branches is pushed to trunk)
-
-Percona Server
-~~~~~~~~~~~~~~
-
-We have separate jobs for Percona Server 5.1 and Percona Server 5.5 due to the different build systems that MySQL 5.1 and 5.5 use.
-
-The ``mysql-test-run.pl`` test suite is integrated with Jenkins through `subunit <http://launchpad.net/subunit>`_ and ``subunit2junitxml`` allowing us to easily see which tests passed/failed on any particular test run.
-
-Percona Server 5.1
-------------------
-
-`<http://jenkins.percona.com/view/Percona%20Server%205.1/>`_
-
-We have trunk and param jobs. We also have a valgrind job that will run after a successful trunk build.
-
-Percona Server 5.5
-------------------
-
-`<http://jenkins.percona.com/view/Percona%20Server%205.5/>`_
-
-Similar to 5.1, but for PS5.5 instead.
-
-MySQL Builds
-~~~~~~~~~~~~
-
-`<http://jenkins.percona.com/view/MySQL/>`_
-
-I've set up a few jobs in Jenkins that should help us predict the future
-for Percona Server. Namely, if upstream MySQL may cause us any problems.
-
-I wanted to see if some test failures were possibly upstream, so I set
-up two jobs:
-
-`<http://jenkins.percona.com/view/MySQL/job/mysql-5.1-url-param/>`_
-`<http://jenkins.percona.com/view/MySQL/job/mysql-5.5-url-param/>`_
-
-both of which ask for a URL to a MySQL source tarball and then do a full
-build and test across the platforms we have in jenkins.
-
-But my next thought was that we could try and do this *before* the
-source tarballs come out - hopefully then being able to have MySQL
-release source tarballs that do in fact pass build and test everywhere
-where we're wanting to support Percona Server.
-
-`<http://jenkins.percona.com/view/MySQL/job/mysql-5.1-trunk/>`_
-`<http://jenkins.percona.com/view/MySQL/job/mysql-5.5-trunk/>`_
-
-are scheduled to just try once per week (we can change the frequency if
-we want to) to build and test from the MySQL bzr trees.
-
-I also have a valgrind build (same configuration as for Percona Server) to help us see if there's any new valgrind warnings (or missed suppressions).
-
-I'm hoping that these jobs will help us catch any future problems before
-they become our problem. (e.g. we can easily see that the sporadic test failures we see in Percona Server are actually in upstream MySQL).

=== removed directory 'doc/source/diagnostics'
=== removed file 'doc/source/diagnostics/index_info_schema_tables.rst'
--- doc/source/diagnostics/index_info_schema_tables.rst	2011-10-07 23:38:41 +0000
+++ doc/source/diagnostics/index_info_schema_tables.rst	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-.. _index_info_schema_tables:
-
-========================================
- Index of ``INFORMATION_SCHEMA`` Tables
-========================================
-
-This is a list of the ``INFORMATION_SCHEMA TABLES`` that exist in |Percona Server| with |XtraDB|. The entry for each table points to the page in the documentation where it's described.
-
-  * :table:`GLOBAL_TEMPORARY_TABLES`
-
-  * :table:`INNODB_CMP`
-
-  * :table:`INNODB_CMP_RESET`
-
-  * :table:`INNODB_CMPMEM`
-
-  * :table:`INNODB_CMPMEM_RESET`
-
-  * :table:`INNODB_INDEX_STATS`
-
-  * :table:`INNODB_LOCK_WAITS`
-
-  * :table:`INNODB_LOCKS`
-
-  * :table:`INNODB_RSEG`
-
-  * :table:`INNODB_TABLE_STATS`
-
-  * :table:`INNODB_TRX`
-
-  * :table:`PROCESSLIST`
-
-  * :table:`QUERY_RESPONSE_TIME`
-
-  * :table:`TEMPORARY_TABLES`
-
-

=== removed file 'doc/source/diagnostics/innodb_deadlock_count.rst'
--- doc/source/diagnostics/innodb_deadlock_count.rst	2012-07-18 06:25:14 +0000
+++ doc/source/diagnostics/innodb_deadlock_count.rst	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-.. _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 ENGINE 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/>`_
-

=== removed file 'doc/source/diagnostics/innodb_show_lock_names.rst'
--- doc/source/diagnostics/innodb_show_lock_names.rst	2011-10-07 23:38:41 +0000
+++ doc/source/diagnostics/innodb_show_lock_names.rst	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-.. _innodb_show_lock_names:
-
-=================
- Show Lock Names
-=================
-
-This feature is curently undocumented except for the following example.
-
-Example: ::
-
-  mysql> show mutex status;
-  +--------+---------------------------+---------------+
-  | 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  |
-  .....

=== removed file 'doc/source/diagnostics/innodb_show_status.rst'
--- doc/source/diagnostics/innodb_show_status.rst	2012-07-18 06:25:14 +0000
+++ doc/source/diagnostics/innodb_show_status.rst	1970-01-01 00:00:00 +0000
@@ -1,475 +0,0 @@
-.. _innodb_show_status:
-
-======================
- Show |InnoDB| Status
-======================
-
-This feature reorganizes the output of ``SHOW ENGINE 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 ENGINE 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 ENGINE 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 ENGINE 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 ENGINE 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 ENGINE INNODB STATUS``.
-
-
-Status Variables
-================
-
-The status variables here contain information available in the output of ``SHOW ENGINE INNODB STATUS``, organized by the sections ``SHOW ENGINE INNODB STATUS`` displays. If you are familiar with the output of ``SHOW ENGINE 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 ENGINE 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 ENGINE 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 ENGINE 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 ENGINE 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 ENGINE 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 ENGINE 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 engine 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/>`_

=== removed file 'doc/source/diagnostics/innodb_stats.rst'
--- doc/source/diagnostics/innodb_stats.rst	2012-06-19 13:40:59 +0000
+++ doc/source/diagnostics/innodb_stats.rst	1970-01-01 00:00:00 +0000
@@ -1,157 +0,0 @@
-.. _innodb_stats:
-
-=====================
- |InnoDB| Statistics
-=====================
-
-This feature provides new startup options (control method and collection of index statistics estimation) and information schema views to confirm the statistics.
-
-This implements the fix for `MySQL Bug #30423 <http://bugs.mysql.com/bug.php?id=30423>`_.
-
-Version Specific Information
-============================
-
-  * 5.5.8-20.0:
-    Renamed three fields in table ``INNODB_INDEX_STATS``.
-
-
-System Variables
-================
-
-Four new system variables were introduced by this feature.
-
-.. variable:: innodb_stats_method
-
-   :cli: YES
-   :configfile: YES
-   :scope: GLOBAL
-   :dyn: YES
-   :type: STRING
-   :default: ``nulls_equal``
-   :allowed: ``nulls_equal``, ``nulls_unequal``, ``nulls_ignored``
-
-The values and meanings are almost same to ``myisam_stats_method`` option of native |MySQL| (``nulls_equal``, ``nulls_unequal``, ``nulls_ignored``). But |InnoDB| doesn't have several patterns of statistics currently. So, though this option able to be changed dynamically, we need re-calculate statistics to change the method for the table.
-
-(reference: `MyISAM Index Statistics Collection <http://dev.mysql.com/doc/refman/5.1/en/myisam-index-statistics.html>`_)
-
-**Note:** Beginning in release 5.1.56-12.7, a variable with the same and functionality was implemented in the upstream |InnoDB|.
-
-.. variable:: innodb_stats_auto_update
-
-   :type: BOOLEAN
-   :default: 1
-
-|InnoDB| updates the each index statistics automatically (many updates were done, some information_schema is accessed, table monitor, etc.). Setting this option 0 can stop these automatic recalculation of the statistics except for “first open” and “ANALYZE TABLE command”.
-
-
-.. variable:: innodb_stats_update_need_lock
-
-   :type: BOOLEAN
-   :default: 1
-
-If you meet contention of ``&dict_operation_lock``, setting 0 reduces the contention. But 0 disables to update ``Data_free:`` of ``SHOW TABLE STATUS``.
-
-
-.. variable:: innodb_use_sys_stats_table
-
-   :type: BOOLEAN
-   :default: 0
-
-
-If this option is enabled, |XtraDB| uses the ``SYS_STATS`` system table to store statistics of table indexes. Also, when |InnoDB| opens a table for the first time, it loads the statistics from ``SYS_STATS`` instead of sampling index pages. If you use a high ``stats_sample_pages`` value, the first open of a table is expensive. In such a case, this option will help. Intended behavior is to never update statistics unless an explicit ``ANALYZE TABLE`` is issued.
-
-INFORMATION_SCHEMA Tables
-=========================
-
-Two new tables were introduced by this feature.
-
-.. table:: INFORMATION_SCHEMA.INNODB_TABLE_STATS
-
-   Shows table statistics information of dictionary cached.
-
-   :column table_schema: Database name of the table.
-   :column table_name: Table name.
-   :column rows: estimated number of all rows.
-   :column clust_size: cluster index (table/primary key) size in number of pages.
-   :column other_size: Other index (non primary key) size in number of pages.
-   :column modified: Internal counter to judge whether statistics recalculation should be done.
-
-If the value of modified column exceeds “rows / 16” or 2000000000, the statistics recalculation is done when ``innodb_stats_auto_update == 1``. We can estimate the oldness of the statistics by this value.
-
-.. table:: INFORMATION_SCHEMA.INNODB_INDEX_STATS
-
-   Shows index statistics information of dictionary cached.
-
-   :column table_schema: Database name of the table.
-   :column table_name: Table name.
-   :column index_name: Index name.
-   :column fields: How many fields the index key has. (it is internal structure of |InnoDB|, it may be larger than the ``CREATE TABLE``).
-   :column rows_per_key: Estimate rows per 1 key value. ([1 column value], [2 columns value], [3 columns value], ...).
-   :column index_total_pages: Number of index pages.
-   :column index_leaf_pages: Number of leaf pages.
-
-In releases before 5.5.8-20.0, these fields had different names:
-
-  * ``rows_per_key`` was ``row_per_keys``
-
-  * ``index_total_pages`` was ``index_size``
-
-  * ``index_leaf_pages`` was ``leaf_pages``
-
-Example
-=======
-
-This example uses the same data to Bug #30423 of |MySQL|.
-
-``[innodb_stats_method = nulls_equal (default behavior of |InnoDB|)]`` ::
-
-  mysql> explain SELECT COUNT(*), 0 FROM orgs2 orgs LEFT JOIN sa_opportunities2 sa_opportunities ON orgs.org_id=sa_opportunities.org_id LEFT JOIN contacts2 contacts ON orgs.org_id=contacts.org_id;
-  +----+-------------+------------------+-------+-----------------+-----------------+---------+-------------------+-------+-------------+
-  | id | select_type | table            | type  | possible_keys   | key             | key_len | ref               | rows  | Extra       |
-  +----+-------------+------------------+-------+-----------------+-----------------+---------+-------------------+-------+-------------+
-  |  1 | SIMPLE      | orgs             | index | NULL            | orgs$org_id     | 4       | NULL              |   128 | Using index |
-  |  1 | SIMPLE      | sa_opportunities | ref   | sa_opp$org_id   | sa_opp$org_id   | 5       | test2.orgs.org_id |  5751 | Using index |
-  |  1 | SIMPLE      | contacts         | ref   | contacts$org_id | contacts$org_id | 5       | test2.orgs.org_id | 23756 | Using index |
-  +----+-------------+------------------+-------+-----------------+-----------------+---------+-------------------+-------+-------------+
-  3 rows in set (0.00 sec)
-
-``[innodb_stats_method = nulls_unequal or nulls_ignored]`` ::
-
-  mysql> explain SELECT COUNT(*), 0 FROM orgs2 orgs LEFT JOIN sa_opportunities2 sa_opportunities ON orgs.org_id=sa_opportunities.org_id LEFT JOIN contacts2 contacts ON orgs.org_id=contacts.org_id;
-  +----+-------------+------------------+-------+-----------------+-----------------+---------+-------------------+------+-------------+
-  | id | select_type | table            | type  | possible_keys   | key             | key_len | ref               | rows | Extra       |
-  +----+-------------+------------------+-------+-----------------+-----------------+---------+-------------------+------+-------------+
-  |  1 | SIMPLE      | orgs             | index | NULL            | orgs$org_id     | 4       | NULL              |  128 | Using index |
-  |  1 | SIMPLE      | sa_opportunities | ref   | sa_opp$org_id   | sa_opp$org_id   | 5       | test2.orgs.org_id |    1 | Using index |
-  |  1 | SIMPLE      | contacts         | ref   | contacts$org_id | contacts$org_id | 5       | test2.orgs.org_id |    1 | Using index |
-  +----+-------------+------------------+-------+-----------------+-----------------+---------+-------------------+------+-------------+
-  3 rows in set (0.00 sec)
-  <example of information_schema>
-
-  mysql> select * from information_schema.innodb_table_stats;
-  +------------------------+-------+------------+------------+----------+
-  | table_name             | rows  | clust_size | other_size | modified |
-  +------------------------+-------+------------+------------+----------+
-  | test/sa_opportunities2 | 11175 |         21 |         11 |        0 |
-  | test/orgs2             |   128 |          1 |          0 |        0 |
-  | test/contacts2         | 47021 |         97 |         97 |        0 |
-  +------------------------+-------+------------+------------+----------+
-  3 rows in set (0.00 sec)
-
-  mysql> select * from information_schema.innodb_index_stats;
-  +------------------------+-----------------+--------+--------------+------------+------------+
-  | table_name             | index_name      | fields | row_per_keys | index_size | leaf_pages |
-  +------------------------+-----------------+--------+--------------+------------+------------+
-  | test/sa_opportunities2 | GEN_CLUST_INDEX |      1 | 1            |         21 |         20 |
-  | test/sa_opportunities2 | sa_opp$org_id   |      2 | 338, 1       |         11|         10 |
-  | test/orgs2             | orgs$org_id     |      1 | 1            |          1 |          1 |
-  | test/contacts2         | GEN_CLUST_INDEX |      1 | 1            |       97   |         80 |
-  | test/contacts2         | contacts$org_id |      2 | 516, 0       |         97   |         37 |
-  +------------------------+-----------------+--------+--------------+------------+------------+
-  5 rows in set (0.00 sec)
-
-Other reading
-=============
-
-  * `InnoDB Table/Index stats <http://www.mysqlperformanceblog.com/2010/03/20/|InnoDB|-tableindex-stats/>`_
-

=== removed file 'doc/source/diagnostics/misc_info_schema_tables.rst'
--- doc/source/diagnostics/misc_info_schema_tables.rst	2012-03-12 08:04:08 +0000
+++ doc/source/diagnostics/misc_info_schema_tables.rst	1970-01-01 00:00:00 +0000
@@ -1,135 +0,0 @@
-.. _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.
-
-Compressed pages in |InnoDB| tables
-===================================
-
-These tables hold information on compression and uncompression operations. Their contents is identical, but any read from :table:`INNODB_CMP_RESET` will reset all statistics on compression/uncompression.
-
-These tables were introduced by the |InnoDB| plugin and you can find the full documentation here.
-
-.. table:: INFORMATION_SCHEMA.INNODB_CMP
-
-   :column PAGE_SIZE: Page size for compressed pages (Bytes)
-   :column COMPRESS_OPS: Number of compression operations
-   :column COMPRESS_OPS_OK: Number of successful compression operations
-   :column COMPRESS_TIME: Time spent to compress pages (seconds)
-   :column UNCOMPRESS_OPS: Number of uncompression operations
-   :column UNCOMPRESS_TIME: Time spent to uncompress pages (seconds)
-
-.. table:: INFORMATION_SCHEMA.INNODB_CMP_RESET
-
-   :column PAGE_SIZE: Page size for compressed pages (Bytes)
-   :column COMPRESS_OPS: Number of compression operations
-   :column COMPRESS_OPS_OK: Number of successful compression operations
-   :column COMPRESS_TIME: Time spent to compress pages (seconds)
-   :column UNCOMPRESS_OPS: Number of uncompression operations
-   :column UNCOMPRESS_TIME: Time spent to uncompress pages (seconds)
-
-Compressed pages in |InnoDB| buffer pool
-========================================
-
-These tables hold information on compressed pages stored in memory in the buffer pool. Their contents is identical, but any read from INNODB_CMPMEM_RESET will reset all statistics on relocation operations.
-
-These tables were introduced by the |InnoDB| plugin and you can find the full documentation here.
-
-
-.. table:: INFORMATION_SCHEMA.INNODB_CMPMEM
-
-   :column PAGE_SIZE: Page size for compressed pages (Bytes)
-   :column PAGES_USED: Number of pages in use
-   :column PAGES_FREE: Number of free pages
-   :column RELOCATION_OPS: Number of relocation operations
-   :column RELOCATION_TIME: Time spent to relocate pages (Microseconds)
-
-.. table:: INFORMATION_SCHEMA.INNODB_CMPMEM_RESET
-
-   :column PAGE_SIZE: Page size for compressed pages (Bytes)
-   :column PAGES_USED: Number of pages in use
-   :column PAGES_FREE: Number of free pages
-   :column RELOCATION_OPS: Number of relocation operations
-   :column RELOCATION_TIME: Time spent to relocate pages (Microseconds)
-
-|InnoDB| transactions
-=====================
-
-.. table:: INFORMATION_SCHEMA.INNODB_LOCK_WAITS
-
-   :column REQUESTING_TRX_ID:
-   :column REQUESTED_LOCK_ID:
-   :column BLOCKING_TRX_ID:
-   :column BLOCKING_LOCK_ID:
-
-.. table:: INFORMATION_SCHEMA.INNODB_LOCKS
-
-   :column LOCK_ID:  Internal unique lock ID
-   :column LOCK_TRX_ID: ID of the transaction holding the lock
-   :column LOCK_MODE: Mode of the lock (shared, exclusive, …)
-   :column LOCK_TYPE: ``RECORD`` for a record lock and ``TABLE`` for a table lock
-   :column LOCK_TABLE: Name of the table holding the lock
-   :column LOCK_INDEX: If lock type is ``RECORD``, name of the index
-   :column LOCK_SPACE: If lock type is ``RECORD``, tablespace id of the locked record
-   :column LOCK_PAGE: If lock type is ``RECORD``, page number of the locked record
-   :column LOCK_REC: If lock type is ``RECORD``, heap number of the locked record
-   :column LOCK_DATA: If lock type is ``RECORD``, primary key of the locked record
-
-This table contains information on each lock that is requested by any transaction and on each lock that is held by any transaction. You can get details about the transactions involved by joining INNODB_LOCKS with INNODB_TRX on TRX_ID.
-
-This table was introduced by the |InnoDB| plugin and you can find the full documentation here.
-
-.. table:: INFORMATION_SCHEMA.INNODB_TRX
-
-   :column TRX_ID: |InnoDB| internal unique transaction id
-   :column TRX_STATE: Execution state. Possible values are: ``Running``, ``Lock_wait``, ``Rolling_back``, ``Committing``
-   :column TRX_STARTED:  Transaction start time
-   :column TRX_REQUESTED_LOCK_ID: Id of the lock the transaction has requested
-   :column TRX_WAIT_STARTED: Date and time when the transaction started waiting for a lock
-   :column TRX_WEIGHT: Weight of the transaction, ie approximate number of locked and modified rows
-   :column TRX_MYSQL_THREAD_ID: Thread id
-   :column TRX_QUERY: SQL query being executed
-
-This table holds information on every transaction running in the |InnoDB| kernel. Contrary to the output of SHOW |InnoDB| STATUS, it doesn't show information on idle transactions.
-
-This table was introduced by the |InnoDB| plugin and you can find the full documentation here.
-
-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
-
-   :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
-
-   :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.

=== removed file 'doc/source/diagnostics/mysql_syslog.rst'
--- doc/source/diagnostics/mysql_syslog.rst	2012-06-04 13:39:55 +0000
+++ doc/source/diagnostics/mysql_syslog.rst	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-.. _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

=== removed file 'doc/source/diagnostics/process_list.rst'
--- doc/source/diagnostics/process_list.rst	2011-10-07 23:38:41 +0000
+++ doc/source/diagnostics/process_list.rst	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-.. _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.5 of the server are:
-
-  * ``SHOW PROCESSLIST`` command:
-
-    * added columns ``ROWS_EXAMINED``, ``ROWS_SENT``, and ``ROWS_READ``
-
-  * ``PROCESSLIST`` table:
-
-    * added columns ``TIME_MS``, ``ROWS_EXAMINED``, ``ROWS_SENT``, and ``ROWS_READ``
-
-Version Specific Information
-============================
-
-  * 5.0.91-22:
-
-    * Added column ``TIME_MS`` to table ``PROCESSLIST``.
-
-  * 5.5.10-20.1:
-
-    * Added columns ``ROWS_EXAMINED``, ``ROWS_SENT``, and ``ROWS_READ`` to ``SHOW PROCESSLIST`` command.
-
-    * Added columns ``ROWS_EXAMINED``, ``ROWS_SENT``, and ``ROWS_READ`` 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.
-   :column ROWS_EXAMINED: The number of rows examined by the statement being executed.
-   :column ROWS_SENT:	The number of rows sent by the statement being executed.
-   :column ROWS_READ: The number of rows read by the statement being executed.
-   :version 5.0.91-22: Added column ``TIME_MS``
-   :version 5.5.10-20.1: Added columns ``ROWS_EXAMINED``, ``ROWS_SENT``, and ``ROWS_READ``
-
-
-Example Output
-==============
-
-``SHOW PROCESSLIST`` Command: ::
-
-  mysql> show processlist;
-  +------+-----------+-----------+--------+---------+------+------------+----------------------------------------------+-----------+---------------+-----------+
-  | Id   | User      | Host      | db     | Command | Time | State      | Info                                         | ROWS_SENT | ROWS_EXAMINED | ROWS_READ |
-  +------+-----------+-----------+--------+---------+------+------------+----------------------------------------------+-----------+---------------+-----------+
-  |    2 | root      | localhost | test   | Query   |    0 | NULL       | SHOW PROCESSLIST                             |         0 |             0 |         1 |
-  |   14 | root      | localhost | test   | Query   |    0 | User lock  | SELECT GET_LOCK(``t``,1000)                    |         0 |             0 |         1 |
-  +------+-----------+-----------+--------+---------+------+------------+----------------------------------------------+-----------+---------------+-----------+
-
-Table :table:`PROCESSLIST`: ::
-
-  mysql> select * from information_schema.PROCESSLIST;
-  +------+-----------+-----------+--------+---------+------+------------+----------------------------------------------+----------+---------------+-----------+-----------+
-  | ID   | USER      | HOST      | DB     | COMMAND | TIME | STATE      | INFO                                         | TIME_MS  | ROWS_EXAMINED | ROWS_SENT | ROWS_READ |
-  +------+-----------+-----------+--------+---------+------+------------+----------------------------------------------+----------+---------------+-----------+-----------+
-  |   14 | root      | localhost | test   | Query   |    0 | User lock  | SELECT GET_LOCK(``t``,1000)                    |        1 |             0 |         0   |         1 |
-  |    2 | root      | localhost | test   | Query   |    0 | executing  | SELECT * from INFORMATION_SCHEMA.PROCESSLIST |        0 |             0 |         0 |         1 |
-  +------+-----------+-----------+--------+---------+------+------------+----------------------------------------------+----------+---------------+-----------+-----------+
-
- 

=== removed file 'doc/source/diagnostics/response_time_distribution.rst'
--- doc/source/diagnostics/response_time_distribution.rst	2012-02-13 08:49:21 +0000
+++ doc/source/diagnostics/response_time_distribution.rst	1970-01-01 00:00:00 +0000
@@ -1,266 +0,0 @@
-.. _response_time_distribution:
-
-============================
- Response Time Distribution
-============================
-
-The slow query log provides exact information about queries that take a long time to execute. However, sometimes there are a large number of queries that each take a very short amount of time to execute. This feature provides a tool for analyzing that information by counting and displaying the number of queries according to the the length of time they took to execute. The user can define time intervals that divide the range 0 to positive infinity into smaller intervals and then collect the number of commands whose execution times fall into each of those intervals.
-
-Note that in a replication environment, the server will not take into account *any* queries executed by the slave's SQL thread (whether they are slow or not) for the time distribution unless the log_slow_slave_statements variable is set.
-
-The feature isn't implemented in all versions of the server. The variable :variable:`have_response_time_distribution` indicates whether or not it is implemented in the server you are running.
-
-Each interval is described as: ::
-
-(range_base ^ n; range_base ^ (n+1)]
-
-The range_base is some positive number (see Limitations). The interval is defined as the difference between two nearby powers of the range base.
-
-For example, if the range base=10, we have the following intervals: ::
-
-  (0; 10 ^ -6], (10 ^ -6; 10 ^ -5], (10 ^ -5; 10 ^ -4], ..., (10 ^ -1; 10 ^1], (10^1; 10^2]...(10^7; positive infinity]
-
-or ::
-
-  (0; 0.000001], (0.000001; 0.000010], (0.000010; 0.000100], ..., (0.100000; 1.0]; (1.0; 10.0]...(1000000; positive infinity]
-
-For each interval, a count is made of the queries with execution times that fell into that interval.
-
-You can select the range of the intervals by changing the range base. For example, for base range=2 we have the following intervals: ::
-
-  (0; 2 ^ -19], (2 ^ -19; 2 ^ -18], (2 ^ -18; 2 ^ -17], ..., (2 ^ -1; 2 ^1], (2 ^ 1; 2 ^ 2]...(2 ^ 25; positive infinity]
-
-or ::
-
-  (0; 0.000001], (0.000001, 0.000003], ..., (0.25; 0.5], (0.5; 2], (2; 4]...(8388608; positive infinity]
-
-Small numbers look strange (i.e., don't look like powers of 2), because we lose precision on division when the ranges are calculated at runtime. In the resulting table, you look at the high boundary of the range.
-
-For example, you may see: ::
-
-  +----------------+-------+------------+
-  |      time      | count |    total   |
-  +----------------+-------+------------|
-  |       0.000001 |     0 |   0.000000 |
-  |       0.000010 |    17 |   0.000094 |
-  |       0.000100 |  4301 |   0.236555 |
-  |       0.001000 |  1499 |   0.824450 |
-  |       0.010000 | 14851 |  81.680502 |
-  |       0.100000 |  8066 | 443.635693 |
-  |       1.000000 |     0 |   0.000000 |
-  |      10.000000 |     0 |   0.000000 |
-  |     100.000000 |     1 |  55.937094 |
-  |    1000.000000 |     0 |   0.000000 |
-  |   10000.000000 |     0 |   0.000000 |
-  |  100000.000000 |     0 |   0.000000 |
-  | 1000000.000000 |     0 |   0.000000 |
-  | TOO LONG QUERY |     0 |   0.000000 |
-  +----------------+-------+------------+
-
-This means there were: ::
-
-  * 17 queries with 0.000001 < query execution time < = 0.000010 seconds; total execution time of the 17 queries = 0.000094 seconds
-
-  * 4301 queries with 0.000010 < query execution time < = 0.000100 seconds; total execution time of the 4301 queries = 0.236555 seconds
-
-  * 1499 queries with 0.000100 < query execution time < = 0.001000 seconds; total execution time of the 1499 queries = 0.824450 seconds
-
-  * 14851 queries with 0.001000 < query execution time < = 0.010000 seconds; total execution time of the 14851 queries = 81.680502 seconds
-
-  * 8066 queries with 0.010000 < query execution time < = 0.100000 seconds; total execution time of the 8066 queries = 443.635693 seconds
-
-  * 1 query with 10.000000 < query execution time < = 100.0000 seconds; total execution time of the 1 query = 55.937094 seconds
-
-Usage
-=====
-
-SELECT
-------
-
-You can get the distribution using the query: ::
-
-  > SELECT * from INFORMATION_SCHEMA.QUERY_RESPONSE_TIME
-  time	                 count	 total
-  0.000001	         0	 0.000000
-  0.000010	         0	 0.000000
-  0.000100	         1	 0.000072
-  0.001000	         0	 0.000000
-  0.010000	         0	 0.000000
-  0.100000	         0	 0.000000
-  1.000000	         0	 0.000000
-  10.000000	         8	 47.268416
-  100.000000	         0	 0.000000
-  1000.000000	         0	 0.000000
-  10000.000000	         0	 0.000000
-  100000.000000	         0	 0.000000
-  1000000.000000	 0	 0.000000
-  TOO LONG QUERY	 0	 0.000000
-
-You can write a complex query like: ::
-
-  SELECT c.count, c.time,
-  (SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,
-  (SELECT COUNT(*)     FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as not_zero_region_count,
-  (SELECT COUNT(*)     FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count
-  FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count > 0;
-
-**Note:** If :variable:`query_response_time_stats` is ON, the execution times for these two ``SELECT`` queries will also be collected.
-
-SHOW
-----
-
-Also, you can use this syntax: ::
-
-  > SHOW QUERY_RESPONSE_TIME;
-  time	                 count	 total
-  0.000001	         0	 0.000000
-  0.000010	         0	 0.000000
-  0.000100	         1	 0.000072
-  0.001000	         0	 0.000000
-  0.010000	         0	 0.000000
-  0.100000	         0	 0.000000
-  1.000000	         0	 0.000000
-  10.000000	         8	 47.268416
-  100.000000	         0	 0.000000
-  1000.000000	         0	 0.000000
-  10000.000000	         0	 0.000000
-  100000.000000	         0	 0.000000
-  1000000.000000	 0	 0.000000
-  TOO LONG QUERY	 0	 0.000000
-
-**Note:** The execution time for the SHOW query will also be collected.
-
-FLUSH
------
-
-Flushing can be done with: ::
-
-  FLUSH QUERY_RESPONSE_TIME;
-
-``FLUSH`` does two things:
-
-  * Clears the collected times from the :table:`QUERY_RESPONSE_TIME` table
-
-  * Reads the value of :variable:`query_response_time_range_base` and uses it to set the range base for the table
-
-**Note:** The execution time for the ``FLUSH`` query will also be collected.
-
-Stored procedures
------------------
-
-Stored procedure calls count as single query.
-
-Collect time point
-------------------
-
-Time is collected after query execution completes (before clearing data structures).
-
-Limitations
-===========
-
-  * ``String width for seconds``
-
-    * Value: 7
-
-    * Compile-time variable: ``QUERY_RESPONSE_TIME_STRING_POSITIVE_POWER_LENGTH``
-
-  * ``String width for microseconds``
-
-    * Value: 6
-
-    * Compile-time variable: ``QUERY_RESPONSE_TIME_STRING_NEGATIVE_POWER_LENGTH``
-
-  * Minimum range base
-
-    * Value: 2
-
-    * Compile-time variable: ``QUERY_RESPONSE_TIME_MINIMUM_BASE``
-
-  * Minimum range base
-
-    * Value: 1000
-
-    * Compile-time variable: ``QUERY_RESPONSE_TIME_MAXIMUM_BASE``
-
-  * Minimum time interval
-
-    * Value:  1 microsecond
-
-  * Maximum time interval
-
-    * Value: 9999999 seconds
-
-Version Specific Information
-============================
-
-  * 5.5.8-20.0:
-    Introduced variable variable:`have_response_time_distribution`.
-
-  * 5.5.8-20.0:
-    Introduced  variable variable:`query_response_time_stats`.
-
-System Variables
-================
-
-.. variable:: have_response_time_distribution
-
-     :version 5.5.8-20.0: Introduced.
-     :scope: Global
-     :dyn: No
-     :vartype: Boolean
-     :default: YES
-     :range: YES/NO
-
-Contains the value YES if the server you're running supports this feature; contains NO if the feature is not supported. It is enabled by default.
-
-
-.. variable::  query_response_time_range_base
-
-     :cli: Yes
-     :conf: Yes
-     :scope: Global
-     :dyn: Yes
-     :vartype: Numeric
-     :default: 10
-     :range: 2-1000
-
-Sets up the logarithm base for the scale.
-
-**Note:** The variable takes effect only after this command has been executed: ::
-
-  FLUSH QUERY_RESPONSE_TIME;
-
-.. variable:: query_response_time_stats
-
-     :version 5.5.8-20.0: Introduced.
-     :cli: Yes
-     :conf: Yes
-     :scope: Global
-     :dyn: Yes
-     :vartype: Boolean
-     :default: OFF
-     :range: ON/OFF
-
-This variable enables and disables collection of query times if the feature is available in the server that's running. If the value of variable :variable:`have_response_time_distribution` is YES, then you can enable collection of query times by setting this variable to ON using ``SET GLOBAL``.
-
- Prior to release 5.5.8-20.0, this variable was named :variable:`enable_query_response_time_stats`.
-
-
-INFORMATION_SCHEMA Tables
-=========================
-
-.. table:: INFORMATION_SCHEMA.QUERY_RESPONSE_TIME
-
-   :column VARCHAR TIME: 
-   :column INT(11) COUNT: 
-   :column VARCHAR TOTAL:  
-
-Implementation Details
-======================
-
-Implementation details on this feature are provided here.
-
-Related Reading
-===============
-
-  * `Blueprint about Response Time Distribution <https://blueprints.launchpad.net/percona-server/+spec/response-time-distribution>`_

=== removed file 'doc/source/diagnostics/show_engines.rst'
--- doc/source/diagnostics/show_engines.rst	2012-02-13 08:49:21 +0000
+++ doc/source/diagnostics/show_engines.rst	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-.. _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
-

=== removed file 'doc/source/diagnostics/slow_extended_55.rst'
--- doc/source/diagnostics/slow_extended_55.rst	2012-08-03 08:58:37 +0000
+++ doc/source/diagnostics/slow_extended_55.rst	1970-01-01 00:00:00 +0000
@@ -1,376 +0,0 @@
-.. _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 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_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 percent of queries will be 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 queries replayed by the slave SQL thread on a |MySQL| slave will be logged. The standard |MySQL| server will not log any queries executed by the slave's SQL thread.
-
-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.
-
-.. variable:: log_slow_verbosity
-
-     :cli: Yes
-     :conf: Yes
-     :scope: Global, session
-     :dyn: Yes
-     :version 5.5.8-20.0: Added ``profiling`` and ``profiling_use_getrusage``
-
-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 (mandatory).
-
-  * ``query_plan``:
-    Log information about the query``s execution plan (optional).
-
-  * ``innodb``:
-    Log |InnoDB| statistics (optional).
-
-  * ``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``. To turn all options on, set the option to ``full``.
-
-.. variable:: long_query_time
-
-     :cli: Yes
-     :conf: Yes
-     :scope: Global, session
-     :dyn: Yes
-
-Specifies the time threshold for filtering queries out of the slow query log. The unit of time is seconds. This option has the same meaning as in a standard |MySQL| server, with the following changes:
-
-The option accepts fractional values. If set to 0.5, for example, queries longer than 1/2 second will be logged.
-
-Before version 1.01 of this feature, the value was an integer, and the unit of time was microseconds, not seconds.
-
-.. variable:: slow_query_log_timestamp_always
-
-     :cli: Yes
-     :conf: Yes
-     :scope: Global
-     :dyn: Yes
-     :vartype: Boolean
-     :default: FALSE
-     :range: TRUE/FALSE
-     :version 5.5.10-20.1: Introduced  (renamed from :variable:`log_slow_timestamp_every`)
-
-If ``TRUE``, a timestamp is printed on every slow log record. Multiple records may have the same time.
-
-**NOTE:** This variable has been renamed from log_slow_timestamp_every since 5.5.10-20.1.
-
-.. 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]
-
-**NOTE:** This variable has been renamed from :variable:`slow_query_log_microseconds_timestamp` since 5.5.10-20.1.
-
-
-.. 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
-===============
-
-  * `Impact of logging on MySQL's performance <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>`_

=== removed file 'doc/source/diagnostics/thread_based_profiling.rst'
--- doc/source/diagnostics/thread_based_profiling.rst	2012-07-18 08:43:52 +0000
+++ doc/source/diagnostics/thread_based_profiling.rst	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-.. _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

=== removed file 'doc/source/diagnostics/user_stats.rst'
--- doc/source/diagnostics/user_stats.rst	2012-05-21 16:25:24 +0000
+++ doc/source/diagnostics/user_stats.rst	1970-01-01 00:00:00 +0000
@@ -1,251 +0,0 @@
-.. _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`.
-  * :rn:`5.5.24-26.0`:
-     TOTAL_CONNECTIONS_SSL column has been added to CLIENT_STATISTICS, THREAD_STATISTICS and USER_STATISTICS tables 
-
-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.
-  :column TOTAL_CONNECTIONS_SSL: The number of times this client's connections connected using SSL 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
-   TOTAL_CONNECTIONS_SSL: 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)