Merge lp:~vlad-lesin/percona-server/i_s-innodb-log-tracking-status into lp:percona-server/5.1

[Vlad Lesin]

I_S.INNODB_LOG_TRACKING_STATUS - the table for showing current status of log tracking.

Here is the more detailed description of the table:
https://blueprints.launchpad.net/percona-server/+spec/innodb-log-tracking-status

This code was tested locally and all tests passed except "main.partition_rename_longfilename" which fails in the both with and without patch causes.

Here is unfinished jenkins tests:
http://jenkins.percona.com/view/PS%205.1/job/percona-server-5.1-param/358/

[Laurynas Biveinis (laurynas-biveinis)]

     I think that this table should have an additional field, see the
     whiteboard of the blueprint for more info. I don't know if it
     should be implemented in this MP or as a follow-up, we can discuss.

     Diff lines 191--203 have a verbose way to restart server for
     MTR. What doe the additional variables buy us? And server id is
     guaranteed to be 1 for a non-replication test case.

review: Needs Information

[Laurynas Biveinis (laurynas-biveinis)]

Re. server restart, another option is to have a separate test case for the empty I_S table with its own -master.opt file.

[Vlad Lesin (vlad-lesin)]

> Re. server restart, another option is to have a separate test case for the
> empty I_S table with its own -master.opt file.

Done.

[Laurynas Biveinis (laurynas-biveinis)]

     Please update the blueprint (and maybe create a new one) to
     reflect what we decided on the start LSN of the last continuous
     tracked range (what's in the whiteboard currently).

     The "--innodb" option in
     percona_log_tracking_status_empty-master.opt is redundant.

     The log_get_tracked_lsn() function should be kept inlinable, thus
     please move its implementation to log0log.ic.

review: Needs Fixing

[lp:~vlad-lesin/percona-server/i_s-innodb-log-tracking-status]

458. By Vlad Lesin on 2012-11-01

I_S.INNODB_LOG_TRACKING_STATUS - the table for showing
current status of log tracking.

Here is the more detailed description of the table:
https://blueprints.launchpad.net/percona-server/+spec/innodb-log-tracking-status

459. By Vlad Lesin on 2012-11-08

Holes detection is added.

[Laurynas Biveinis (laurynas-biveinis)]

Bug 1108613 implements parts of this MP.

Unmerged revisions

459. By Vlad Lesin on 2012-11-08

Holes detection is added.

458. By Vlad Lesin on 2012-11-01

I_S.INNODB_LOG_TRACKING_STATUS - the table for showing
current status of log tracking.

Here is the more detailed description of the table:
https://blueprints.launchpad.net/percona-server/+spec/innodb-log-tracking-status

=== modified file 'Percona-Server/mysql-test/r/information_schema.result'
--- Percona-Server/mysql-test/r/information_schema.result	2012-08-15 14:05:13 +0000
+++ Percona-Server/mysql-test/r/information_schema.result	2012-11-08 15:35:48 +0000
@@ -93,10 +93,14 @@
 INNODB_CMP_RESET
 INNODB_CMPMEM
 INNODB_INDEX_STATS
-INNODB_SYS_INDEXES
+INNODB_LOG_TRACKING_STATUS
 INNODB_BUFFER_POOL_PAGES_BLOB
 INNODB_CMPMEM_RESET
+<<<<<<< TREE
 INNODB_LOCKS
+=======
+INNODB_SYS_INDEXES
+>>>>>>> MERGE-SOURCE
 columns_priv
 db
 event
@@ -1345,10 +1349,14 @@
 INNODB_CMP_RESET	page_size
 INNODB_CMPMEM	page_size
 INNODB_INDEX_STATS	table_schema
-INNODB_SYS_INDEXES	TABLE_ID
+INNODB_LOG_TRACKING_STATUS	log_tracking_lsn
 INNODB_BUFFER_POOL_PAGES_BLOB	space_id
 INNODB_CMPMEM_RESET	page_size
+<<<<<<< TREE
 INNODB_LOCKS	lock_id
+=======
+INNODB_SYS_INDEXES	TABLE_ID
+>>>>>>> MERGE-SOURCE
 SELECT t.table_name, c1.column_name
 FROM information_schema.tables t
 INNER JOIN
@@ -1414,10 +1422,14 @@
 INNODB_CMP_RESET	page_size
 INNODB_CMPMEM	page_size
 INNODB_INDEX_STATS	table_schema
-INNODB_SYS_INDEXES	TABLE_ID
+INNODB_LOG_TRACKING_STATUS	log_tracking_lsn
 INNODB_BUFFER_POOL_PAGES_BLOB	space_id
 INNODB_CMPMEM_RESET	page_size
+<<<<<<< TREE
 INNODB_LOCKS	lock_id
+=======
+INNODB_SYS_INDEXES	TABLE_ID
+>>>>>>> MERGE-SOURCE
 SELECT MAX(table_name) FROM information_schema.tables WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test');
 MAX(table_name)
 XTRADB_ADMIN_COMMAND
@@ -1508,6 +1520,7 @@
 INNODB_INDEX_STATS	information_schema.INNODB_INDEX_STATS	1
 INNODB_LOCKS	information_schema.INNODB_LOCKS	1
 INNODB_LOCK_WAITS	information_schema.INNODB_LOCK_WAITS	1
+INNODB_LOG_TRACKING_STATUS	information_schema.INNODB_LOG_TRACKING_STATUS	1
 INNODB_RSEG	information_schema.INNODB_RSEG	1
 INNODB_SYS_INDEXES	information_schema.INNODB_SYS_INDEXES	1
 INNODB_SYS_STATS	information_schema.INNODB_SYS_STATS	1

=== modified file 'Percona-Server/mysql-test/r/information_schema_db.result'
--- Percona-Server/mysql-test/r/information_schema_db.result	2012-08-15 14:05:13 +0000
+++ Percona-Server/mysql-test/r/information_schema_db.result	2012-11-08 15:35:48 +0000
@@ -55,10 +55,14 @@
 INNODB_CMP_RESET
 INNODB_CMPMEM
 INNODB_INDEX_STATS
-INNODB_SYS_INDEXES
+INNODB_LOG_TRACKING_STATUS
 INNODB_BUFFER_POOL_PAGES_BLOB
 INNODB_CMPMEM_RESET
+<<<<<<< TREE
 INNODB_LOCKS
+=======
+INNODB_SYS_INDEXES
+>>>>>>> MERGE-SOURCE
 show tables from INFORMATION_SCHEMA like 'T%';
 Tables_in_information_schema (T%)
 TABLES

=== modified file 'Percona-Server/mysql-test/r/mysqlshow.result'
--- Percona-Server/mysql-test/r/mysqlshow.result	2012-08-15 14:05:13 +0000
+++ Percona-Server/mysql-test/r/mysqlshow.result	2012-11-08 15:35:48 +0000
@@ -129,10 +129,14 @@
 | INNODB_CMP_RESET                      |
 | INNODB_CMPMEM                         |
 | INNODB_INDEX_STATS                    |
-| INNODB_SYS_INDEXES                    |
+| INNODB_LOG_TRACKING_STATUS            |
 | INNODB_BUFFER_POOL_PAGES_BLOB         |
 | INNODB_CMPMEM_RESET                   |
+<<<<<<< TREE
 | INNODB_LOCKS                          |
+=======
+| INNODB_SYS_INDEXES                    |
+>>>>>>> MERGE-SOURCE
 +---------------------------------------+
 Database: INFORMATION_SCHEMA
 +---------------------------------------+
@@ -188,10 +192,14 @@
 | INNODB_CMP_RESET                      |
 | INNODB_CMPMEM                         |
 | INNODB_INDEX_STATS                    |
-| INNODB_SYS_INDEXES                    |
+| INNODB_LOG_TRACKING_STATUS            |
 | INNODB_BUFFER_POOL_PAGES_BLOB         |
 | INNODB_CMPMEM_RESET                   |
+<<<<<<< TREE
 | INNODB_LOCKS                          |
+=======
+| INNODB_SYS_INDEXES                    |
+>>>>>>> MERGE-SOURCE
 +---------------------------------------+
 Wildcard: inf_rmation_schema
 +--------------------+

=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/r/percona_log_tracking_status.result'
--- Percona-Server/mysql-test/suite/innodb_plugin/r/percona_log_tracking_status.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/r/percona_log_tracking_status.result	2012-11-08 15:35:48 +0000
@@ -0,0 +1,9 @@
+set @last_tracked_lsn=
+(SELECT log_tracking_lsn
+FROM INFORMATION_SCHEMA.INNODB_LOG_TRACKING_STATUS);
+CREATE TABLE T1 (F1 CHAR(255)) ENGINE=INNODB;
+SELECT log_tracking_lsn > @last_tracked_lsn
+FROM INFORMATION_SCHEMA.INNODB_LOG_TRACKING_STATUS;
+log_tracking_lsn > @last_tracked_lsn
+1
+DROP TABLE T1;

=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/r/percona_log_tracking_status_empty.result'
--- Percona-Server/mysql-test/suite/innodb_plugin/r/percona_log_tracking_status_empty.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/r/percona_log_tracking_status_empty.result	2012-11-08 15:35:48 +0000
@@ -0,0 +1,2 @@
+SELECT * FROM INFORMATION_SCHEMA.INNODB_LOG_TRACKING_STATUS;
+log_tracking_lsn	log_tracking_max_lsn_age

=== modified file 'Percona-Server/mysql-test/suite/innodb_plugin/r/percona_skip_innodb_i_s.result'
--- Percona-Server/mysql-test/suite/innodb_plugin/r/percona_skip_innodb_i_s.result	2012-08-15 14:05:13 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/r/percona_skip_innodb_i_s.result	2012-11-08 15:35:48 +0000
@@ -11,6 +11,7 @@
 INNODB_INDEX_STATS
 INNODB_LOCKS
 INNODB_LOCK_WAITS
+INNODB_LOG_TRACKING_STATUS
 INNODB_RSEG
 INNODB_SYS_INDEXES
 INNODB_SYS_STATS

=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_log_tracking_status-master.opt'
--- Percona-Server/mysql-test/suite/innodb_plugin/t/percona_log_tracking_status-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_log_tracking_status-master.opt	2012-11-08 15:35:48 +0000
@@ -0,0 +1,1 @@
+--innodb_track_changed_pages=TRUE --innodb_log_file_size=1M

=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_log_tracking_status.test'
--- Percona-Server/mysql-test/suite/innodb_plugin/t/percona_log_tracking_status.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_log_tracking_status.test	2012-11-08 15:35:48 +0000
@@ -0,0 +1,50 @@
+#################################################
+# Test for I_S.INNODB_LOG_TRACKING_STATUS table #
+#################################################
+
+--source include/have_innodb_plugin.inc
+
+set @last_tracked_lsn=
+	(SELECT log_tracking_lsn
+	FROM INFORMATION_SCHEMA.INNODB_LOG_TRACKING_STATUS);
+
+CREATE TABLE T1 (F1 CHAR(255)) ENGINE=INNODB;
+
+--disable_query_log
+--disable_result_log
+
+#########################################################################
+# The maximum log size is 1MB. Each row occupies at least 256 bytes.    # 
+# Each iteration inserts 100 rows. They occupies at least 25KB. To be   # 
+# sure that tracking log thread wrote at least 1M/16K pages we need to  # 
+# exceed maximum log size twice. That means we should do at least       # 
+# 2M/25K = 80 iterations.                                               #
+#########################################################################
+--let $i=80
+
+while ($i)
+{
+--dec $i
+INSERT INTO T1 (F1) VALUES
+("1"), ("2"), ("3"), ("4"), ("5"), ("6"), ("7"), ("8"), ("9"), ("10"),
+("11"), ("12"), ("13"), ("14"), ("15"), ("16"), ("17"), ("18"), ("19"), ("20"),
+("21"), ("22"), ("23"), ("24"), ("25"), ("26"), ("27"), ("28"), ("29"), ("30"),
+("31"), ("32"), ("33"), ("34"), ("35"), ("36"), ("37"), ("38"), ("39"), ("40"), 
+("41"), ("42"), ("43"), ("44"), ("45"), ("46"), ("47"), ("48"), ("49"), ("50"),
+("51"), ("52"), ("53"), ("54"), ("55"), ("56"), ("57"), ("58"), ("59"), ("60"),
+("61"), ("62"), ("63"), ("64"), ("65"), ("66"), ("67"), ("68"), ("69"), ("70"),
+("71"), ("72"), ("73"), ("74"), ("75"), ("76"), ("77"), ("78"), ("79"), ("80"),
+("81"), ("82"), ("83"), ("84"), ("85"), ("86"), ("87"), ("88"), ("89"), ("90"),
+("91"), ("92"), ("93"), ("94"), ("95"), ("96"), ("97"), ("98"), ("99"), ("100");
+}
+
+--enable_query_log
+--enable_result_log
+
+########################################
+# Check if last tracked lsn is changed #
+########################################
+SELECT log_tracking_lsn > @last_tracked_lsn
+  FROM INFORMATION_SCHEMA.INNODB_LOG_TRACKING_STATUS;
+
+DROP TABLE T1;

=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_log_tracking_status_empty-master.opt'
--- Percona-Server/mysql-test/suite/innodb_plugin/t/percona_log_tracking_status_empty-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_log_tracking_status_empty-master.opt	2012-11-08 15:35:48 +0000
@@ -0,0 +1,1 @@
+--innodb_track_changed_pages=false

=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_log_tracking_status_empty.test'
--- Percona-Server/mysql-test/suite/innodb_plugin/t/percona_log_tracking_status_empty.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_log_tracking_status_empty.test	2012-11-08 15:35:48 +0000
@@ -0,0 +1,8 @@
+###############################################################################
+# Test for I_S.INNODB_LOG_TRACKING_STATUS empty table. The table must be empty#
+# if innodb_track_changed_pages is false.                                     #
+###############################################################################
+
+--source include/have_innodb_plugin.inc
+
+SELECT * FROM INFORMATION_SCHEMA.INNODB_LOG_TRACKING_STATUS;

=== modified file 'Percona-Server/storage/innodb_plugin/handler/ha_innodb.cc'
--- Percona-Server/storage/innodb_plugin/handler/ha_innodb.cc	2012-09-14 12:19:29 +0000
+++ Percona-Server/storage/innodb_plugin/handler/ha_innodb.cc	2012-11-08 15:35:48 +0000
@@ -12276,8 +12276,13 @@
 i_s_innodb_admin_command,
 i_s_innodb_sys_tables,
 i_s_innodb_sys_indexes,
+<<<<<<< TREE
 i_s_innodb_sys_stats,
 i_s_innodb_changed_pages
+=======
+i_s_innodb_sys_stats,
+i_s_innodb_log_tracking_status
+>>>>>>> MERGE-SOURCE
 mysql_declare_plugin_end;
 
 /** @brief Initialize the default value of innodb_commit_concurrency.

=== modified file 'Percona-Server/storage/innodb_plugin/handler/i_s.cc'
--- Percona-Server/storage/innodb_plugin/handler/i_s.cc	2012-08-23 08:19:20 +0000
+++ Percona-Server/storage/innodb_plugin/handler/i_s.cc	2012-11-08 15:35:48 +0000
@@ -55,7 +55,11 @@
 #include "dict0dict.h" /* for dict_sys */
 #include "btr0pcur.h"
 #include "buf0lru.h" /* for XTRA_LRU_[DUMP/RESTORE] */
+<<<<<<< TREE
 #include "log0online.h"
+=======
+#include "log0log.h" /* for innodb_log_tracking_status */
+>>>>>>> MERGE-SOURCE
 }
 
 static const char plugin_author[] = "Innobase Oy";
@@ -3648,6 +3652,7 @@
 	STRUCT_FLD(system_vars, NULL),
 	STRUCT_FLD(__reserved1, NULL)
 };
+<<<<<<< TREE
 
 static ST_FIELD_INFO	i_s_innodb_changed_pages_info[] =
 {
@@ -3933,3 +3938,85 @@
 	STRUCT_FLD(system_vars, NULL),
 	STRUCT_FLD(__reserved1, NULL)
 };
+=======
+
+static ST_FIELD_INFO	i_s_innodb_log_tracking_status_info[] =
+{
+	{STRUCT_FLD(field_name,		"log_tracking_lsn"),
+	 STRUCT_FLD(field_length,	MY_INT64_NUM_DECIMAL_DIGITS),
+	 STRUCT_FLD(field_type,		MYSQL_TYPE_LONGLONG),
+	 STRUCT_FLD(value,		0),
+	 STRUCT_FLD(field_flags,	MY_I_S_UNSIGNED),
+	 STRUCT_FLD(old_name,		""),
+	 STRUCT_FLD(open_method,	SKIP_OPEN_TABLE)},
+
+        {STRUCT_FLD(field_name,		"log_tracking_max_lsn_age"),
+	 STRUCT_FLD(field_length,	MY_INT64_NUM_DECIMAL_DIGITS),
+	 STRUCT_FLD(field_type,		MYSQL_TYPE_LONGLONG),
+	 STRUCT_FLD(value,		0),
+	 STRUCT_FLD(field_flags,	MY_I_S_UNSIGNED),
+	 STRUCT_FLD(old_name,		""),
+	 STRUCT_FLD(open_method,	SKIP_OPEN_TABLE)},
+
+	END_OF_ST_FIELD_INFO
+};
+
+/***********************************************************************
+Fill the dynamic table information_schema.innodb_changed_pages. */
+static
+int
+i_s_innodb_log_tracking_status_fill(
+/*================================*/
+				/*!<out: 0 on success, 1 on failure */
+	THD*		thd,	/*!<in: thread */
+	TABLE_LIST*	tables,	/*!<in/out: tables to fill */
+	COND*		cond)	/*!<in: condition */
+{
+	TABLE*                 table = (TABLE *) tables->table;
+
+	if (!srv_track_changed_pages)
+		return 0;
+
+	/* log_tracking_lsn */
+	table->field[0]->store(log_get_tracked_lsn());
+	/* log_tracking_max_lsn_age */
+	table->field[1]->store(log_sys->max_checkpoint_age);
+
+	if (schema_table_store_record(thd, table))
+		return 1;
+
+	return 0;
+}
+
+static
+int
+i_s_innodb_log_tracking_status_init(
+/*================================*/
+	void*	p)
+{
+	DBUG_ENTER("i_s_innodb_log_trackig_status_init");
+	ST_SCHEMA_TABLE* schema = (ST_SCHEMA_TABLE*) p;
+
+	schema->fields_info = i_s_innodb_log_tracking_status_info;
+	schema->fill_table = i_s_innodb_log_tracking_status_fill;
+
+	DBUG_RETURN(0);
+}
+
+UNIV_INTERN struct st_mysql_plugin   i_s_innodb_log_tracking_status =
+{
+	STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
+	STRUCT_FLD(info, &i_s_info),
+	STRUCT_FLD(name, "INNODB_LOG_TRACKING_STATUS"),
+	STRUCT_FLD(author, "Percona"),
+	STRUCT_FLD(descr, "InnoDB LOG TRACKING STATUS table"),
+	STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
+	STRUCT_FLD(init, i_s_innodb_log_tracking_status_init),
+	STRUCT_FLD(deinit, i_s_common_deinit),
+	STRUCT_FLD(version, 0x0100 /* 1.0 */),
+	STRUCT_FLD(status_vars, NULL),
+	STRUCT_FLD(system_vars, NULL),
+	STRUCT_FLD(__reserved1, NULL)
+};
+
+>>>>>>> MERGE-SOURCE

=== modified file 'Percona-Server/storage/innodb_plugin/handler/i_s.h'
--- Percona-Server/storage/innodb_plugin/handler/i_s.h	2012-08-15 14:05:13 +0000
+++ Percona-Server/storage/innodb_plugin/handler/i_s.h	2012-11-08 15:35:48 +0000
@@ -43,6 +43,10 @@
 extern struct st_mysql_plugin   i_s_innodb_sys_tables;
 extern struct st_mysql_plugin   i_s_innodb_sys_indexes;
 extern struct st_mysql_plugin	i_s_innodb_sys_stats;
+<<<<<<< TREE
 extern struct st_mysql_plugin	i_s_innodb_changed_pages;
+=======
+extern struct st_mysql_plugin	i_s_innodb_log_tracking_status;
+>>>>>>> MERGE-SOURCE
 
 #endif /* i_s_h */

=== modified file 'Percona-Server/storage/innodb_plugin/include/log0log.h'
--- Percona-Server/storage/innodb_plugin/include/log0log.h	2012-06-14 09:16:03 +0000
+++ Percona-Server/storage/innodb_plugin/include/log0log.h	2012-11-08 15:35:48 +0000
@@ -75,6 +75,7 @@
 /*==========================================*/
 	ulint	limit);	/*!< in: limit to set */
 #endif /* !UNIV_HOTBACKUP */
+
 /*******************************************************************//**
 Calculates where in log files we find a specified lsn.
 @return	log file number */
@@ -958,6 +959,17 @@
 					64-bit atomic ops are supported,
 					protected by the log sys mutex
 					otherwise. */
+	ib_uint64_t	tracked_start_lsn;	/*!< Start LSN of the last
+						uninterrupted tracked range.
+						This field is set when
+						tracking is started or resumed
+						after maximum tracked age
+						violation. */
+	ib_uint64_t	tracked_end_lsn;	/*!< End LSN of the last
+						uninterrupted tracked range.
+						This field is set when
+						maximum tracked age violation
+						happens and 0 otherwise. */
 };
 
 #ifdef UNIV_LOG_ARCHIVE

=== modified file 'Percona-Server/storage/innodb_plugin/include/log0log.ic'
--- Percona-Server/storage/innodb_plugin/include/log0log.ic	2010-06-10 14:31:28 +0000
+++ Percona-Server/storage/innodb_plugin/include/log0log.ic	2012-11-08 15:35:48 +0000
@@ -444,3 +444,84 @@
 	}
 }
 #endif /* !UNIV_HOTBACKUP */
+
+UNIV_INLINE
+void
+log_set_thread_safe_uint64(
+/*==============*/
+	ib_uint64_t*	dst,
+	ib_uint64_t	src,
+	mutex_t*	mutex)
+{
+#ifdef HAVE_ATOMIC_BUILTINS_64
+	ib_uint64_t old_value;
+#endif
+	ut_ad(dst);
+	ut_ad(mutex);
+
+#ifdef HAVE_ATOMIC_BUILTINS_64
+	/* Single writer, no data race here */
+	(void)mutex;
+	old_value
+		= os_atomic_increment_uint64(dst, 0);
+	os_atomic_increment_uint64(dst,
+				   src - old_value);
+#else
+	mutex_enter(mutex);
+	*dst = src;
+	mutex_exit(mutex);
+#endif
+}
+
+
+UNIV_INLINE
+ib_uint64_t
+log_get_thread_safe_uint64(
+	ib_uint64_t*	value,
+	mutex_t*	mutex)
+{
+#ifdef HAVE_ATOMIC_BUILTINS_64
+	(void)mutex;
+	return os_atomic_increment_uint64(value, 0);
+#else
+	ut_ad(mutex_own(mutex));
+	return *value;
+#endif
+}
+
+
+/****************************************************************//**
+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()
+{
+	return log_get_thread_safe_uint64(&log_sys->tracked_lsn,
+					  &log_sys->mutex);
+}
+
+
+UNIV_INLINE
+ib_uint64_t
+log_get_tracked_end_lsn()
+{
+	return log_get_thread_safe_uint64(&log_sys->tracked_end_lsn,
+					  &log_sys->mutex);
+}
+
+
+UNIV_INLINE
+void
+log_set_tracked_end_lsn(
+/*================*/
+	ib_uint64_t	tracked_end_lsn)	/*!<in: new value */
+{
+	log_set_thread_safe_uint64(&log_sys->tracked_end_lsn,
+				   tracked_end_lsn,
+				   &log_sys->mutex);
+}

=== modified file 'Percona-Server/storage/innodb_plugin/log/log0log.c'
--- Percona-Server/storage/innodb_plugin/log/log0log.c	2012-06-14 09:16:03 +0000
+++ Percona-Server/storage/innodb_plugin/log/log0log.c	2012-11-08 15:35:48 +0000
@@ -202,25 +202,6 @@
 }
 
 /****************************************************************//**
-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.
@@ -478,7 +459,7 @@
 		tracked_lsn_age = lsn - tracked_lsn;
 
 		if (tracked_lsn_age >= log->log_group_capacity) {
-
+			log_set_tracked_end_lsn(tracked_lsn);
 			fprintf(stderr, " InnoDB: Error: the age of the "
 				"oldest untracked record exceeds the log "
 				"group capacity!\n");

=== modified file 'Percona-Server/storage/innodb_plugin/log/log0online.c'
--- Percona-Server/storage/innodb_plugin/log/log0online.c	2012-08-17 06:13:44 +0000
+++ Percona-Server/storage/innodb_plugin/log/log0online.c	2012-11-08 15:35:48 +0000
@@ -326,6 +326,7 @@
 	return result;
 }
 
+
 /****************************************************************//**
 Safely write the log_sys->tracked_lsn value.  Uses atomic operations
 if available, otherwise this field is protected with the log system
@@ -337,6 +338,7 @@
 /*================*/
 	ib_uint64_t	tracked_lsn)	/*!<in: new value */
 {
+<<<<<<< TREE
 #ifdef HAVE_ATOMIC_BUILTINS_64
 	/* Single writer, no data race here */
 	ib_uint64_t old_value
@@ -349,6 +351,25 @@
 	mutex_exit(&log_sys->mutex);
 #endif
 }
+=======
+	log_set_thread_safe_uint64(&log_sys->tracked_lsn,
+				   tracked_lsn,
+				   &log_sys->mutex);
+}
+
+
+UNIV_INLINE
+void
+log_set_tracked_start_lsn(
+/*================*/
+	ib_uint64_t	tracked_start_lsn)	/*!<in: new value */
+{
+	log_set_thread_safe_uint64(&log_sys->tracked_start_lsn,
+				   tracked_start_lsn,
+				   &log_sys->mutex);
+}
+
+>>>>>>> MERGE-SOURCE
 
 /****************************************************************//**
 Diagnose a gap in tracked LSN range on server startup due to crash or
@@ -508,6 +529,8 @@
 		"LSN %llu\n", tracking_start_lsn);
 	log_bmp_sys->start_lsn = tracking_start_lsn;
 	log_set_tracked_lsn(tracking_start_lsn);
+	log_set_tracked_start_lsn(tracking_start_lsn);
+	log_set_tracked_end_lsn(0);
 }
 
 /*********************************************************************//**
@@ -898,6 +921,7 @@
 /*========================*/
 {
 	ib_uint64_t	contiguous_start_lsn;
+	ib_uint64_t	tracking_end_lsn;
 	log_group_t*	group;
 
 	/* Grab the LSN of the last checkpoint, we will parse up to it */
@@ -909,6 +933,17 @@
 		return;
 	}
 
+	tracking_end_lsn = log_get_tracked_end_lsn();
+	if (tracking_end_lsn) {
+		ut_print_timestamp(stderr);
+		fprintf(stderr,
+			" InnoDB: Error: possible log tracking hole"
+			" from %llu to %llu LSN range.",
+			tracking_end_lsn, log_bmp_sys->start_lsn);
+		log_set_tracked_end_lsn(0);
+		log_set_tracked_start_lsn(log_bmp_sys->start_lsn);
+	}
+
 	group = UT_LIST_GET_FIRST(log_sys->log_groups);
 	ut_a(group);