Merge lp:~laurynas-biveinis/percona-server/BT-16724-xtradb-bmp-requests-5.5 into lp:percona-server/5.5

[Laurynas Biveinis]

Merge of implementation of https://blueprints.launchpad.net/percona-server/+spec/xtradb-bitmap-user-requests from 5.1.
Jenkins: http://jenkins.percona.com/job/percona-server-5.5-param/571/

[Laurynas Biveinis (laurynas-biveinis)]

Typo in the id - it's 16274.

[Vlad Lesin (vlad-lesin)]

See comments in 5.1 branch.

review: Needs Fixing

=== modified file 'Percona-Server/include/mysql_com.h'
--- Percona-Server/include/mysql_com.h	2012-05-10 07:49:14 +0000
+++ Percona-Server/include/mysql_com.h	2012-11-25 09:45:24 +0000
@@ -152,6 +152,10 @@
 #define REFRESH_USER_STATS     0x800000L /* Refresh user stats my_hash table */
 #define REFRESH_CLIENT_STATS   0x1000000L /* Refresh client stats my_hash table */
 #define REFRESH_THREAD_STATS   0x2000000L /* Refresh thread stats my_hash table */
+#define REFRESH_FLUSH_PAGE_BITMAPS 0x400000L
+#define REFRESH_RESET_PAGE_BITMAPS 0x800000L
+
+#define PURGE_BITMAPS_TO_LSN 1
 
 #define CLIENT_LONG_PASSWORD	1	/* new more secure passwords */
 #define CLIENT_FOUND_ROWS	2	/* Found instead of affected rows */
 
=== removed file 'Percona-Server/mysql-test/include/delete_innodb_bitmaps.inc'
--- Percona-Server/mysql-test/include/delete_innodb_bitmaps.inc	2012-11-25 09:45:24 +0000
+++ Percona-Server/mysql-test/include/delete_innodb_bitmaps.inc	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-# Remove all the InnoDB bitmap files. A temporary measure until RESET user request is implemented
-
-let $MYSQLD_DATADIR= `select @@datadir`;
-
---exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
---shutdown_server 10
---source include/wait_until_disconnected.inc
-remove_files_wildcard $MYSQLD_DATADIR ib_modified_log*;
---enable_reconnect
---exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
---source include/wait_until_connected_again.inc
 
=== modified 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	2012-11-25 09:45:24 +0000
+++ Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp.result	2012-11-25 09:45:24 +0000
@@ -1,3 +1,4 @@
+RESET ALL CHANGED PAGE BITMAPS;
 DROP TABLE IF EXISTS t1, t2;
 CREATE TABLE t1 (x INT) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
 
=== modified 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	2012-11-25 09:45:24 +0000
+++ Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_no_restart.result	2012-11-25 09:45:24 +0000
@@ -1,3 +1,4 @@
+RESET ALL CHANGED PAGE BITMAPS;
 DROP TABLE IF EXISTS t1, t2;
 CREATE TABLE t1 (x INT) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
 
=== added file 'Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_requests.result'
--- Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_requests.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_requests.result	2012-11-25 09:45:24 +0000
@@ -0,0 +1,74 @@
+RESET ALL CHANGED PAGE BITMAPS;
+DROP TABLE IF EXISTS t1;
+DELETE FROM mysql.user WHERE USER='mysqltest_1';
+FLUSH PRIVILEGES;
+CREATE TABLE t1 (x INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
+FLUSH ALL CHANGED PAGE BITMAPS;
+Before RESET:
+ib_modified_log_1
+ib_modified_log_2
+RESET ALL CHANGED PAGE BITMAPS;
+After RESET:
+ib_modified_log_1
+RESET ALL CHANGED PAGE BITMAPS;
+After 2nd RESET
+ib_modified_log_1
+After RESETs and restart:
+ib_modified_log_1
+ib_modified_log_2
+PURGE ALL CHANGED PAGE BITMAPS BEFORE 1;
+After PURGE ... BEFORE 1:
+ib_modified_log_2
+PURGE ALL CHANGED PAGE BITMAPS BEFORE 100000000;
+PURGE ALL CHANGED PAGE BITMAPS BEFORE 100000000;
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
+After PURGE ... BEFORE 100000 and restart:
+ib_modified_log_2
+ib_modified_log_3
+PURGE ALL CHANGED PAGE BITMAPS BEFORE 5+5;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '+5' at line 1
+PURGE ALL CHANGED PAGE BITMAPS BEFORE -12;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-12' at line 1
+PURGE ALL CHANGED PAGE BITMAPS BEFORE 1.2e-2;
+ERROR 42000: Only integers allowed as number here near '1.2e-2' at line 1
+PURGE ALL CHANGED PAGE BITMAPS BEFORE t1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 't1' at line 1
+PURGE ALL CHANGED PAGE BITMAPS BEFORE "t1";
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"t1"' at line 1
+PURGE ALL CHANGED PAGE BITMAPS BEFORE TRUE;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'TRUE' at line 1
+PURGE ALL CHANGED PAGE BITMAPS BEFORE NULL;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'NULL' at line 1
+CREATE USER mysqltest_1@localhost;
+GRANT ALL ON *.* TO mysqltest_1@localhost;
+REVOKE SUPER ON *.* FROM mysqltest_1@localhost;
+FLUSH ALL CHANGED PAGE BITMAPS;
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
+RESET ALL CHANGED PAGE BITMAPS;
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
+PURGE ALL CHANGED PAGE BITMAPS BEFORE 100000000;
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
+DROP USER mysqltest_1@localhost;
+SELECT @@GLOBAL.innodb_track_changed_pages;
+@@GLOBAL.innodb_track_changed_pages
+0
+FLUSH ALL CHANGED PAGE BITMAPS;
+Before the PURGE with tracking disabled
+ib_modified_log_2
+ib_modified_log_3
+PURGE ALL CHANGED PAGE BITMAPS BEFORE 1;
+After the PURGE that deletes nothing:
+ib_modified_log_2
+ib_modified_log_3
+PURGE ALL CHANGED PAGE BITMAPS BEFORE 100000000;
+After the PURGE that deletes everything:
+PURGE ALL CHANGED PAGE BITMAPS BEFORE 100000000;
+After the repeated PURGE:
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
+Before the RESET while tracking disabled:
+ib_modified_log_1
+ib_modified_log_2
+RESET ALL CHANGED PAGE BITMAPS;
+After the RESET with tracking disabled:
+DROP TABLE t1;
 
=== added file 'Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_requests_no_innodb.result'
--- Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_requests_no_innodb.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_requests_no_innodb.result	2012-11-25 09:45:24 +0000
@@ -0,0 +1,3 @@
+FLUSH ALL CHANGED PAGE BITMAPS;
+RESET ALL CHANGED PAGE BITMAPS;
+PURGE ALL CHANGED PAGE BITMAPS BEFORE 1;
 
=== modified file 'Percona-Server/mysql-test/suite/innodb/r/percona_changed_pages.result'
--- Percona-Server/mysql-test/suite/innodb/r/percona_changed_pages.result	2012-11-25 09:45:24 +0000
+++ Percona-Server/mysql-test/suite/innodb/r/percona_changed_pages.result	2012-11-25 09:45:24 +0000
@@ -1,3 +1,4 @@
+RESET ALL CHANGED PAGE BITMAPS;
 DROP TABLE IF EXISTS T1;
 CREATE TABLE T1 (F1 CHAR(255)) ENGINE=INNODB;
 1st interval end LSN greater than interval start LSN:
 
=== modified 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	2012-11-25 09:45:24 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp.test	2012-11-25 09:45:24 +0000
@@ -13,7 +13,9 @@
 # Valgrind reports useless errors on very fast server shutdowns
 --source include/not_valgrind.inc
 
---source include/delete_innodb_bitmaps.inc
+# Delete any existing bitmaps
+--source include/restart_mysqld.inc
+RESET ALL CHANGED PAGE BITMAPS;
 
 --disable_warnings
 DROP TABLE IF EXISTS t1, t2;
 
=== modified 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	2012-11-25 09:45:24 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_no_restart.test	2012-11-25 09:45:24 +0000
@@ -2,7 +2,9 @@
 # percona_changed_page_bmp test, which contains the full functional tests.
 --source include/have_innodb.inc
 
---source include/delete_innodb_bitmaps.inc
+# Delete any existing bitmaps
+--source include/restart_mysqld.inc
+RESET ALL CHANGED PAGE BITMAPS;
 
 --disable_warnings
 DROP TABLE IF EXISTS t1, t2;
 
=== added file 'Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_requests-master.opt'
--- Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_requests-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_requests-master.opt	2012-11-25 09:45:24 +0000
@@ -0,0 +1,1 @@
+--innodb_track_changed_pages=TRUE
 
=== added file 'Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_requests.test'
--- Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_requests.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_requests.test	2012-11-25 09:45:24 +0000
@@ -0,0 +1,194 @@
+#
+# Tests for changed page tracking bitmaps: user requests.
+#
+--source include/have_innodb.inc
+
+# Delete any existing bitmaps
+--source include/restart_mysqld.inc
+RESET ALL CHANGED PAGE BITMAPS;
+
+--source include/count_sessions.inc
+
+let $MYSQLD_DATADIR= `select @@datadir`;
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+DELETE FROM mysql.user WHERE USER='mysqltest_1';
+FLUSH PRIVILEGES;
+--enable_warnings
+
+CREATE TABLE t1 (x INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
+
+#
+# Test FLUSH ALL CHANGED PAGE BITMAPS.  Not much to test due to checkpointing non-determinism,
+# just see that it does not crash or return an error
+#
+FLUSH ALL CHANGED PAGE BITMAPS;
+
+#
+# Test that RESET ALL CHANGED PAGE BITMAPS works
+#
+
+# Have at least two bitmap files
+--source include/restart_mysqld.inc
+
+--echo Before RESET:
+--replace_regex /_[[:digit:]]+\.xdb$//
+list_files $MYSQLD_DATADIR ib_modified_log*;
+
+RESET ALL CHANGED PAGE BITMAPS;
+
+--echo After RESET:
+--replace_regex /_[[:digit:]]+\.xdb$//
+list_files $MYSQLD_DATADIR ib_modified_log*;
+
+# Test consecutive RESET
+RESET ALL CHANGED PAGE BITMAPS;
+--echo After 2nd RESET
+--replace_regex /_[[:digit:]]+\.xdb$//
+list_files $MYSQLD_DATADIR ib_modified_log*;
+
+# Check that the file sequence after RESET starts with 1 again
+--source include/restart_mysqld.inc
+
+--echo After RESETs and restart:
+--replace_regex /_[[:digit:]]+\.xdb$//
+list_files $MYSQLD_DATADIR ib_modified_log*;
+
+#
+# Test that PURGE ALL CHANGED PAGE BITMAPS BEFORE works.  We don't test partial PURGE
+# because it's hard to extract good LSN value for that.
+#
+
+# PURGE that deletes nothing
+PURGE ALL CHANGED PAGE BITMAPS BEFORE 1;
+--echo After PURGE ... BEFORE 1:
+--replace_regex /_[[:digit:]]+\.xdb$//
+list_files $MYSQLD_DATADIR ib_modified_log*;
+
+# PURGE that deletes everything
+PURGE ALL CHANGED PAGE BITMAPS BEFORE 100000000;
+# Test consecutive PURGE
+PURGE ALL CHANGED PAGE BITMAPS BEFORE 100000000;
+
+# Check that file sequence continues
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
+--source include/restart_mysqld.inc
+--echo After PURGE ... BEFORE 100000 and restart:
+--replace_regex /_[[:digit:]]+\.xdb$//
+list_files $MYSQLD_DATADIR ib_modified_log*;
+
+#
+# Test malformed PURGE ... BEFORE
+#
+--error ER_PARSE_ERROR
+PURGE ALL CHANGED PAGE BITMAPS BEFORE 5+5;
+
+--error ER_PARSE_ERROR
+PURGE ALL CHANGED PAGE BITMAPS BEFORE -12;
+
+--error ER_PARSE_ERROR
+PURGE ALL CHANGED PAGE BITMAPS BEFORE 1.2e-2;
+
+--error ER_PARSE_ERROR
+PURGE ALL CHANGED PAGE BITMAPS BEFORE t1;
+
+--error ER_PARSE_ERROR
+PURGE ALL CHANGED PAGE BITMAPS BEFORE "t1";
+
+--error ER_PARSE_ERROR
+PURGE ALL CHANGED PAGE BITMAPS BEFORE TRUE;
+
+--error ER_PARSE_ERROR
+PURGE ALL CHANGED PAGE BITMAPS BEFORE NULL;
+
+#
+# Test that non-privileged users cannot issue user requests
+#
+CREATE USER mysqltest_1@localhost;
+GRANT ALL ON *.* TO mysqltest_1@localhost;
+REVOKE SUPER ON *.* FROM mysqltest_1@localhost;
+
+connect (conn1,localhost,mysqltest_1,,);
+
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+FLUSH ALL CHANGED PAGE BITMAPS;
+
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+RESET ALL CHANGED PAGE BITMAPS;
+
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+PURGE ALL CHANGED PAGE BITMAPS BEFORE 100000000;
+
+connection default;
+disconnect conn1;
+
+--source include/wait_until_count_sessions.inc
+
+DROP USER mysqltest_1@localhost;
+
+#
+# Test FLUSH and PURGE requests with log tracking disabled
+#
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server 10
+--source include/wait_until_disconnected.inc
+--enable_reconnect
+--exec echo "restart:--innodb_track_changed_pages=FALSE" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/wait_until_connected_again.inc
+
+SELECT @@GLOBAL.innodb_track_changed_pages;
+
+FLUSH ALL CHANGED PAGE BITMAPS;
+
+# The previous bitmap files should be present
+--echo Before the PURGE with tracking disabled
+--replace_regex /_[[:digit:]]+\.xdb$//
+list_files $MYSQLD_DATADIR ib_modified_log*;
+
+PURGE ALL CHANGED PAGE BITMAPS BEFORE 1;
+
+--echo After the PURGE that deletes nothing:
+--replace_regex /_[[:digit:]]+\.xdb$//
+list_files $MYSQLD_DATADIR ib_modified_log*;
+
+PURGE ALL CHANGED PAGE BITMAPS BEFORE 100000000;
+
+--echo After the PURGE that deletes everything:
+--replace_regex /_[[:digit:]]+\.xdb$//
+list_files $MYSQLD_DATADIR ib_modified_log*;
+
+PURGE ALL CHANGED PAGE BITMAPS BEFORE 100000000;
+
+--echo After the repeated PURGE:
+--replace_regex /_[[:digit:]]+\.xdb$//
+list_files $MYSQLD_DATADIR ib_modified_log*;
+
+#
+# Test RESET request with log tracking disabled
+#
+
+# Generate some bitmap data again
+--source include/restart_mysqld.inc
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
+--source include/restart_mysqld.inc
+
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server 10
+--source include/wait_until_disconnected.inc
+--enable_reconnect
+--exec echo "restart:--innodb_track_changed_pages=FALSE" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/wait_until_connected_again.inc
+
+--echo Before the RESET while tracking disabled:
+--replace_regex /_[[:digit:]]+\.xdb$//
+list_files $MYSQLD_DATADIR ib_modified_log*;
+
+RESET ALL CHANGED PAGE BITMAPS;
+
+--echo After the RESET with tracking disabled:
+--replace_regex /_[[:digit:]]+\.xdb$//
+list_files $MYSQLD_DATADIR ib_modified_log*;
+
+DROP TABLE t1;
 
=== added file 'Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_requests_no_innodb-master.opt'
--- Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_requests_no_innodb-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_requests_no_innodb-master.opt	2012-11-25 09:45:24 +0000
@@ -0,0 +1,1 @@
+--skip-innodb
 
=== added file 'Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_requests_no_innodb.test'
--- Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_requests_no_innodb.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_requests_no_innodb.test	2012-11-25 09:45:24 +0000
@@ -0,0 +1,7 @@
+#
+# Test that changed page tracking user requests are parsed without InnoDB
+#
+FLUSH ALL CHANGED PAGE BITMAPS;
+RESET ALL CHANGED PAGE BITMAPS;
+PURGE ALL CHANGED PAGE BITMAPS BEFORE 1;
+
 
=== modified file 'Percona-Server/mysql-test/suite/innodb/t/percona_changed_pages.test'
--- Percona-Server/mysql-test/suite/innodb/t/percona_changed_pages.test	2012-11-25 09:45:24 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_changed_pages.test	2012-11-25 09:45:24 +0000
@@ -4,7 +4,9 @@
 
 --source include/have_innodb.inc
 
---source include/delete_innodb_bitmaps.inc
+# Delete any existing bitmaps
+--source include/restart_mysqld.inc
+RESET ALL CHANGED PAGE BITMAPS;
 
 --disable_warnings
 DROP TABLE IF EXISTS T1;
 
=== modified file 'Percona-Server/sql/handler.cc'
--- Percona-Server/sql/handler.cc	2012-10-17 03:47:45 +0000
+++ Percona-Server/sql/handler.cc	2012-11-25 09:45:24 +0000
@@ -5096,6 +5096,42 @@
   return result;
 }
 
+static my_bool flush_changed_page_bitmaps_handlerton(THD *unused1,
+                                                     plugin_ref plugin,
+                                                     void *unused2)
+{
+  handlerton *hton= plugin_data(plugin, handlerton *);
+
+  if (hton->flush_changed_page_bitmaps == NULL)
+    return FALSE;
+
+  return hton->flush_changed_page_bitmaps();
+}
+
+bool ha_flush_changed_page_bitmaps()
+{
+  return plugin_foreach(NULL, flush_changed_page_bitmaps_handlerton,
+                        MYSQL_STORAGE_ENGINE_PLUGIN, NULL);
+}
+
+static my_bool purge_changed_page_bitmaps_handlerton(THD *unused1,
+                                                     plugin_ref plugin,
+                                                     void *lsn)
+{
+  handlerton *hton= plugin_data(plugin, handlerton *);
+
+  if (hton->purge_changed_page_bitmaps == NULL)
+    return FALSE;
+
+  return hton->purge_changed_page_bitmaps(*(ulonglong *)lsn);
+}
+
+bool ha_purge_changed_page_bitmaps(ulonglong lsn)
+{
+  return plugin_foreach(NULL, purge_changed_page_bitmaps_handlerton,
+                        MYSQL_STORAGE_ENGINE_PLUGIN, &lsn);
+}
+
 /*
   Function to check if the conditions for row-based binlogging is
   correct for the table.
 
=== modified file 'Percona-Server/sql/handler.h'
--- Percona-Server/sql/handler.h	2012-10-11 15:03:12 +0000
+++ Percona-Server/sql/handler.h	2012-11-25 09:45:24 +0000
@@ -842,6 +842,8 @@
    int (*fill_is_table)(handlerton *hton, THD *thd, TABLE_LIST *tables, 
                         class Item *cond, 
                         enum enum_schema_tables);
+   int (*flush_changed_page_bitmaps)();
+   int (*purge_changed_page_bitmaps)(ulonglong lsn);
    uint32 flags;                                /* global handler flags */
    /*
       Those handlerton functions below are properly initialized at handler
@@ -2388,6 +2390,9 @@
 int ha_prepare(THD *thd);
 int ha_recover(HASH *commit_list);
 
+bool ha_flush_changed_page_bitmaps();
+bool ha_purge_changed_page_bitmaps(ulonglong lsn);
+
 /* transactions: these functions never call handlerton functions directly */
 int ha_enable_transaction(THD *thd, bool on);
 
 
=== modified file 'Percona-Server/sql/lex.h'
--- Percona-Server/sql/lex.h	2012-05-10 07:49:14 +0000
+++ Percona-Server/sql/lex.h	2012-11-25 09:45:24 +0000
@@ -86,6 +86,7 @@
   { "BINARY",		SYM(BINARY)},
   { "BINLOG",		SYM(BINLOG_SYM)},
   { "BIT",		SYM(BIT_SYM)},
+  { "BITMAPS",		SYM(BITMAPS_SYM)},
   { "BLOB",		SYM(BLOB_SYM)},
   { "BLOCK",  SYM(BLOCK_SYM)},
   { "BOOL",		SYM(BOOL_SYM)},
 
=== modified file 'Percona-Server/sql/sql_parse.cc'
--- Percona-Server/sql/sql_parse.cc	2012-09-17 13:08:32 +0000
+++ Percona-Server/sql/sql_parse.cc	2012-11-25 09:45:24 +0000
@@ -2320,9 +2320,35 @@
   {
     if (check_global_access(thd, SUPER_ACL))
       goto error;
-    /* PURGE MASTER LOGS TO 'file' */
-    res = purge_master_logs(thd, lex->to_log);
-    break;
+    if (lex->type == 0)
+    {
+      /* PURGE MASTER LOGS TO 'file' */
+      res = purge_master_logs(thd, lex->to_log);
+      break;
+    }
+    if (lex->type == PURGE_BITMAPS_TO_LSN)
+    {
+      /* PURGE INNODB CHANGED PAGE BITMAPS BEFORE lsn */
+      ulonglong lsn= 0;
+      Item *it= (Item *)lex->value_list.head();
+      if ((!it->fixed && it->fix_fields(lex->thd, &it)) || it->check_cols(1)
+          || it->null_value)
+      {
+        my_error(ER_WRONG_ARGUMENTS, MYF(0),
+                 "PURGE INNODB CHANGED PAGE BITMAPS BEFORE");
+        goto error;
+      }
+      lsn= it->val_uint();
+      res= ha_purge_changed_page_bitmaps(lsn);
+      if (res)
+      {
+        my_error(ER_LOG_PURGE_UNKNOWN_ERR, MYF(0),
+                 "PURGE INNODB CHANGED PAGE BITMAPS BEFORE");
+        goto error;
+      }
+      my_ok(thd);
+      break;
+    }
   }
   case SQLCOM_PURGE_BEFORE:
   {
@@ -3782,7 +3808,14 @@
   case SQLCOM_FLUSH:
   {
     int write_to_binlog;
-    if (check_global_access(thd,RELOAD_ACL))
+
+    if (lex->type & REFRESH_FLUSH_PAGE_BITMAPS
+        || lex->type & REFRESH_RESET_PAGE_BITMAPS)
+    {
+      if (check_global_access(thd, SUPER_ACL))
+          goto error;
+    }
+    else if (check_global_access(thd, RELOAD_ACL))
       goto error;
 
     if (first_table && lex->type & REFRESH_READ_LOCK)
 
=== modified file 'Percona-Server/sql/sql_reload.cc'
--- Percona-Server/sql/sql_reload.cc	2012-04-18 23:26:01 +0000
+++ Percona-Server/sql/sql_reload.cc	2012-11-25 09:45:24 +0000
@@ -362,6 +362,14 @@
     }
     mysql_mutex_unlock(&LOCK_global_user_client_stats);
   }
+  if (options & REFRESH_FLUSH_PAGE_BITMAPS)
+  {
+    result= ha_flush_changed_page_bitmaps();
+  }
+  if (options & REFRESH_RESET_PAGE_BITMAPS)
+  {
+    result= ha_purge_changed_page_bitmaps(0);
+  }
  if (*write_to_binlog != -1)
    *write_to_binlog= tmp_write_to_binlog;
  /*
 
=== modified file 'Percona-Server/sql/sql_yacc.yy'
--- Percona-Server/sql/sql_yacc.yy	2012-09-17 13:08:32 +0000
+++ Percona-Server/sql/sql_yacc.yy	2012-11-25 09:45:24 +0000
@@ -840,6 +840,7 @@
 %token  BIT_OR                        /* MYSQL-FUNC */
 %token  BIT_SYM                       /* MYSQL-FUNC */
 %token  BIT_XOR                       /* MYSQL-FUNC */
+%token  BITMAPS_SYM                   /* MYSQL      */
 %token  BLOB_SYM                      /* SQL-2003-R */
 %token  BLOCK_SYM
 %token  BOOLEAN_SYM                   /* SQL-2003-R */
@@ -11449,6 +11450,8 @@
           { Lex->type|= REFRESH_DES_KEY_FILE; }
         | RESOURCES
           { Lex->type|= REFRESH_USER_RESOURCES; }
+        | ALL CHANGED PAGE_SYM BITMAPS_SYM
+          { Lex->type|= REFRESH_FLUSH_PAGE_BITMAPS; }
         ;
 
 opt_table_list:
@@ -11476,6 +11479,8 @@
           slave_reset_options { }
         | MASTER_SYM          { Lex->type|= REFRESH_MASTER; }
         | QUERY_SYM CACHE_SYM { Lex->type|= REFRESH_QUERY_CACHE;}
+        | ALL CHANGED PAGE_SYM BITMAPS_SYM
+          { Lex->type |= REFRESH_RESET_PAGE_BITMAPS; }
         ;
 
 slave_reset_options:
@@ -11496,6 +11501,13 @@
 
 purge_options:
           master_or_binary LOGS_SYM purge_option
+        | ALL CHANGED PAGE_SYM BITMAPS_SYM BEFORE_SYM real_ulonglong_num
+          {
+            LEX *lex= Lex;
+            lex->value_list.empty();
+            lex->value_list.push_front(new Item_uint($6));
+            lex->type= PURGE_BITMAPS_TO_LSN;
+          }
         ;
 
 purge_option:
 
=== modified file 'Percona-Server/storage/innobase/handler/ha_innodb.cc'
--- Percona-Server/storage/innobase/handler/ha_innodb.cc	2012-11-25 09:45:24 +0000
+++ Percona-Server/storage/innobase/handler/ha_innodb.cc	2012-11-25 09:45:24 +0000
@@ -85,6 +85,7 @@
 #include "row0sel.h"
 #include "row0upd.h"
 #include "log0log.h"
+#include "log0online.h"
 #include "lock0lock.h"
 #include "dict0crea.h"
 #include "btr0cur.h"
@@ -297,6 +298,7 @@
 	{&ibuf_pessimistic_insert_mutex_key,
 		 "ibuf_pessimistic_insert_mutex", 0},
 	{&kernel_mutex_key, "kernel_mutex", 0},
+	{&log_bmp_sys_mutex_key, "log_bmp_sys_mutex", 0},
 	{&log_sys_mutex_key, "log_sys_mutex", 0},
 #  ifdef UNIV_MEM_DEBUG
 	{&mem_hash_mutex_key, "mem_hash_mutex", 0},
@@ -438,6 +440,25 @@
 innobase_alter_table_flags(
 /*=======================*/
 	uint	flags);
+/************************************************************//**
+Synchronously read and parse the redo log up to the last
+checkpoint to write the changed page bitmap.
+@return 0 to indicate success.  Current implementation cannot fail. */
+static
+int
+innobase_flush_changed_page_bitmaps();
+/*==================================*/
+/************************************************************//**
+Delete all the bitmap files for data less than the specified LSN.
+If called with lsn == 0 (i.e. set by RESET request) or
+IB_ULONGLONG_MAX, restart the bitmap file sequence, otherwise
+continue it.
+@return 0 to indicate success, 1 for failure. */
+static
+int
+innobase_purge_changed_page_bitmaps(
+/*================================*/
+	ulonglong lsn);	/*!< in: LSN to purge files up to */
 
 static const char innobase_hton_name[]= "InnoDB";
 
@@ -2651,6 +2672,10 @@
         innobase_hton->flags=HTON_NO_FLAGS;
         innobase_hton->release_temporary_latches=innobase_release_temporary_latches;
 	innobase_hton->alter_table_flags = innobase_alter_table_flags;
+	innobase_hton->flush_changed_page_bitmaps
+		= innobase_flush_changed_page_bitmaps;
+	innobase_hton->purge_changed_page_bitmaps
+		= innobase_purge_changed_page_bitmaps;
 
 	ut_a(DATA_MYSQL_TRUE_VARCHAR == (ulint)MYSQL_TYPE_VARCHAR);
 
@@ -3270,6 +3295,36 @@
 		| HA_INPLACE_ADD_PK_INDEX_NO_READ_WRITE);
 }
 
+/************************************************************//**
+Synchronously read and parse the redo log up to the last
+checkpoint to write the changed page bitmap.
+@return 0 to indicate success.  Current implementation cannot fail. */
+static
+int
+innobase_flush_changed_page_bitmaps()
+/*=================================*/
+{
+	if (srv_track_changed_pages) {
+		os_event_reset(srv_checkpoint_completed_event);
+		log_online_follow_redo_log();
+	}
+	return 0;
+}
+
+/************************************************************//**
+Delete all the bitmap files for data less than the specified LSN.
+If called with lsn == IB_ULONGLONG_MAX (i.e. set by RESET request),
+restart the bitmap file sequence, otherwise continue it.
+@return 0 to indicate success, 1 for failure. */
+static
+int
+innobase_purge_changed_page_bitmaps(
+/*================================*/
+	ulonglong lsn)	/*!< in: LSN to purge files up to */
+{
+	return log_online_purge_changed_page_bitmaps(lsn);
+}
+
 /****************************************************************//**
 Copy the current replication position from MySQL to a transaction. */
 static
 
=== modified file 'Percona-Server/storage/innobase/include/log0online.h'
--- Percona-Server/storage/innobase/include/log0online.h	2012-11-25 09:45:24 +0000
+++ Percona-Server/storage/innobase/include/log0online.h	2012-11-25 09:45:24 +0000
@@ -59,6 +59,19 @@
 log_online_follow_redo_log();
 /*=========================*/
 
+/************************************************************//**
+Delete all the bitmap files for data less than the specified LSN.
+If called with lsn == 0 (i.e. set by RESET request) or
+IB_ULONGLONG_MAX, restart the bitmap file sequence, otherwise
+continue it.
+
+@return FALSE to indicate success, TRUE for failure. */
+UNIV_INTERN
+ibool
+log_online_purge_changed_page_bitmaps(
+/*==================================*/
+	ib_uint64_t lsn);	/*!<in: LSN to purge files up to */
+
 #define LOG_BITMAP_ITERATOR_START_LSN(i) \
 	((i).start_lsn)
 #define LOG_BITMAP_ITERATOR_END_LSN(i) \
 
=== modified file 'Percona-Server/storage/innobase/include/sync0sync.h'
--- Percona-Server/storage/innobase/include/sync0sync.h	2012-05-10 07:49:14 +0000
+++ Percona-Server/storage/innobase/include/sync0sync.h	2012-11-25 09:45:24 +0000
@@ -89,6 +89,7 @@
 extern mysql_pfs_key_t	ibuf_bitmap_mutex_key;
 extern mysql_pfs_key_t	ibuf_mutex_key;
 extern mysql_pfs_key_t	ibuf_pessimistic_insert_mutex_key;
+extern mysql_pfs_key_t	log_bmp_sys_mutex_key;
 extern mysql_pfs_key_t	log_sys_mutex_key;
 extern mysql_pfs_key_t	log_flush_order_mutex_key;
 extern mysql_pfs_key_t	kernel_mutex_key;
@@ -672,6 +673,7 @@
 #define	SYNC_TRX_LOCK_HEAP	298
 #define SYNC_TRX_SYS_HEADER	290
 #define	SYNC_PURGE_QUEUE	200
+#define SYNC_LOG_ONLINE		175
 #define SYNC_LOG		170
 #define SYNC_LOG_FLUSH_ORDER	156
 #define SYNC_RECV		168
 
=== modified file 'Percona-Server/storage/innobase/log/log0online.c'
--- Percona-Server/storage/innobase/log/log0online.c	2012-11-25 09:45:24 +0000
+++ Percona-Server/storage/innobase/log/log0online.c	2012-11-25 09:45:24 +0000
@@ -36,6 +36,11 @@
 
 enum { FOLLOW_SCAN_SIZE = 4 * (UNIV_PAGE_SIZE_MAX) };
 
+#ifdef UNIV_PFS_MUTEX
+/* Key to register log_bmp_sys->mutex with PFS */
+UNIV_INTERN mysql_pfs_key_t	log_bmp_sys_mutex_key;
+#endif /* UNIV_PFS_MUTEX */
+
 /** Log parsing and bitmap output data structure */
 struct log_bitmap_struct {
 	byte		read_buf[FOLLOW_SCAN_SIZE];
@@ -69,6 +74,7 @@
 					both the correct type and the tree does
 					not mind its overwrite during
 					rbt_next() tree traversal. */
+	mutex_t		mutex;		/*!< mutex protecting all the fields.*/
 };
 
 /* The log parsing and bitmap output struct instance */
@@ -172,6 +178,8 @@
 	byte		search_page[MODIFIED_PAGE_BLOCK_SIZE];
 	byte		*page_ptr;
 
+	ut_ad(mutex_own(&log_bmp_sys->mutex));
+
 	ut_a(space != ULINT_UNDEFINED);
 	ut_a(page_no != ULINT_UNDEFINED);
 
@@ -573,6 +581,9 @@
 
 	log_bmp_sys = ut_malloc(sizeof(*log_bmp_sys));
 
+	mutex_create(log_bmp_sys_mutex_key, &log_bmp_sys->mutex,
+		     SYNC_LOG_ONLINE);
+
 	/* Enumerate existing bitmap files to either open the last one to get
 	the last tracked LSN either to find that there are none and start
 	tracking from scratch.  */
@@ -716,6 +727,8 @@
 		free_list_node = next;
 	}
 
+	mutex_free(&log_bmp_sys->mutex);
+
 	ut_free(log_bmp_sys);
 }
 
@@ -767,6 +780,8 @@
 
 	ulint len = 0;
 
+	ut_ad(mutex_own(&log_bmp_sys->mutex));
+
 	while (ptr != end
 	       && log_bmp_sys->next_parse_lsn < log_bmp_sys->end_lsn) {
 
@@ -857,6 +872,8 @@
 	ulint actual_data_len = (end_offset >= start_offset)
 		? end_offset - start_offset : 0;
 
+	ut_ad(mutex_own(&log_bmp_sys->mutex));
+
 	ut_memcpy(log_bmp_sys->parse_buf_end, log_block + start_offset,
 		  actual_data_len);
 
@@ -881,6 +898,8 @@
 {
 	ulint block_data_len;
 
+	ut_ad(mutex_own(&log_bmp_sys->mutex));
+
 	block_data_len = log_block_get_data_len(log_block);
 
 	ut_ad(block_data_len % OS_FILE_LOG_BLOCK_SIZE == 0
@@ -907,6 +926,8 @@
 	byte* log_block_end = log_bmp_sys->read_buf
 		+ (block_end_lsn - block_start_lsn);
 
+	ut_ad(mutex_own(&log_bmp_sys->mutex));
+
 	mutex_enter(&log_sys->mutex);
 	log_group_read_log_seg(LOG_RECOVER, log_bmp_sys->read_buf,
 			       group, block_start_lsn, block_end_lsn);
@@ -969,6 +990,8 @@
 	ib_uint64_t block_start_lsn = contiguous_lsn;
 	ib_uint64_t block_end_lsn;
 
+	ut_ad(mutex_own(&log_bmp_sys->mutex));
+
 	log_bmp_sys->next_parse_lsn = log_bmp_sys->start_lsn;
 	log_bmp_sys->parse_buf_end = log_bmp_sys->parse_buf;
 
@@ -1005,6 +1028,8 @@
 {
 	ibool	success;
 
+	ut_ad(mutex_own(&log_bmp_sys->mutex));
+
 	success = os_file_write(log_bmp_sys->out.name, log_bmp_sys->out.file,
 				block,
 				(ulint)(log_bmp_sys->out.offset & 0xFFFFFFFF),
@@ -1044,6 +1069,8 @@
 	ib_rbt_node_t		*bmp_tree_node;
 	const ib_rbt_node_t	*last_bmp_tree_node;
 
+	ut_ad(mutex_own(&log_bmp_sys->mutex));
+
 	if (log_bmp_sys->out.offset >= srv_max_bitmap_file_size) {
 		log_online_rotate_bitmap_file(log_bmp_sys->start_lsn);
 	}
@@ -1090,12 +1117,15 @@
 	ib_uint64_t	contiguous_start_lsn;
 	log_group_t*	group;
 
+	mutex_enter(&log_bmp_sys->mutex);
+
 	/* 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) {
+		mutex_exit(&log_bmp_sys->mutex);
 		return;
 	}
 
@@ -1117,6 +1147,8 @@
 	log_online_write_bitmap();
 	log_bmp_sys->start_lsn = log_bmp_sys->end_lsn;
 	log_set_tracked_lsn(log_bmp_sys->start_lsn);
+
+	mutex_exit(&log_bmp_sys->mutex);
 }
 
 /*********************************************************************//**
@@ -1514,3 +1546,75 @@
 
 	return TRUE;
 }
+
+/************************************************************//**
+Delete all the bitmap files for data less than the specified LSN.
+If called with lsn == 0 (i.e. set by RESET request) or
+IB_ULONGLONG_MAX, restart the bitmap file sequence, otherwise
+continue it.
+
+@return FALSE to indicate success, TRUE for failure. */
+UNIV_INTERN
+ibool
+log_online_purge_changed_page_bitmaps(
+/*==================================*/
+	ib_uint64_t lsn)	/*!< in: LSN to purge files up to */
+{
+	log_online_bitmap_file_range_t	bitmap_files;
+	size_t				i;
+	ibool				result = FALSE;
+
+	if (lsn == 0) {
+		lsn = IB_ULONGLONG_MAX;
+	}
+
+	if (srv_track_changed_pages) {
+		/* User requests might happen with both enabled and disabled
+		tracking */
+		mutex_enter(&log_bmp_sys->mutex);
+	}
+
+	if (!log_online_setup_bitmap_file_range(&bitmap_files, 0, lsn)) {
+		if (srv_track_changed_pages) {
+			mutex_exit(&log_bmp_sys->mutex);
+		}
+		return TRUE;
+	}
+
+	if (srv_track_changed_pages && lsn >= log_bmp_sys->end_lsn) {
+		/* If we have to delete the current output file, close it
+		first. */
+		os_file_close(log_bmp_sys->out.file);
+	}
+
+	for (i = 0; i < bitmap_files.count; i++) {
+		if (bitmap_files.files[i].seq_num == 0
+		    || bitmap_files.files[i].start_lsn >= lsn) {
+			break;
+		}
+		if (!os_file_delete_if_exists(bitmap_files.files[i].name)) {
+			os_file_get_last_error(TRUE);
+			result = TRUE;
+			break;
+		}
+	}
+
+	if (srv_track_changed_pages) {
+		if (lsn > log_bmp_sys->end_lsn) {
+			if (lsn == IB_ULONGLONG_MAX) {
+				/* RESET restarts the sequence */
+				log_bmp_sys->out_seq_num = 1;
+				log_online_make_bitmap_name(0);
+			} else {
+				/* PURGE continues the sequence */
+				log_bmp_sys->out_seq_num++;
+			}
+			log_online_start_bitmap_file(log_bmp_sys->end_lsn);
+		}
+
+		mutex_exit(&log_bmp_sys->mutex);
+	}
+
+	free(bitmap_files.files);
+	return result;
+}