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

[Laurynas Biveinis]

A QA blocker.

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

Merge bug 1217002 and bug 1213885 fixes from 5.5. The only change
from the 5.5 version is that the debug sync point is moved to
commit_cache_rebuild and renamed to commit_cache_rebuild_middle to
account for 5.6 InnoDB ALTER TABLE refactorings.

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_debug.result'
--- Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_debug.result	2013-05-09 19:43:37 +0000
+++ Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_debug.result	2013-09-09 16:36:50 +0000
@@ -23,3 +23,17 @@
 INSERT INTO t1 SELECT x FROM t1;
 3rd restart
 DROP TABLE t1;
+CREATE TABLE t1 (x INT NOT NULL UNIQUE KEY) ENGINE=InnoDB;
+INSERT INTO t1 VALUES(5);
+SET @@GLOBAL.innodb_track_changed_pages=FALSE;
+SET @@GLOBAL.innodb_log_checkpoint_now=TRUE;
+RENAME TABLE t1 TO t2;
+SET DEBUG_SYNC="commit_cache_rebuild_middle SIGNAL alter_table_ready WAIT_FOR finish_alter_table";
+ALTER TABLE t2 ADD PRIMARY KEY(x);
+SET DEBUG_SYNC="now WAIT_FOR alter_table_ready";
+SET @@GLOBAL.innodb_log_checkpoint_now=TRUE;
+SET @@GLOBAL.innodb_track_changed_pages=TRUE;
+SET @@GLOBAL.innodb_track_redo_log_now=TRUE;
+SET DEBUG_SYNC="now SIGNAL finish_alter_table";
+SET DEBUG_SYNC="RESET";
+DROP TABLE t2;

=== modified file 'Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_debug-master.opt'
--- Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_debug-master.opt	2013-02-07 07:32:03 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_debug-master.opt	2013-09-09 16:36:50 +0000
@@ -1,1 +1,1 @@
---innodb_track_changed_pages=TRUE --innodb_log_file_size=5M
+--innodb_track_changed_pages=TRUE --innodb_log_file_size=5M --innodb-file-per-table

=== modified file 'Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_debug.test'
--- Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_debug.test	2013-05-09 19:43:37 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_debug.test	2013-09-09 16:36:50 +0000
@@ -3,6 +3,7 @@
 #
 --source include/have_debug.inc
 --source include/have_innodb.inc
+--source include/count_sessions.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1;
@@ -56,3 +57,52 @@
 --source include/restart_mysqld.inc
 
 DROP TABLE t1;
+
+#
+# Test for bug 1217002 (RENAME/DROP crashes with innodb_track_changed_pages)
+#
+CREATE TABLE t1 (x INT NOT NULL UNIQUE KEY) ENGINE=InnoDB;
+INSERT INTO t1 VALUES(5);
+
+# 1. Pause the log tracking thread
+SET @@GLOBAL.innodb_track_changed_pages=FALSE;
+SET @@GLOBAL.innodb_log_checkpoint_now=TRUE;
+
+# 2. Rename a table to log a MLOG_FILE_RENAME operation
+RENAME TABLE t1 TO t2;
+
+# 3. Start an ALTER TABLE and stop it after the table -> temp table rename
+--connect (con2,localhost,root,,)
+--connection default
+
+SET DEBUG_SYNC="commit_cache_rebuild_middle SIGNAL alter_table_ready WAIT_FOR finish_alter_table";
+
+send ALTER TABLE t2 ADD PRIMARY KEY(x);
+
+# 4. Force a checkpoint and resume the log tracker thread, so that it misapplies the t1 > t2 rename.
+--connection con2
+
+SET DEBUG_SYNC="now WAIT_FOR alter_table_ready";
+
+SET @@GLOBAL.innodb_log_checkpoint_now=TRUE;
+SET @@GLOBAL.innodb_track_changed_pages=TRUE;
+
+# 5. Force the log tracker to catch up.
+SET @@GLOBAL.innodb_track_redo_log_now=TRUE;
+
+# 6. Finish the ALTER TABLE, which then crashes if the bug is present.
+SET DEBUG_SYNC="now SIGNAL finish_alter_table";
+
+--connection default
+reap;
+SET DEBUG_SYNC="RESET";
+
+disconnect con2;
+
+DROP TABLE t2;
+
+--source include/wait_until_count_sessions.inc
+
+# SET DEBUG_SYNC="commit_cache_rebuild_middle SIGNAL alter_table_ready WAIT_FOR finish_alter_table";
+
+# send ALTER TABLE t2 ADD COLUMN y INT AFTER x, ALGORITHM=INPLACE;

=== added file 'Percona-Server/mysql-test/suite/sys_vars/r/innodb_track_redo_log_now_basic.result'
--- Percona-Server/mysql-test/suite/sys_vars/r/innodb_track_redo_log_now_basic.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/r/innodb_track_redo_log_now_basic.result	2013-09-09 16:36:50 +0000
@@ -0,0 +1,28 @@
+SELECT @@GLOBAL.innodb_track_redo_log_now;
+@@GLOBAL.innodb_track_redo_log_now
+0
+SET @@GLOBAL.innodb_track_redo_log_now=1;
+SELECT @@GLOBAL.innodb_track_redo_log_now;
+@@GLOBAL.innodb_track_redo_log_now
+0
+SET @@GLOBAL.innodb_track_redo_log_now=0;
+SELECT @@GLOBAL.innodb_track_redo_log_now;
+@@GLOBAL.innodb_track_redo_log_now
+0
+SET @@GLOBAL.innodb_track_redo_log_now=ON;
+SELECT @@GLOBAL.innodb_track_redo_log_now;
+@@GLOBAL.innodb_track_redo_log_now
+0
+SET @@GLOBAL.innodb_track_redo_log_now=OFF;
+SELECT @@GLOBAL.innodb_track_redo_log_now;
+@@GLOBAL.innodb_track_redo_log_now
+0
+SET @@SESSION.innodb_track_redo_log_now=ON;
+ERROR HY000: Variable 'innodb_track_redo_log_now' is a GLOBAL variable and should be set with SET GLOBAL
+SET @@GLOBAL.innodb_track_redo_log_now=1.1;
+ERROR 42000: Incorrect argument type to variable 'innodb_track_redo_log_now'
+SET @@GLOBAL.innodb_track_redo_log_now='foo';
+ERROR 42000: Variable 'innodb_track_redo_log_now' can't be set to the value of 'foo'
+SET @@GLOBAL.innodb_track_redo_log_now=1e1;
+ERROR 42000: Incorrect argument type to variable 'innodb_track_redo_log_now'
+SET @@GLOBAL.innodb_track_redo_log_now=default;

=== modified 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	2012-08-22 07:21:28 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/t/innodb_track_changed_pages_basic.test	2013-09-09 16:36:50 +0000
@@ -1,6 +1,7 @@
 # Tests for innodb_track_changed_pages variable
 
 --source include/have_innodb.inc
+--source include/have_nodebug.inc
 
 SELECT COUNT(@@GLOBAL.innodb_track_changed_pages);
 

=== added file 'Percona-Server/mysql-test/suite/sys_vars/t/innodb_track_redo_log_now_basic.test'
--- Percona-Server/mysql-test/suite/sys_vars/t/innodb_track_redo_log_now_basic.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/t/innodb_track_redo_log_now_basic.test	2013-09-09 16:36:50 +0000
@@ -0,0 +1,27 @@
+# A global BOOL variable
+
+--source include/have_innodb.inc
+--source include/have_debug.inc
+
+SELECT @@GLOBAL.innodb_track_redo_log_now;
+
+SET @@GLOBAL.innodb_track_redo_log_now=1;
+SELECT @@GLOBAL.innodb_track_redo_log_now;
+SET @@GLOBAL.innodb_track_redo_log_now=0;
+SELECT @@GLOBAL.innodb_track_redo_log_now;
+SET @@GLOBAL.innodb_track_redo_log_now=ON;
+SELECT @@GLOBAL.innodb_track_redo_log_now;
+SET @@GLOBAL.innodb_track_redo_log_now=OFF;
+SELECT @@GLOBAL.innodb_track_redo_log_now;
+
+--error ER_GLOBAL_VARIABLE
+SET @@SESSION.innodb_track_redo_log_now=ON;
+
+--error ER_WRONG_TYPE_FOR_VAR
+SET @@GLOBAL.innodb_track_redo_log_now=1.1;
+--error ER_WRONG_VALUE_FOR_VAR
+SET @@GLOBAL.innodb_track_redo_log_now='foo';
+--error ER_WRONG_TYPE_FOR_VAR
+SET @@GLOBAL.innodb_track_redo_log_now=1e1;
+
+SET @@GLOBAL.innodb_track_redo_log_now=default;

=== modified file 'Percona-Server/storage/innobase/fil/fil0fil.cc'
--- Percona-Server/storage/innobase/fil/fil0fil.cc	2013-08-14 03:57:21 +0000
+++ Percona-Server/storage/innobase/fil/fil0fil.cc	2013-09-09 16:36:50 +0000
@@ -2365,6 +2365,11 @@
 	*/
 	if (!space_id) {
 		return(ptr);
+	} else {
+		/* Only replay file ops during recovery.  This is a
+		release-build assert to minimize any data loss risk by a
+		misapplied file operation.  */
+		ut_a(recv_recovery_is_on());
 	}
 
 	/* Let us try to perform the file operation, if sensible. Note that

=== modified file 'Percona-Server/storage/innobase/handler/ha_innodb.cc'
--- Percona-Server/storage/innobase/handler/ha_innodb.cc	2013-08-30 13:23:53 +0000
+++ Percona-Server/storage/innobase/handler/ha_innodb.cc	2013-09-09 16:36:50 +0000
@@ -15834,6 +15834,7 @@
 static my_bool	innodb_purge_run_now = TRUE;
 static my_bool	innodb_purge_stop_now = TRUE;
 static my_bool	innodb_log_checkpoint_now = TRUE;
+static my_bool	innodb_track_redo_log_now = TRUE;
 
 /****************************************************************//**
 Set the purge state to RUN. If purge is disabled then it
@@ -15907,6 +15908,31 @@
 		fil_flush_file_spaces(FIL_TABLESPACE);
 	}
 }
+
+/****************************************************************//**
+Force log tracker to track the log synchronously.  */
+static
+void
+track_redo_log_now_set(
+/*===================*/
+	THD*				thd	/*!< in: thread handle */
+					__attribute__((unused)),
+	struct st_mysql_sys_var*	var	/*!< in: pointer to system
+						  variable */
+					__attribute__((unused)),
+	void*				var_ptr	/*!< out: where the formal
+						  string goes */
+					__attribute__((unused)),
+	const void*			save)	/*!< in: immediate result from
+						  check function */
+{
+	if (*(my_bool*) save && srv_track_changed_pages) {
+
+		log_online_follow_redo_log();
+	}
+}
+
+
 #endif /* UNIV_DEBUG */
 
 /***********************************************************************
@@ -15964,7 +15990,6 @@
 }
 
 
-
 /***********************************************************************
 Find and retrieve the size of the current result
 @return number of matching rows */
@@ -16162,6 +16187,12 @@
   PLUGIN_VAR_OPCMDARG,
   "Force checkpoint now",
   NULL, checkpoint_now_set, FALSE);
+
+static MYSQL_SYSVAR_BOOL(track_redo_log_now,
+  innodb_track_redo_log_now,
+  PLUGIN_VAR_OPCMDARG,
+  "Force log tracker to catch up with checkpoint now",
+  NULL, track_redo_log_now_set, FALSE);
 #endif /* UNIV_DEBUG */
 
 static MYSQL_SYSVAR_ULONG(purge_batch_size, srv_purge_batch_size,
@@ -16829,9 +16860,15 @@
    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);
+  PLUGIN_VAR_NOCMDARG
+#ifndef UNIV_DEBUG
+  /* Make this variable dynamic for debug builds to
+  provide a testcase sync facility */
+  | PLUGIN_VAR_READONLY
+#endif
+  ,
+  "Track the redo log for changed pages and output a changed page bitmap",
+  NULL, NULL, FALSE);
 
 static MYSQL_SYSVAR_ULONGLONG(max_bitmap_file_size, srv_max_bitmap_file_size,
     PLUGIN_VAR_RQCMDARG,
@@ -17111,6 +17148,7 @@
   MYSQL_SYSVAR(purge_run_now),
   MYSQL_SYSVAR(purge_stop_now),
   MYSQL_SYSVAR(log_checkpoint_now),
+  MYSQL_SYSVAR(track_redo_log_now),
 #endif /* UNIV_DEBUG */
 #if defined UNIV_DEBUG || defined UNIV_PERF_DEBUG
   MYSQL_SYSVAR(page_hash_locks),

=== modified file 'Percona-Server/storage/innobase/handler/handler0alter.cc'
--- Percona-Server/storage/innobase/handler/handler0alter.cc	2013-08-06 15:16:34 +0000
+++ Percona-Server/storage/innobase/handler/handler0alter.cc	2013-09-09 16:36:50 +0000
@@ -4892,6 +4892,8 @@
 		ctx->old_table, ctx->tmp_name, FALSE);
 	ut_a(error == DB_SUCCESS);
 
+	DEBUG_SYNC_C("commit_cache_rebuild_middle");
+
 	error = dict_table_rename_in_cache(
 		ctx->new_table, old_name, FALSE);
 	ut_a(error == DB_SUCCESS);

=== modified file 'Percona-Server/storage/innobase/log/log0recv.cc'
--- Percona-Server/storage/innobase/log/log0recv.cc	2013-08-14 03:57:21 +0000
+++ Percona-Server/storage/innobase/log/log0recv.cc	2013-09-09 16:36:50 +0000
@@ -1313,7 +1313,8 @@
 		break;
 	case MLOG_FILE_RENAME:
 		ptr = fil_op_log_parse_or_replay(ptr, end_ptr, type,
-						 space_id, 0);
+						 (recv_recovery_is_on()
+						  ? space_id : 0), 0);
 		break;
 	case MLOG_FILE_CREATE:
 	case MLOG_FILE_DELETE:

=== modified file 'Percona-Server/storage/innobase/srv/srv0srv.cc'
--- Percona-Server/storage/innobase/srv/srv0srv.cc	2013-09-02 12:24:08 +0000
+++ Percona-Server/storage/innobase/srv/srv0srv.cc	2013-09-09 16:36:50 +0000
@@ -2218,6 +2218,12 @@
 		os_event_wait(srv_checkpoint_completed_event);
 		os_event_reset(srv_checkpoint_completed_event);
 
+#ifdef UNIV_DEBUG
+		if (!srv_track_changed_pages) {
+			continue;
+		}
+#endif
+
 		if (srv_shutdown_state < SRV_SHUTDOWN_LAST_PHASE) {
 			if (!log_online_follow_redo_log()) {
 				/* TODO: sync with I_S log tracking status? */