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

[Laurynas Biveinis]

a QA blocker

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

Merge bug 1217002 and bug 1213885 fixes from 5.1.

Mostly an automerge. Extra changes on the top in the sys_vars
testsuite:
- backport the test for innodb_log_checkpoint_now with 5.6 file-ids;
- add a test for innodb_track_redo_log_now;
- adjust the test for innodb_track_changed_pages to be skipped on
  debug builds.

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'Percona-Server/mysql-test/r/percona_server_variables_debug.result'
--- Percona-Server/mysql-test/r/percona_server_variables_debug.result	2013-09-09 06:59:26 +0000
+++ Percona-Server/mysql-test/r/percona_server_variables_debug.result	2013-09-09 16:36:44 +0000
@@ -134,6 +134,7 @@
 INNODB_LOCK_WAIT_TIMEOUT
 INNODB_LOG_BLOCK_SIZE
 INNODB_LOG_BUFFER_SIZE
+INNODB_LOG_CHECKPOINT_NOW
 INNODB_LOG_FILES_IN_GROUP
 INNODB_LOG_FILE_SIZE
 INNODB_LOG_GROUP_HOME_DIR
@@ -176,6 +177,7 @@
 INNODB_THREAD_CONCURRENCY_TIMER_BASED
 INNODB_THREAD_SLEEP_DELAY
 INNODB_TRACK_CHANGED_PAGES
+INNODB_TRACK_REDO_LOG_NOW
 INNODB_TRX_PURGE_VIEW_UPDATE_ONLY_DEBUG
 INNODB_TRX_RSEG_N_SLOTS_DEBUG
 INNODB_USE_ATOMIC_WRITES

=== 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-02-07 07:32:03 +0000
+++ Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_debug.result	2013-09-09 16:36:44 +0000
@@ -22,3 +22,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="row_merge_rename_tables_between_renames 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:44 +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-02-07 07:32:03 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_debug.test	2013-09-09 16:36:44 +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;
@@ -55,3 +56,48 @@
 --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="row_merge_rename_tables_between_renames 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

=== added file 'Percona-Server/mysql-test/suite/sys_vars/r/innodb_log_checkpoint_now_basic.result'
--- Percona-Server/mysql-test/suite/sys_vars/r/innodb_log_checkpoint_now_basic.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/r/innodb_log_checkpoint_now_basic.result	2013-09-09 16:36:44 +0000
@@ -0,0 +1,79 @@
+SET @start_global_value = @@global.innodb_log_checkpoint_now;
+SELECT @start_global_value;
+@start_global_value
+0
+select @@global.innodb_log_checkpoint_now in (0, 1);
+@@global.innodb_log_checkpoint_now in (0, 1)
+1
+select @@global.innodb_log_checkpoint_now;
+@@global.innodb_log_checkpoint_now
+0
+select @@session.innodb_log_checkpoint_now;
+ERROR HY000: Variable 'innodb_log_checkpoint_now' is a GLOBAL variable
+show global variables like 'innodb_log_checkpoint_now';
+Variable_name	Value
+innodb_log_checkpoint_now	OFF
+show session variables like 'innodb_log_checkpoint_now';
+Variable_name	Value
+innodb_log_checkpoint_now	OFF
+select * from information_schema.global_variables where variable_name='innodb_log_checkpoint_now';
+VARIABLE_NAME	VARIABLE_VALUE
+INNODB_LOG_CHECKPOINT_NOW	OFF
+select * from information_schema.session_variables where variable_name='innodb_log_checkpoint_now';
+VARIABLE_NAME	VARIABLE_VALUE
+INNODB_LOG_CHECKPOINT_NOW	OFF
+set global innodb_log_checkpoint_now=1;
+select @@global.innodb_log_checkpoint_now;
+@@global.innodb_log_checkpoint_now
+0
+select * from information_schema.global_variables where variable_name='innodb_log_checkpoint_now';
+VARIABLE_NAME	VARIABLE_VALUE
+INNODB_LOG_CHECKPOINT_NOW	OFF
+select * from information_schema.session_variables where variable_name='innodb_log_checkpoint_now';
+VARIABLE_NAME	VARIABLE_VALUE
+INNODB_LOG_CHECKPOINT_NOW	OFF
+set @@global.innodb_log_checkpoint_now=0;
+select @@global.innodb_log_checkpoint_now;
+@@global.innodb_log_checkpoint_now
+0
+select * from information_schema.global_variables where variable_name='innodb_log_checkpoint_now';
+VARIABLE_NAME	VARIABLE_VALUE
+INNODB_LOG_CHECKPOINT_NOW	OFF
+select * from information_schema.session_variables where variable_name='innodb_log_checkpoint_now';
+VARIABLE_NAME	VARIABLE_VALUE
+INNODB_LOG_CHECKPOINT_NOW	OFF
+set global innodb_log_checkpoint_now=ON;
+select @@global.innodb_log_checkpoint_now;
+@@global.innodb_log_checkpoint_now
+0
+select * from information_schema.global_variables where variable_name='innodb_log_checkpoint_now';
+VARIABLE_NAME	VARIABLE_VALUE
+INNODB_LOG_CHECKPOINT_NOW	OFF
+select * from information_schema.session_variables where variable_name='innodb_log_checkpoint_now';
+VARIABLE_NAME	VARIABLE_VALUE
+INNODB_LOG_CHECKPOINT_NOW	OFF
+set global innodb_log_checkpoint_now=OFF;
+select @@global.innodb_log_checkpoint_now;
+@@global.innodb_log_checkpoint_now
+0
+select * from information_schema.global_variables where variable_name='innodb_log_checkpoint_now';
+VARIABLE_NAME	VARIABLE_VALUE
+INNODB_LOG_CHECKPOINT_NOW	OFF
+select * from information_schema.session_variables where variable_name='innodb_log_checkpoint_now';
+VARIABLE_NAME	VARIABLE_VALUE
+INNODB_LOG_CHECKPOINT_NOW	OFF
+set session innodb_log_checkpoint_now='some';
+ERROR HY000: Variable 'innodb_log_checkpoint_now' is a GLOBAL variable and should be set with SET GLOBAL
+set @@session.innodb_log_checkpoint_now='some';
+ERROR HY000: Variable 'innodb_log_checkpoint_now' is a GLOBAL variable and should be set with SET GLOBAL
+set global innodb_log_checkpoint_now=1.1;
+ERROR 42000: Incorrect argument type to variable 'innodb_log_checkpoint_now'
+set global innodb_log_checkpoint_now='foo';
+ERROR 42000: Variable 'innodb_log_checkpoint_now' can't be set to the value of 'foo'
+set global innodb_log_checkpoint_now=-2;
+set global innodb_log_checkpoint_now=1e1;
+ERROR 42000: Incorrect argument type to variable 'innodb_log_checkpoint_now'
+SET @@global.innodb_log_checkpoint_now = @start_global_value;
+SELECT @@global.innodb_log_checkpoint_now;
+@@global.innodb_log_checkpoint_now
+0

=== 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:44 +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;

=== added file 'Percona-Server/mysql-test/suite/sys_vars/t/innodb_log_checkpoint_now_basic.test'
--- Percona-Server/mysql-test/suite/sys_vars/t/innodb_log_checkpoint_now_basic.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/t/innodb_log_checkpoint_now_basic.test	2013-09-09 16:36:44 +0000
@@ -0,0 +1,68 @@
+--source include/have_innodb.inc
+--source include/have_debug.inc
+
+SET @start_global_value = @@global.innodb_log_checkpoint_now;
+SELECT @start_global_value;
+
+#
+# exists as global only
+#
+select @@global.innodb_log_checkpoint_now in (0, 1);
+select @@global.innodb_log_checkpoint_now;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@session.innodb_log_checkpoint_now;
+show global variables like 'innodb_log_checkpoint_now';
+show session variables like 'innodb_log_checkpoint_now';
+select * from information_schema.global_variables where variable_name='innodb_log_checkpoint_now';
+select * from information_schema.session_variables where variable_name='innodb_log_checkpoint_now';
+
+#
+# show that it's writable
+#
+set global innodb_log_checkpoint_now=1;
+# Should always be OFF
+select @@global.innodb_log_checkpoint_now;
+select * from information_schema.global_variables where variable_name='innodb_log_checkpoint_now';
+select * from information_schema.session_variables where variable_name='innodb_log_checkpoint_now';
+
+set @@global.innodb_log_checkpoint_now=0;
+# Should always be OFF
+select @@global.innodb_log_checkpoint_now;
+select * from information_schema.global_variables where variable_name='innodb_log_checkpoint_now';
+select * from information_schema.session_variables where variable_name='innodb_log_checkpoint_now';
+
+set global innodb_log_checkpoint_now=ON;
+# Should always be OFF
+select @@global.innodb_log_checkpoint_now;
+select * from information_schema.global_variables where variable_name='innodb_log_checkpoint_now';
+select * from information_schema.session_variables where variable_name='innodb_log_checkpoint_now';
+
+set global innodb_log_checkpoint_now=OFF;
+# Should always be OFF
+select @@global.innodb_log_checkpoint_now;
+select * from information_schema.global_variables where variable_name='innodb_log_checkpoint_now';
+select * from information_schema.session_variables where variable_name='innodb_log_checkpoint_now';
+
+--error ER_GLOBAL_VARIABLE
+set session innodb_log_checkpoint_now='some';
+
+--error ER_GLOBAL_VARIABLE
+set @@session.innodb_log_checkpoint_now='some';
+
+#
+# incorrect types
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set global innodb_log_checkpoint_now=1.1;
+--error ER_WRONG_VALUE_FOR_VAR
+set global innodb_log_checkpoint_now='foo';
+set global innodb_log_checkpoint_now=-2;
+--error ER_WRONG_TYPE_FOR_VAR
+set global innodb_log_checkpoint_now=1e1;
+
+#
+# Cleanup
+#
+
+SET @@global.innodb_log_checkpoint_now = @start_global_value;
+SELECT @@global.innodb_log_checkpoint_now;

=== 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:44 +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:44 +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.c'
--- Percona-Server/storage/innobase/fil/fil0fil.c	2013-08-14 03:52:04 +0000
+++ Percona-Server/storage/innobase/fil/fil0fil.c	2013-09-09 16:36:44 +0000
@@ -2266,6 +2266,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-09-06 13:24:59 +0000
+++ Percona-Server/storage/innobase/handler/ha_innodb.cc	2013-09-09 16:36:44 +0000
@@ -12557,6 +12557,63 @@
 	return(thd_get_thread_id((const THD*) thd));
 }
 
+#ifdef UNIV_DEBUG
+static my_bool	innodb_log_checkpoint_now = TRUE;
+
+/****************************************************************//**
+Force innodb to checkpoint. */
+static
+void
+checkpoint_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) {
+		while (log_sys->last_checkpoint_lsn < log_sys->lsn) {
+			log_make_checkpoint_at(IB_ULONGLONG_MAX, TRUE);
+			fil_flush_file_spaces(FIL_LOG);
+		}
+		fil_write_flushed_lsn_to_data_files(log_sys->lsn, 0);
+		fil_flush_file_spaces(FIL_TABLESPACE);
+	}
+}
+
+static my_bool	innodb_track_redo_log_now = TRUE;
+
+/****************************************************************//**
+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 */
 
 static SHOW_VAR innodb_status_variables_export[]= {
   {"Innodb",                   (char*) &show_innodb_vars, SHOW_FUNC},
@@ -13026,9 +13083,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,
@@ -13248,6 +13311,21 @@
   "[Deprecated option] no effect",
   NULL, NULL, 0, 0, 1, 0);
 
+#ifdef UNIV_DEBUG
+
+static MYSQL_SYSVAR_BOOL(log_checkpoint_now, innodb_log_checkpoint_now,
+  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_BOOL(locking_fake_changes, srv_fake_changes_locks,
   PLUGIN_VAR_NOCMDARG,
   "###EXPERIMENTAL### if enabled, transactions will get S row locks instead "
@@ -13379,6 +13457,10 @@
   MYSQL_SYSVAR(locking_fake_changes),
   MYSQL_SYSVAR(merge_sort_block_size),
   MYSQL_SYSVAR(print_all_deadlocks),
+#ifdef UNIV_DEBUG
+  MYSQL_SYSVAR(log_checkpoint_now),
+  MYSQL_SYSVAR(track_redo_log_now),
+#endif /* UNIV_DEBUG */
   NULL
 };
 

=== modified file 'Percona-Server/storage/innobase/log/log0recv.c'
--- Percona-Server/storage/innobase/log/log0recv.c	2013-08-14 03:52:04 +0000
+++ Percona-Server/storage/innobase/log/log0recv.c	2013-09-09 16:36:44 +0000
@@ -1266,7 +1266,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/row/row0merge.c'
--- Percona-Server/storage/innobase/row/row0merge.c	2013-08-14 03:52:04 +0000
+++ Percona-Server/storage/innobase/row/row0merge.c	2013-09-09 16:36:44 +0000
@@ -63,6 +63,14 @@
 # define posix_fadvise(fd, offset, len, advice) /* nothing */
 #endif /* __WIN__ */
 
+#ifdef __WIN__
+/* error LNK2001: unresolved external symbol _debug_sync_C_callback_ptr */
+# define DEBUG_SYNC_C(dummy) ((void) 0)
+#else
+# include "m_string.h" /* for my_sys.h */
+# include "my_sys.h" /* DEBUG_SYNC_C */
+#endif
+
 #ifdef UNIV_DEBUG
 /** Set these in order ot enable debug printout. */
 /* @{ */
@@ -2593,8 +2601,15 @@
 	/* The following calls will also rename the .ibd data files if
 	the tables are stored in a single-table tablespace */
 
-	if (!dict_table_rename_in_cache(old_table, tmp_name, FALSE)
-	    || !dict_table_rename_in_cache(new_table, old_name, FALSE)) {
+	if (!dict_table_rename_in_cache(old_table, tmp_name, FALSE)) {
+
+		err = DB_ERROR;
+		goto err_exit;
+	}
+
+	DEBUG_SYNC_C("row_merge_rename_tables_between_renames");
+
+	if (!dict_table_rename_in_cache(new_table, old_name, FALSE)) {
 
 		err = DB_ERROR;
 		goto err_exit;

=== modified file 'Percona-Server/storage/innobase/srv/srv0srv.c'
--- Percona-Server/storage/innobase/srv/srv0srv.c	2013-09-06 13:24:59 +0000
+++ Percona-Server/storage/innobase/srv/srv0srv.c	2013-09-09 16:36:44 +0000
@@ -3184,6 +3184,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? */