Merge lp:~vlad-lesin/percona-server/i_s-innodb-changed-pages into lp:percona-server/5.5

[Vlad Lesin]

Could you review my code and test especialy? I doubt this test is enough for this feature and still thinking about the better variant. The jenkins build can be found here http://jenkins.percona.com/view/PS%205.1/job/percona-server-5.1-param/344 .

[Laurynas Biveinis (laurynas-biveinis)]

It seems that the target branch is wrong.

review: Needs Fixing

=== added file 'Makefile.OTHER'
--- Makefile.OTHER	1970-01-01 00:00:00 +0000
+++ Makefile.OTHER	2012-08-15 14:13:50 +0000
@@ -0,0 +1,77 @@
+MYSQL_VERSION=5.1.63
+PERCONA_SERVER_VERSION=rel13.4
+PERCONA_SERVER         ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
+PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
+PERCONA_SERVER_SHORT_2 ?=Percona-Server
+KEWPIE ?=kewpie
+BASEDIR = $(CURDIR)
+
+all:  main install-lic handlersocket maatkit-udf autorun
+	@echo ""
+	@echo "Percona Server source code is ready"
+	@echo "Now change directory to $(PERCONA_SERVER) define variables as show below"
+	@echo ""
+	export CFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2"
+	export CXXFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2"
+	export LIBS=-lrt
+	@echo ""
+	@echo "and run ./configure --with-plugins=partition,archive,blackhole,csv,example,federated,innodb_plugin --without-embedded-server --with-pic --with-extra-charsets=complex --with-ssl --enable-assembler --enable-local-infile --enable-thread-safe-client --enable-profiling --with-readline && make all install"
+	@echo ""
+
+autorun:
+	cd $(PERCONA_SERVER) && ./BUILD/autorun.sh
+
+handlersocket:
+	cp -R HandlerSocket-Plugin-for-MySQL $(PERCONA_SERVER)/storage
+	patch -p1 -d $(PERCONA_SERVER)/storage < handlersocket.patch
+
+maatkit-udf:
+	cp -R UDF "$(PERCONA_SERVER)"
+	cd "$(PERCONA_SERVER)"/UDF && autoreconf --install
+
+install-lic: 
+	@echo "Installing license files"
+	install -m 644 COPYING.* $(PERCONA_SERVER)
+
+prepare: 
+	@echo "Prepare Percona Server sources"
+	rm -rf $(PERCONA_SERVER) $(PERCONA_SERVER_SHORT_1)
+	ln -s $(PERCONA_SERVER_SHORT_2) $(PERCONA_SERVER)
+	ln -s $(PERCONA_SERVER_SHORT_2) $(PERCONA_SERVER_SHORT_1)
+
+main: prepare
+
+clean:
+	rm -rf $(PERCONA_SERVER) $(PERCONA_SERVER_SHORT_1)
+
+test-crashme:
+	cd $(KEWPIE) && ./kewpie.py --suite=crashme --basedir=$(BASEDIR)/$(PERCONA_SERVER_SHORT_2)
+
+test-sqlbench:
+	cd $(KEWPIE) && ./kewpie.py --suite=sqlbench --basedir=$(BASEDIR)/$(PERCONA_SERVER_SHORT_2)
+
+test-randgen:
+	cd $(KEWPIE) && ./kewpie.py --suite=randgen_basic --basedir=$(BASEDIR)/$(PERCONA_SERVER_SHORT_2)
+
+test-randgen-bugs:
+	cd $(KEWPIE) && ./kewpie.py --suite=randgen_bugs --basedir=$(BASEDIR)/$(PERCONA_SERVER_SHORT_2)
+
+test-cluster:
+	cd $(KEWPIE) && ./kewpie.py --suite=cluster_basic,cluster_randgen --basedir=$(BASEDIR)/$(PERCONA_SERVER_SHORT_2)
+
+test-cluster-basic:
+	cd $(KEWPIE) && ./kewpie.py --suite=cluster_basic --basedir=$(BASEDIR)/$(PERCONA_SERVER_SHORT_2)
+
+test-cluster-randgen:
+	cd $(KEWPIE) && ./kewpie.py --suite=cluster_randgen --basedir=$(BASEDIR)/$(PERCONA_SERVER_SHORT_2)
+
+test-cluster-bugs:
+	cd $(KEWPIE) && ./kewpie.py --suite=cluster_bugs --basedir=$(BASEDIR)/$(PERCONA_SERVER_SHORT_2)
+
+test-innodb-crash:
+	cd $(KEWPIE) && ./kewpie.py --suite=innodbCrash --basedir=$(BASEDIR)/$(PERCONA_SERVER_SHORT_2)
+
+
+
+
+
 
=== modified file 'Percona-Server/mysql-test/r/information_schema.result'
--- Percona-Server/mysql-test/r/information_schema.result	2012-07-31 05:33:11 +0000
+++ Percona-Server/mysql-test/r/information_schema.result	2012-08-15 14:13:50 +0000
@@ -83,7 +83,30 @@
 USER_PRIVILEGES
 USER_STATISTICS
 VIEWS
+<<<<<<< TREE
+=======
+INNODB_BUFFER_POOL_PAGES_INDEX
+INNODB_RSEG
+INNODB_CHANGED_PAGES
+INNODB_BUFFER_POOL_PAGES
+INNODB_TABLE_STATS
+INNODB_TRX
+>>>>>>> MERGE-SOURCE
 XTRADB_ADMIN_COMMAND
+<<<<<<< TREE
+=======
+INNODB_LOCK_WAITS
+INNODB_SYS_TABLES
+INNODB_CMP
+INNODB_SYS_STATS
+INNODB_CMP_RESET
+INNODB_CMPMEM
+INNODB_INDEX_STATS
+INNODB_SYS_INDEXES
+INNODB_BUFFER_POOL_PAGES_BLOB
+INNODB_CMPMEM_RESET
+INNODB_LOCKS
+>>>>>>> MERGE-SOURCE
 columns_priv
 db
 event
@@ -900,6 +923,11 @@
 TABLE_STATISTICS	TABLE_NAME	select
 TEMPORARY_TABLES	TABLE_NAME	select
 VIEWS	TABLE_NAME	select
+<<<<<<< TREE
+=======
+INNODB_TABLE_STATS	table_name	select
+INNODB_INDEX_STATS	table_name	select
+>>>>>>> MERGE-SOURCE
 delete from mysql.user where user='mysqltest_4';
 delete from mysql.db where user='mysqltest_4';
 flush privileges;
@@ -1280,6 +1308,147 @@
 DROP FUNCTION f1;
 DROP PROCEDURE p1;
 DROP USER mysql_bug20230@localhost;
+<<<<<<< TREE
+=======
+SELECT t.table_name, c1.column_name
+FROM information_schema.tables t
+INNER JOIN
+information_schema.columns c1
+ON t.table_schema = c1.table_schema AND
+t.table_name = c1.table_name
+WHERE t.table_schema = 'information_schema' AND
+c1.ordinal_position =
+( SELECT COALESCE(MIN(c2.ordinal_position),1)
+FROM information_schema.columns c2
+WHERE c2.table_schema = t.table_schema AND
+c2.table_name = t.table_name AND
+c2.column_name LIKE '%SCHEMA%'
+        );
+table_name	column_name
+CHARACTER_SETS	CHARACTER_SET_NAME
+CLIENT_STATISTICS	CLIENT
+COLLATIONS	COLLATION_NAME
+COLLATION_CHARACTER_SET_APPLICABILITY	COLLATION_NAME
+COLUMNS	TABLE_SCHEMA
+COLUMN_PRIVILEGES	TABLE_SCHEMA
+INDEX_STATISTICS	TABLE_SCHEMA
+ENGINES	ENGINE
+EVENTS	EVENT_SCHEMA
+FILES	TABLE_SCHEMA
+GLOBAL_STATUS	VARIABLE_NAME
+GLOBAL_TEMPORARY_TABLES	TABLE_SCHEMA
+GLOBAL_VARIABLES	VARIABLE_NAME
+KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA
+PARTITIONS	TABLE_SCHEMA
+PLUGINS	PLUGIN_NAME
+PROCESSLIST	ID
+PROFILING	QUERY_ID
+REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA
+ROUTINES	ROUTINE_SCHEMA
+QUERY_RESPONSE_TIME	time
+SCHEMATA	SCHEMA_NAME
+SCHEMA_PRIVILEGES	TABLE_SCHEMA
+SESSION_STATUS	VARIABLE_NAME
+SESSION_VARIABLES	VARIABLE_NAME
+STATISTICS	TABLE_SCHEMA
+TABLES	TABLE_SCHEMA
+TABLE_CONSTRAINTS	CONSTRAINT_SCHEMA
+TABLE_PRIVILEGES	TABLE_SCHEMA
+TEMPORARY_TABLES	TABLE_SCHEMA
+TABLE_STATISTICS	TABLE_SCHEMA
+THREAD_STATISTICS	THREAD_ID
+TRIGGERS	TRIGGER_SCHEMA
+USER_PRIVILEGES	GRANTEE
+USER_STATISTICS	USER
+VIEWS	TABLE_SCHEMA
+INNODB_BUFFER_POOL_PAGES_INDEX	index_id
+INNODB_RSEG	rseg_id
+INNODB_CHANGED_PAGES	space_id
+INNODB_BUFFER_POOL_PAGES	page_type
+INNODB_TABLE_STATS	table_schema
+INNODB_TRX	trx_id
+XTRADB_ADMIN_COMMAND	result_message
+INNODB_LOCK_WAITS	requesting_trx_id
+INNODB_SYS_TABLES	SCHEMA
+INNODB_CMP	page_size
+INNODB_SYS_STATS	INDEX_ID
+INNODB_CMP_RESET	page_size
+INNODB_CMPMEM	page_size
+INNODB_INDEX_STATS	table_schema
+INNODB_SYS_INDEXES	TABLE_ID
+INNODB_BUFFER_POOL_PAGES_BLOB	space_id
+INNODB_CMPMEM_RESET	page_size
+INNODB_LOCKS	lock_id
+SELECT t.table_name, c1.column_name
+FROM information_schema.tables t
+INNER JOIN
+information_schema.columns c1
+ON t.table_schema = c1.table_schema AND
+t.table_name = c1.table_name
+WHERE t.table_schema = 'information_schema' AND
+c1.ordinal_position =
+( SELECT COALESCE(MIN(c2.ordinal_position),1)
+FROM information_schema.columns c2
+WHERE c2.table_schema = 'information_schema' AND
+c2.table_name = t.table_name AND
+c2.column_name LIKE '%SCHEMA%'
+        );
+table_name	column_name
+CHARACTER_SETS	CHARACTER_SET_NAME
+CLIENT_STATISTICS	CLIENT
+COLLATIONS	COLLATION_NAME
+COLLATION_CHARACTER_SET_APPLICABILITY	COLLATION_NAME
+COLUMNS	TABLE_SCHEMA
+COLUMN_PRIVILEGES	TABLE_SCHEMA
+INDEX_STATISTICS	TABLE_SCHEMA
+ENGINES	ENGINE
+EVENTS	EVENT_SCHEMA
+FILES	TABLE_SCHEMA
+GLOBAL_STATUS	VARIABLE_NAME
+GLOBAL_TEMPORARY_TABLES	TABLE_SCHEMA
+GLOBAL_VARIABLES	VARIABLE_NAME
+KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA
+PARTITIONS	TABLE_SCHEMA
+PLUGINS	PLUGIN_NAME
+PROCESSLIST	ID
+PROFILING	QUERY_ID
+REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA
+ROUTINES	ROUTINE_SCHEMA
+QUERY_RESPONSE_TIME	time
+SCHEMATA	SCHEMA_NAME
+SCHEMA_PRIVILEGES	TABLE_SCHEMA
+SESSION_STATUS	VARIABLE_NAME
+SESSION_VARIABLES	VARIABLE_NAME
+STATISTICS	TABLE_SCHEMA
+TABLES	TABLE_SCHEMA
+TABLE_CONSTRAINTS	CONSTRAINT_SCHEMA
+TABLE_PRIVILEGES	TABLE_SCHEMA
+TEMPORARY_TABLES	TABLE_SCHEMA
+TABLE_STATISTICS	TABLE_SCHEMA
+THREAD_STATISTICS	THREAD_ID
+TRIGGERS	TRIGGER_SCHEMA
+USER_PRIVILEGES	GRANTEE
+USER_STATISTICS	USER
+VIEWS	TABLE_SCHEMA
+INNODB_BUFFER_POOL_PAGES_INDEX	index_id
+INNODB_RSEG	rseg_id
+INNODB_CHANGED_PAGES	space_id
+INNODB_BUFFER_POOL_PAGES	page_type
+INNODB_TABLE_STATS	table_schema
+INNODB_TRX	trx_id
+XTRADB_ADMIN_COMMAND	result_message
+INNODB_LOCK_WAITS	requesting_trx_id
+INNODB_SYS_TABLES	SCHEMA
+INNODB_CMP	page_size
+INNODB_SYS_STATS	INDEX_ID
+INNODB_CMP_RESET	page_size
+INNODB_CMPMEM	page_size
+INNODB_INDEX_STATS	table_schema
+INNODB_SYS_INDEXES	TABLE_ID
+INNODB_BUFFER_POOL_PAGES_BLOB	space_id
+INNODB_CMPMEM_RESET	page_size
+INNODB_LOCKS	lock_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
@@ -1360,6 +1529,26 @@
 GLOBAL_TEMPORARY_TABLES	information_schema.GLOBAL_TEMPORARY_TABLES	1
 GLOBAL_VARIABLES	information_schema.GLOBAL_VARIABLES	1
 INDEX_STATISTICS	information_schema.INDEX_STATISTICS	1
+<<<<<<< TREE
+=======
+INNODB_BUFFER_POOL_PAGES	information_schema.INNODB_BUFFER_POOL_PAGES	1
+INNODB_BUFFER_POOL_PAGES_BLOB	information_schema.INNODB_BUFFER_POOL_PAGES_BLOB	1
+INNODB_BUFFER_POOL_PAGES_INDEX	information_schema.INNODB_BUFFER_POOL_PAGES_INDEX	1
+INNODB_CHANGED_PAGES	information_schema.INNODB_CHANGED_PAGES	1
+INNODB_CMP	information_schema.INNODB_CMP	1
+INNODB_CMPMEM	information_schema.INNODB_CMPMEM	1
+INNODB_CMPMEM_RESET	information_schema.INNODB_CMPMEM_RESET	1
+INNODB_CMP_RESET	information_schema.INNODB_CMP_RESET	1
+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_RSEG	information_schema.INNODB_RSEG	1
+INNODB_SYS_INDEXES	information_schema.INNODB_SYS_INDEXES	1
+INNODB_SYS_STATS	information_schema.INNODB_SYS_STATS	1
+INNODB_SYS_TABLES	information_schema.INNODB_SYS_TABLES	1
+INNODB_TABLE_STATS	information_schema.INNODB_TABLE_STATS	1
+INNODB_TRX	information_schema.INNODB_TRX	1
+>>>>>>> MERGE-SOURCE
 KEY_COLUMN_USAGE	information_schema.KEY_COLUMN_USAGE	1
 PARAMETERS	information_schema.PARAMETERS	1
 PARTITIONS	information_schema.PARTITIONS	1
 
=== modified file 'Percona-Server/mysql-test/r/information_schema_db.result'
--- Percona-Server/mysql-test/r/information_schema_db.result	2012-05-10 07:49:14 +0000
+++ Percona-Server/mysql-test/r/information_schema_db.result	2012-08-15 14:13:50 +0000
@@ -43,7 +43,30 @@
 USER_PRIVILEGES
 USER_STATISTICS
 VIEWS
+<<<<<<< TREE
+=======
+INNODB_BUFFER_POOL_PAGES_INDEX
+INNODB_RSEG
+INNODB_CHANGED_PAGES
+INNODB_BUFFER_POOL_PAGES
+INNODB_TABLE_STATS
+INNODB_TRX
+>>>>>>> MERGE-SOURCE
 XTRADB_ADMIN_COMMAND
+<<<<<<< TREE
+=======
+INNODB_LOCK_WAITS
+INNODB_SYS_TABLES
+INNODB_CMP
+INNODB_SYS_STATS
+INNODB_CMP_RESET
+INNODB_CMPMEM
+INNODB_INDEX_STATS
+INNODB_SYS_INDEXES
+INNODB_BUFFER_POOL_PAGES_BLOB
+INNODB_CMPMEM_RESET
+INNODB_LOCKS
+>>>>>>> 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-07-31 05:33:11 +0000
+++ Percona-Server/mysql-test/r/mysqlshow.result	2012-08-15 14:13:50 +0000
@@ -119,6 +119,7 @@
 | VIEWS                                 |
 | INNODB_CMPMEM_RESET                   |
 | INNODB_RSEG                           |
+<<<<<<< TREE
 | INNODB_UNDO_LOGS                      |
 | INNODB_CMPMEM                         |
 | INNODB_SYS_TABLESTATS                 |
@@ -127,7 +128,14 @@
 | INNODB_CMP                            |
 | INNODB_SYS_FOREIGN_COLS               |
 | INNODB_CMP_RESET                      |
+=======
+| INNODB_CHANGED_PAGES                  |
+>>>>>>> MERGE-SOURCE
 | INNODB_BUFFER_POOL_PAGES              |
+<<<<<<< TREE
+=======
+| INNODB_TABLE_STATS                    |
+>>>>>>> MERGE-SOURCE
 | INNODB_TRX                            |
 | INNODB_BUFFER_POOL_PAGES_INDEX        |
 | INNODB_LOCKS                          |
@@ -139,7 +147,13 @@
 | INNODB_SYS_STATS                      |
 | INNODB_SYS_FOREIGN                    |
 | INNODB_SYS_INDEXES                    |
+<<<<<<< TREE
 | XTRADB_ADMIN_COMMAND                  |
+=======
+| INNODB_BUFFER_POOL_PAGES_BLOB         |
+| INNODB_CMPMEM_RESET                   |
+| INNODB_LOCKS                          |
+>>>>>>> MERGE-SOURCE
 +---------------------------------------+
 Database: INFORMATION_SCHEMA
 +---------------------------------------+
@@ -185,6 +199,7 @@
 | VIEWS                                 |
 | INNODB_CMPMEM_RESET                   |
 | INNODB_RSEG                           |
+<<<<<<< TREE
 | INNODB_UNDO_LOGS                      |
 | INNODB_CMPMEM                         |
 | INNODB_SYS_TABLESTATS                 |
@@ -193,7 +208,14 @@
 | INNODB_CMP                            |
 | INNODB_SYS_FOREIGN_COLS               |
 | INNODB_CMP_RESET                      |
+=======
+| INNODB_CHANGED_PAGES                  |
+>>>>>>> MERGE-SOURCE
 | INNODB_BUFFER_POOL_PAGES              |
+<<<<<<< TREE
+=======
+| INNODB_TABLE_STATS                    |
+>>>>>>> MERGE-SOURCE
 | INNODB_TRX                            |
 | INNODB_BUFFER_POOL_PAGES_INDEX        |
 | INNODB_LOCKS                          |
@@ -205,7 +227,13 @@
 | INNODB_SYS_STATS                      |
 | INNODB_SYS_FOREIGN                    |
 | INNODB_SYS_INDEXES                    |
+<<<<<<< TREE
 | XTRADB_ADMIN_COMMAND                  |
+=======
+| INNODB_BUFFER_POOL_PAGES_BLOB         |
+| INNODB_CMPMEM_RESET                   |
+| INNODB_LOCKS                          |
+>>>>>>> MERGE-SOURCE
 +---------------------------------------+
 Wildcard: inf_rmation_schema
 +--------------------+
 
=== added file 'Percona-Server/mysql-test/r/percona_server_variables_debug.result.OTHER'
--- Percona-Server/mysql-test/r/percona_server_variables_debug.result.OTHER	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_server_variables_debug.result.OTHER	2012-08-15 14:13:50 +0000
@@ -0,0 +1,357 @@
+SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1;
+Variable_name
+AUTOCOMMIT
+AUTOMATIC_SP_PRIVILEGES
+AUTO_INCREMENT_INCREMENT
+AUTO_INCREMENT_OFFSET
+BACK_LOG
+BASEDIR
+BIG_TABLES
+BINLOG_CACHE_SIZE
+BINLOG_DIRECT_NON_TRANSACTIONAL_UPDATES
+BINLOG_FORMAT
+BULK_INSERT_BUFFER_SIZE
+CHARACTER_SETS_DIR
+CHARACTER_SET_CLIENT
+CHARACTER_SET_CONNECTION
+CHARACTER_SET_DATABASE
+CHARACTER_SET_FILESYSTEM
+CHARACTER_SET_RESULTS
+CHARACTER_SET_SERVER
+CHARACTER_SET_SYSTEM
+COLLATION_CONNECTION
+COLLATION_DATABASE
+COLLATION_SERVER
+COMPLETION_TYPE
+CONCURRENT_INSERT
+CONNECT_TIMEOUT
+DATADIR
+DATETIME_FORMAT
+DATE_FORMAT
+DEBUG
+DEBUG_SYNC
+DEFAULT_WEEK_FORMAT
+DELAYED_INSERT_LIMIT
+DELAYED_INSERT_TIMEOUT
+DELAYED_QUEUE_SIZE
+DELAY_KEY_WRITE
+DIV_PRECISION_INCREMENT
+ENABLE_QUERY_RESPONSE_TIME_STATS
+ENGINE_CONDITION_PUSHDOWN
+ERROR_COUNT
+EVENT_SCHEDULER
+EXPAND_FAST_INDEX_CREATION
+EXPIRE_LOGS_DAYS
+FAST_INDEX_CREATION
+FLUSH
+FLUSH_TIME
+FOREIGN_KEY_CHECKS
+FT_BOOLEAN_SYNTAX
+FT_MAX_WORD_LEN
+FT_MIN_WORD_LEN
+FT_QUERY_EXPANSION_LIMIT
+FT_STOPWORD_FILE
+GENERAL_LOG
+GENERAL_LOG_FILE
+GROUP_CONCAT_MAX_LEN
+HAVE_COMMUNITY_FEATURES
+HAVE_COMPRESS
+HAVE_CRYPT
+HAVE_CSV
+HAVE_DYNAMIC_LOADING
+HAVE_GEOMETRY
+HAVE_INNODB
+HAVE_NDBCLUSTER
+HAVE_OPENSSL
+HAVE_PARTITIONING
+HAVE_QUERY_CACHE
+HAVE_RESPONSE_TIME_DISTRIBUTION
+HAVE_RTREE_KEYS
+HAVE_SSL
+HAVE_SYMLINK
+HOSTNAME
+IDENTITY
+IGNORE_BUILTIN_INNODB
+INIT_CONNECT
+INIT_FILE
+INIT_SLAVE
+INNODB_ADAPTIVE_CHECKPOINT
+INNODB_ADAPTIVE_FLUSHING
+INNODB_ADAPTIVE_HASH_INDEX
+INNODB_ADDITIONAL_MEM_POOL_SIZE
+INNODB_AUTOEXTEND_INCREMENT
+INNODB_AUTOINC_LOCK_MODE
+INNODB_AUTO_LRU_DUMP
+INNODB_BLOCKING_LRU_RESTORE
+INNODB_BUFFER_POOL_SHM_CHECKSUM
+INNODB_BUFFER_POOL_SHM_KEY
+INNODB_BUFFER_POOL_SIZE
+INNODB_CHANGED_PAGES_LIMIT
+INNODB_CHANGE_BUFFERING
+INNODB_CHECKPOINT_AGE_TARGET
+INNODB_CHECKSUMS
+INNODB_COMMIT_CONCURRENCY
+INNODB_CONCURRENCY_TICKETS
+INNODB_DATA_FILE_PATH
+INNODB_DATA_HOME_DIR
+INNODB_DICT_SIZE_LIMIT
+INNODB_DOUBLEWRITE
+INNODB_DOUBLEWRITE_FILE
+INNODB_ENABLE_UNSAFE_GROUP_COMMIT
+INNODB_EXPAND_IMPORT
+INNODB_EXTRA_RSEGMENTS
+INNODB_EXTRA_UNDOSLOTS
+INNODB_FAKE_CHANGES
+INNODB_FAST_CHECKSUM
+INNODB_FAST_RECOVERY
+INNODB_FAST_SHUTDOWN
+INNODB_FILE_FORMAT
+INNODB_FILE_FORMAT_CHECK
+INNODB_FILE_PER_TABLE
+INNODB_FLUSH_LOG_AT_TRX_COMMIT
+INNODB_FLUSH_LOG_AT_TRX_COMMIT_SESSION
+INNODB_FLUSH_METHOD
+INNODB_FLUSH_NEIGHBOR_PAGES
+INNODB_FORCE_RECOVERY
+INNODB_IBUF_ACCEL_RATE
+INNODB_IBUF_ACTIVE_CONTRACT
+INNODB_IBUF_MAX_SIZE
+INNODB_IO_CAPACITY
+INNODB_KILL_IDLE_TRANSACTION
+INNODB_LAZY_DROP_TABLE
+INNODB_LOCKS_UNSAFE_FOR_BINLOG
+INNODB_LOCK_WAIT_TIMEOUT
+INNODB_LOG_BLOCK_SIZE
+INNODB_LOG_BUFFER_SIZE
+INNODB_LOG_FILES_IN_GROUP
+INNODB_LOG_FILE_SIZE
+INNODB_LOG_GROUP_HOME_DIR
+INNODB_MAX_DIRTY_PAGES_PCT
+INNODB_MAX_PURGE_LAG
+INNODB_MIRRORED_LOG_GROUPS
+INNODB_OLD_BLOCKS_PCT
+INNODB_OLD_BLOCKS_TIME
+INNODB_OPEN_FILES
+INNODB_OVERWRITE_RELAY_LOG_INFO
+INNODB_PAGE_SIZE
+INNODB_PASS_CORRUPT_TABLE
+INNODB_RANDOM_READ_AHEAD
+INNODB_READ_AHEAD
+INNODB_READ_AHEAD_THRESHOLD
+INNODB_READ_IO_THREADS
+INNODB_RECOVERY_STATS
+INNODB_REPLICATION_DELAY
+INNODB_ROLLBACK_ON_TIMEOUT
+INNODB_SHOW_LOCKS_HELD
+INNODB_SHOW_VERBOSE_LOCKS
+INNODB_SPIN_WAIT_DELAY
+INNODB_STATS_AUTO_UPDATE
+INNODB_STATS_METHOD
+INNODB_STATS_ON_METADATA
+INNODB_STATS_SAMPLE_PAGES
+INNODB_STATS_UPDATE_NEED_LOCK
+INNODB_STRICT_MODE
+INNODB_SUPPORT_XA
+INNODB_SYNC_SPIN_LOOPS
+INNODB_TABLE_LOCKS
+INNODB_THREAD_CONCURRENCY
+INNODB_THREAD_CONCURRENCY_TIMER_BASED
+INNODB_THREAD_SLEEP_DELAY
+INNODB_TRACK_CHANGED_PAGES
+INNODB_USE_PURGE_THREAD
+INNODB_USE_SYS_MALLOC
+INNODB_USE_SYS_STATS_TABLE
+INNODB_VERSION
+INNODB_WRITE_IO_THREADS
+INSERT_ID
+INTERACTIVE_TIMEOUT
+JOIN_BUFFER_SIZE
+KEEP_FILES_ON_CREATE
+KEY_BUFFER_SIZE
+KEY_CACHE_AGE_THRESHOLD
+KEY_CACHE_BLOCK_SIZE
+KEY_CACHE_DIVISION_LIMIT
+LANGUAGE
+LARGE_FILES_SUPPORT
+LARGE_PAGES
+LARGE_PAGE_SIZE
+LAST_INSERT_ID
+LC_TIME_NAMES
+LICENSE
+LOCAL_INFILE
+LOCKED_IN_MEMORY
+LOG
+LOG_BIN
+LOG_BIN_TRUST_FUNCTION_CREATORS
+LOG_BIN_TRUST_ROUTINE_CREATORS
+LOG_ERROR
+LOG_OUTPUT
+LOG_QUERIES_NOT_USING_INDEXES
+LOG_SLAVE_UPDATES
+LOG_SLOW_ADMIN_STATEMENTS
+LOG_SLOW_FILTER
+LOG_SLOW_QUERIES
+LOG_SLOW_RATE_LIMIT
+LOG_SLOW_SLAVE_STATEMENTS
+LOG_SLOW_SP_STATEMENTS
+LOG_SLOW_TIMESTAMP_EVERY
+LOG_SLOW_VERBOSITY
+LOG_WARNINGS
+LONG_QUERY_TIME
+LOWER_CASE_FILE_SYSTEM
+LOWER_CASE_TABLE_NAMES
+LOW_PRIORITY_UPDATES
+MAX_ALLOWED_PACKET
+MAX_BINLOG_CACHE_SIZE
+MAX_BINLOG_SIZE
+MAX_CONNECTIONS
+MAX_CONNECT_ERRORS
+MAX_DELAYED_THREADS
+MAX_ERROR_COUNT
+MAX_HEAP_TABLE_SIZE
+MAX_INSERT_DELAYED_THREADS
+MAX_JOIN_SIZE
+MAX_LENGTH_FOR_SORT_DATA
+MAX_LONG_DATA_SIZE
+MAX_PREPARED_STMT_COUNT
+MAX_RELAY_LOG_SIZE
+MAX_SEEKS_FOR_KEY
+MAX_SORT_LENGTH
+MAX_SP_RECURSION_DEPTH
+MAX_TMP_TABLES
+MAX_USER_CONNECTIONS
+MAX_WRITE_LOCK_COUNT
+MIN_EXAMINED_ROW_LIMIT
+MULTI_RANGE_COUNT
+MYISAM_DATA_POINTER_SIZE
+MYISAM_MAX_SORT_FILE_SIZE
+MYISAM_MMAP_SIZE
+MYISAM_RECOVER_OPTIONS
+MYISAM_REPAIR_THREADS
+MYISAM_SORT_BUFFER_SIZE
+MYISAM_STATS_METHOD
+MYISAM_USE_MMAP
+NET_BUFFER_LENGTH
+NET_READ_TIMEOUT
+NET_RETRY_COUNT
+NET_WRITE_TIMEOUT
+NEW
+OLD
+OLD_ALTER_TABLE
+OLD_PASSWORDS
+OPEN_FILES_LIMIT
+OPTIMIZER_FIX
+OPTIMIZER_PRUNE_LEVEL
+OPTIMIZER_SEARCH_DEPTH
+OPTIMIZER_SWITCH
+PID_FILE
+PLUGIN_DIR
+PORT
+PRELOAD_BUFFER_SIZE
+PROFILING
+PROFILING_HISTORY_SIZE
+PROFILING_SERVER
+PROFILING_USE_GETRUSAGE
+PROTOCOL_VERSION
+PSEUDO_THREAD_ID
+QUERY_ALLOC_BLOCK_SIZE
+QUERY_CACHE_LIMIT
+QUERY_CACHE_MIN_RES_UNIT
+QUERY_CACHE_SIZE
+QUERY_CACHE_STRIP_COMMENTS
+QUERY_CACHE_TYPE
+QUERY_CACHE_WLOCK_INVALIDATE
+QUERY_EXEC_TIME
+QUERY_PREALLOC_SIZE
+QUERY_RESPONSE_TIME_RANGE_BASE
+RAND_SEED1
+RAND_SEED2
+RANGE_ALLOC_BLOCK_SIZE
+READ_BUFFER_SIZE
+READ_ONLY
+READ_RND_BUFFER_SIZE
+RELAY_LOG
+RELAY_LOG_INDEX
+RELAY_LOG_INFO_FILE
+RELAY_LOG_PURGE
+RELAY_LOG_SPACE_LIMIT
+REPORT_HOST
+REPORT_PASSWORD
+REPORT_PORT
+REPORT_USER
+RPL_RECOVERY_RANK
+SECURE_AUTH
+SECURE_FILE_PRIV
+SERVER_ID
+SKIP_EXTERNAL_LOCKING
+SKIP_NAME_RESOLVE
+SKIP_NETWORKING
+SKIP_SHOW_DATABASE
+SLAVE_COMPRESSED_PROTOCOL
+SLAVE_EXEC_MODE
+SLAVE_LOAD_TMPDIR
+SLAVE_NET_TIMEOUT
+SLAVE_SKIP_ERRORS
+SLAVE_TRANSACTION_RETRIES
+SLOW_LAUNCH_TIME
+SLOW_QUERY_LOG
+SLOW_QUERY_LOG_FILE
+SLOW_QUERY_LOG_LOCK_TIME
+SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP
+SLOW_QUERY_LOG_QUERY_TIME
+SOCKET
+SORT_BUFFER_SIZE
+SQL_AUTO_IS_NULL
+SQL_BIG_SELECTS
+SQL_BIG_TABLES
+SQL_BUFFER_RESULT
+SQL_LOG_BIN
+SQL_LOG_OFF
+SQL_LOG_UPDATE
+SQL_LOW_PRIORITY_UPDATES
+SQL_MAX_JOIN_SIZE
+SQL_MODE
+SQL_NOTES
+SQL_QUOTE_SHOW_CREATE
+SQL_SAFE_UPDATES
+SQL_SELECT_LIMIT
+SQL_SLAVE_SKIP_COUNTER
+SQL_WARNINGS
+SSL_CA
+SSL_CAPATH
+SSL_CERT
+SSL_CIPHER
+SSL_KEY
+STORAGE_ENGINE
+SUPPRESS_LOG_WARNING_1592
+SYNC_BINLOG
+SYNC_FRM
+SYSTEM_TIME_ZONE
+TABLE_DEFINITION_CACHE
+TABLE_LOCK_WAIT_TIMEOUT
+TABLE_OPEN_CACHE
+TABLE_TYPE
+THREAD_CACHE_SIZE
+THREAD_HANDLING
+THREAD_STACK
+THREAD_STATISTICS
+TIMED_MUTEXES
+TIMESTAMP
+TIME_FORMAT
+TIME_ZONE
+TMPDIR
+TMP_TABLE_SIZE
+TRANSACTION_ALLOC_BLOCK_SIZE
+TRANSACTION_PREALLOC_SIZE
+TX_ISOLATION
+UNIQUE_CHECKS
+UPDATABLE_VIEWS_WITH_LIMIT
+USERSTAT_RUNNING
+USE_GLOBAL_LOG_SLOW_CONTROL
+USE_GLOBAL_LONG_QUERY_TIME
+VERSION
+VERSION_COMMENT
+VERSION_COMPILE_MACHINE
+VERSION_COMPILE_OS
+WAIT_TIMEOUT
+WARNING_COUNT
 
=== added file 'Percona-Server/mysql-test/r/percona_server_variables_release.result.OTHER'
--- Percona-Server/mysql-test/r/percona_server_variables_release.result.OTHER	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_server_variables_release.result.OTHER	2012-08-15 14:13:50 +0000
@@ -0,0 +1,352 @@
+SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1;
+Variable_name
+AUTOCOMMIT
+AUTOMATIC_SP_PRIVILEGES
+AUTO_INCREMENT_INCREMENT
+AUTO_INCREMENT_OFFSET
+BACK_LOG
+BASEDIR
+BIG_TABLES
+BINLOG_CACHE_SIZE
+BINLOG_DIRECT_NON_TRANSACTIONAL_UPDATES
+BINLOG_FORMAT
+BULK_INSERT_BUFFER_SIZE
+CHARACTER_SETS_DIR
+CHARACTER_SET_CLIENT
+CHARACTER_SET_CONNECTION
+CHARACTER_SET_DATABASE
+CHARACTER_SET_FILESYSTEM
+CHARACTER_SET_RESULTS
+CHARACTER_SET_SERVER
+CHARACTER_SET_SYSTEM
+COLLATION_CONNECTION
+COLLATION_DATABASE
+COLLATION_SERVER
+COMPLETION_TYPE
+CONCURRENT_INSERT
+CONNECT_TIMEOUT
+DATADIR
+DATETIME_FORMAT
+DATE_FORMAT
+DEFAULT_WEEK_FORMAT
+DELAYED_INSERT_LIMIT
+DELAYED_INSERT_TIMEOUT
+DELAYED_QUEUE_SIZE
+DELAY_KEY_WRITE
+DIV_PRECISION_INCREMENT
+ENABLE_QUERY_RESPONSE_TIME_STATS
+ENGINE_CONDITION_PUSHDOWN
+ERROR_COUNT
+EVENT_SCHEDULER
+EXPAND_FAST_INDEX_CREATION
+EXPIRE_LOGS_DAYS
+FAST_INDEX_CREATION
+FLUSH
+FLUSH_TIME
+FOREIGN_KEY_CHECKS
+FT_BOOLEAN_SYNTAX
+FT_MAX_WORD_LEN
+FT_MIN_WORD_LEN
+FT_QUERY_EXPANSION_LIMIT
+FT_STOPWORD_FILE
+GENERAL_LOG
+GENERAL_LOG_FILE
+GROUP_CONCAT_MAX_LEN
+HAVE_COMMUNITY_FEATURES
+HAVE_COMPRESS
+HAVE_CRYPT
+HAVE_CSV
+HAVE_DYNAMIC_LOADING
+HAVE_GEOMETRY
+HAVE_INNODB
+HAVE_NDBCLUSTER
+HAVE_OPENSSL
+HAVE_PARTITIONING
+HAVE_QUERY_CACHE
+HAVE_RESPONSE_TIME_DISTRIBUTION
+HAVE_RTREE_KEYS
+HAVE_SSL
+HAVE_SYMLINK
+HOSTNAME
+IDENTITY
+IGNORE_BUILTIN_INNODB
+INIT_CONNECT
+INIT_FILE
+INIT_SLAVE
+INNODB_ADAPTIVE_CHECKPOINT
+INNODB_ADAPTIVE_FLUSHING
+INNODB_ADAPTIVE_HASH_INDEX
+INNODB_ADDITIONAL_MEM_POOL_SIZE
+INNODB_AUTOEXTEND_INCREMENT
+INNODB_AUTOINC_LOCK_MODE
+INNODB_AUTO_LRU_DUMP
+INNODB_BLOCKING_LRU_RESTORE
+INNODB_BUFFER_POOL_SHM_CHECKSUM
+INNODB_BUFFER_POOL_SHM_KEY
+INNODB_BUFFER_POOL_SIZE
+INNODB_CHANGED_PAGES_LIMIT
+INNODB_CHANGE_BUFFERING
+INNODB_CHECKPOINT_AGE_TARGET
+INNODB_CHECKSUMS
+INNODB_COMMIT_CONCURRENCY
+INNODB_CONCURRENCY_TICKETS
+INNODB_DATA_FILE_PATH
+INNODB_DATA_HOME_DIR
+INNODB_DICT_SIZE_LIMIT
+INNODB_DOUBLEWRITE
+INNODB_DOUBLEWRITE_FILE
+INNODB_ENABLE_UNSAFE_GROUP_COMMIT
+INNODB_EXPAND_IMPORT
+INNODB_EXTRA_RSEGMENTS
+INNODB_EXTRA_UNDOSLOTS
+INNODB_FAKE_CHANGES
+INNODB_FAST_CHECKSUM
+INNODB_FAST_RECOVERY
+INNODB_FAST_SHUTDOWN
+INNODB_FILE_FORMAT
+INNODB_FILE_FORMAT_CHECK
+INNODB_FILE_PER_TABLE
+INNODB_FLUSH_LOG_AT_TRX_COMMIT
+INNODB_FLUSH_LOG_AT_TRX_COMMIT_SESSION
+INNODB_FLUSH_METHOD
+INNODB_FLUSH_NEIGHBOR_PAGES
+INNODB_FORCE_RECOVERY
+INNODB_IBUF_ACCEL_RATE
+INNODB_IBUF_ACTIVE_CONTRACT
+INNODB_IBUF_MAX_SIZE
+INNODB_IO_CAPACITY
+INNODB_KILL_IDLE_TRANSACTION
+INNODB_LAZY_DROP_TABLE
+INNODB_LOCKS_UNSAFE_FOR_BINLOG
+INNODB_LOCK_WAIT_TIMEOUT
+INNODB_LOG_BLOCK_SIZE
+INNODB_LOG_BUFFER_SIZE
+INNODB_LOG_FILES_IN_GROUP
+INNODB_LOG_FILE_SIZE
+INNODB_LOG_GROUP_HOME_DIR
+INNODB_MAX_DIRTY_PAGES_PCT
+INNODB_MAX_PURGE_LAG
+INNODB_MIRRORED_LOG_GROUPS
+INNODB_OLD_BLOCKS_PCT
+INNODB_OLD_BLOCKS_TIME
+INNODB_OPEN_FILES
+INNODB_OVERWRITE_RELAY_LOG_INFO
+INNODB_PAGE_SIZE
+INNODB_PASS_CORRUPT_TABLE
+INNODB_RANDOM_READ_AHEAD
+INNODB_READ_AHEAD
+INNODB_READ_AHEAD_THRESHOLD
+INNODB_READ_IO_THREADS
+INNODB_RECOVERY_STATS
+INNODB_REPLICATION_DELAY
+INNODB_ROLLBACK_ON_TIMEOUT
+INNODB_SHOW_LOCKS_HELD
+INNODB_SHOW_VERBOSE_LOCKS
+INNODB_SPIN_WAIT_DELAY
+INNODB_STATS_AUTO_UPDATE
+INNODB_STATS_METHOD
+INNODB_STATS_ON_METADATA
+INNODB_STATS_SAMPLE_PAGES
+INNODB_STATS_UPDATE_NEED_LOCK
+INNODB_STRICT_MODE
+INNODB_SUPPORT_XA
+INNODB_SYNC_SPIN_LOOPS
+INNODB_TABLE_LOCKS
+INNODB_THREAD_CONCURRENCY
+INNODB_THREAD_CONCURRENCY_TIMER_BASED
+INNODB_THREAD_SLEEP_DELAY
+INNODB_TRACK_CHANGED_PAGES
+INNODB_USE_PURGE_THREAD
+INNODB_USE_SYS_MALLOC
+INNODB_USE_SYS_STATS_TABLE
+INNODB_VERSION
+INNODB_WRITE_IO_THREADS
+INSERT_ID
+INTERACTIVE_TIMEOUT
+JOIN_BUFFER_SIZE
+KEEP_FILES_ON_CREATE
+KEY_BUFFER_SIZE
+KEY_CACHE_AGE_THRESHOLD
+KEY_CACHE_BLOCK_SIZE
+KEY_CACHE_DIVISION_LIMIT
+LANGUAGE
+LARGE_FILES_SUPPORT
+LARGE_PAGES
+LARGE_PAGE_SIZE
+LAST_INSERT_ID
+LC_TIME_NAMES
+LICENSE
+LOCAL_INFILE
+LOCKED_IN_MEMORY
+LOG
+LOG_BIN
+LOG_BIN_TRUST_FUNCTION_CREATORS
+LOG_BIN_TRUST_ROUTINE_CREATORS
+LOG_ERROR
+LOG_OUTPUT
+LOG_QUERIES_NOT_USING_INDEXES
+LOG_SLAVE_UPDATES
+LOG_SLOW_ADMIN_STATEMENTS
+LOG_SLOW_FILTER
+LOG_SLOW_QUERIES
+LOG_SLOW_RATE_LIMIT
+LOG_SLOW_SLAVE_STATEMENTS
+LOG_SLOW_SP_STATEMENTS
+LOG_SLOW_TIMESTAMP_EVERY
+LOG_SLOW_VERBOSITY
+LOG_WARNINGS
+LONG_QUERY_TIME
+LOWER_CASE_FILE_SYSTEM
+LOWER_CASE_TABLE_NAMES
+LOW_PRIORITY_UPDATES
+MAX_ALLOWED_PACKET
+MAX_BINLOG_CACHE_SIZE
+MAX_BINLOG_SIZE
+MAX_CONNECTIONS
+MAX_CONNECT_ERRORS
+MAX_DELAYED_THREADS
+MAX_ERROR_COUNT
+MAX_HEAP_TABLE_SIZE
+MAX_INSERT_DELAYED_THREADS
+MAX_JOIN_SIZE
+MAX_LENGTH_FOR_SORT_DATA
+MAX_LONG_DATA_SIZE
+MAX_PREPARED_STMT_COUNT
+MAX_RELAY_LOG_SIZE
+MAX_SEEKS_FOR_KEY
+MAX_SORT_LENGTH
+MAX_SP_RECURSION_DEPTH
+MAX_TMP_TABLES
+MAX_USER_CONNECTIONS
+MAX_WRITE_LOCK_COUNT
+MIN_EXAMINED_ROW_LIMIT
+MULTI_RANGE_COUNT
+MYISAM_DATA_POINTER_SIZE
+MYISAM_MAX_SORT_FILE_SIZE
+MYISAM_MMAP_SIZE
+MYISAM_RECOVER_OPTIONS
+MYISAM_REPAIR_THREADS
+MYISAM_SORT_BUFFER_SIZE
+MYISAM_STATS_METHOD
+MYISAM_USE_MMAP
+NET_BUFFER_LENGTH
+NET_READ_TIMEOUT
+NET_RETRY_COUNT
+NET_WRITE_TIMEOUT
+NEW
+OLD
+OLD_ALTER_TABLE
+OLD_PASSWORDS
+OPEN_FILES_LIMIT
+OPTIMIZER_FIX
+OPTIMIZER_PRUNE_LEVEL
+OPTIMIZER_SEARCH_DEPTH
+OPTIMIZER_SWITCH
+PID_FILE
+PLUGIN_DIR
+PORT
+PRELOAD_BUFFER_SIZE
+PROFILING
+PROFILING_HISTORY_SIZE
+PROFILING_SERVER
+PROFILING_USE_GETRUSAGE
+PROTOCOL_VERSION
+PSEUDO_THREAD_ID
+QUERY_ALLOC_BLOCK_SIZE
+QUERY_CACHE_LIMIT
+QUERY_CACHE_MIN_RES_UNIT
+QUERY_CACHE_SIZE
+QUERY_CACHE_STRIP_COMMENTS
+QUERY_CACHE_TYPE
+QUERY_CACHE_WLOCK_INVALIDATE
+QUERY_PREALLOC_SIZE
+QUERY_RESPONSE_TIME_RANGE_BASE
+RAND_SEED1
+RAND_SEED2
+RANGE_ALLOC_BLOCK_SIZE
+READ_BUFFER_SIZE
+READ_ONLY
+READ_RND_BUFFER_SIZE
+RELAY_LOG
+RELAY_LOG_INDEX
+RELAY_LOG_INFO_FILE
+RELAY_LOG_PURGE
+RELAY_LOG_SPACE_LIMIT
+REPORT_HOST
+REPORT_PASSWORD
+REPORT_PORT
+REPORT_USER
+RPL_RECOVERY_RANK
+SECURE_AUTH
+SECURE_FILE_PRIV
+SERVER_ID
+SKIP_EXTERNAL_LOCKING
+SKIP_NAME_RESOLVE
+SKIP_NETWORKING
+SKIP_SHOW_DATABASE
+SLAVE_COMPRESSED_PROTOCOL
+SLAVE_EXEC_MODE
+SLAVE_LOAD_TMPDIR
+SLAVE_NET_TIMEOUT
+SLAVE_SKIP_ERRORS
+SLAVE_TRANSACTION_RETRIES
+SLOW_LAUNCH_TIME
+SLOW_QUERY_LOG
+SLOW_QUERY_LOG_FILE
+SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP
+SOCKET
+SORT_BUFFER_SIZE
+SQL_AUTO_IS_NULL
+SQL_BIG_SELECTS
+SQL_BIG_TABLES
+SQL_BUFFER_RESULT
+SQL_LOG_BIN
+SQL_LOG_OFF
+SQL_LOG_UPDATE
+SQL_LOW_PRIORITY_UPDATES
+SQL_MAX_JOIN_SIZE
+SQL_MODE
+SQL_NOTES
+SQL_QUOTE_SHOW_CREATE
+SQL_SAFE_UPDATES
+SQL_SELECT_LIMIT
+SQL_SLAVE_SKIP_COUNTER
+SQL_WARNINGS
+SSL_CA
+SSL_CAPATH
+SSL_CERT
+SSL_CIPHER
+SSL_KEY
+STORAGE_ENGINE
+SUPPRESS_LOG_WARNING_1592
+SYNC_BINLOG
+SYNC_FRM
+SYSTEM_TIME_ZONE
+TABLE_DEFINITION_CACHE
+TABLE_LOCK_WAIT_TIMEOUT
+TABLE_OPEN_CACHE
+TABLE_TYPE
+THREAD_CACHE_SIZE
+THREAD_HANDLING
+THREAD_STACK
+THREAD_STATISTICS
+TIMED_MUTEXES
+TIMESTAMP
+TIME_FORMAT
+TIME_ZONE
+TMPDIR
+TMP_TABLE_SIZE
+TRANSACTION_ALLOC_BLOCK_SIZE
+TRANSACTION_PREALLOC_SIZE
+TX_ISOLATION
+UNIQUE_CHECKS
+UPDATABLE_VIEWS_WITH_LIMIT
+USERSTAT_RUNNING
+USE_GLOBAL_LOG_SLOW_CONTROL
+USE_GLOBAL_LONG_QUERY_TIME
+VERSION
+VERSION_COMMENT
+VERSION_COMPILE_MACHINE
+VERSION_COMPILE_OS
+WAIT_TIMEOUT
+WARNING_COUNT
 
=== added directory 'Percona-Server/mysql-test/suite/innodb_plugin'
=== added directory 'Percona-Server/mysql-test/suite/innodb_plugin/r'
=== renamed file 'Percona-Server/mysql-test/suite/innodb/r/percona_bug_951588.result' => 'Percona-Server/mysql-test/suite/innodb_plugin/r/percona_bug_951588.result'
=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_page_bmp.result'
--- Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_page_bmp.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_page_bmp.result	2012-08-15 14:13:50 +0000
@@ -0,0 +1,21 @@
+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;
+SET GLOBAL INNODB_FAST_SHUTDOWN=2;
+call mtr.add_suppression("InnoDB: Warning: truncated block detected.*");
+DROP TABLE t1, t2;
 
=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_page_bmp_no_restart.result'
--- Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_page_bmp_no_restart.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_page_bmp_no_restart.result	2012-08-15 14:13:50 +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_plugin/r/percona_changed_pages.result'
--- Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_pages.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_pages.result	2012-08-15 14:13:50 +0000
@@ -0,0 +1,41 @@
+SELECT @@innodb_track_changed_pages;
+@@innodb_track_changed_pages
+1
+SET @OLD_INNODB_CHANGED_PAGES_LIMIT = @@GLOBAL.INNODB_CHANGED_PAGES_LIMIT;
+SET GLOBAL INNODB_CHANGED_PAGES_LIMIT = 0;
+CREATE TABLE T1 (F1 CHAR(255)) ENGINE=INNODB;
+SET @t1_space_id =
+(SELECT SPACE
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE
+INFORMATION_SCHEMA.INNODB_SYS_TABLES.SCHEMA='test' AND
+INFORMATION_SCHEMA.INNODB_SYS_TABLES.NAME='T1');
+SET GLOBAL INNODB_CHANGED_PAGES_LIMIT = 0;
+SELECT COUNT(DISTINCT PAGE_ID) >= (1024000/16384)
+FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+WHERE SPACE_ID = @t1_space_id;
+COUNT(DISTINCT PAGE_ID) >= (1024000/16384)
+1
+SELECT MAX(PAGE_ID) < (3*1024000/16384)
+FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+WHERE SPACE_ID = @t1_space_id;
+MAX(PAGE_ID) < (3*1024000/16384)
+1
+SELECT COUNT(*)
+FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+WHERE START_LSN >= END_LSN;
+COUNT(*)
+0
+SELECT COUNT(*) = @cond_test_pages_count
+FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+WHERE
+END_LSN > (@cond_test_lsn - 1) AND
+END_LSN < (@cond_test_lsn + 1);
+COUNT(*) = @cond_test_pages_count
+1
+SET GLOBAL INNODB_CHANGED_PAGES_LIMIT = 1;
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES;
+COUNT(*)
+1
+SET GLOBAL INNODB_CHANGED_PAGES_LIMIT = @OLD_INNODB_CHANGED_PAGES_LIMIT;
+DROP TABLE T1;
 
=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_pages_empty.result'
--- Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_pages_empty.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_pages_empty.result	2012-08-15 14:13:50 +0000
@@ -0,0 +1,2 @@
+SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES;
+space_id	page_id	start_lsn	end_lsn
 
=== added 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	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/r/percona_skip_innodb_i_s.result	2012-08-15 14:13:50 +0000
@@ -0,0 +1,94 @@
+SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='INFORMATION_SCHEMA' AND TABLE_NAME LIKE 'INNODB%' ORDER BY TABLE_NAME;
+TABLE_NAME
+INNODB_BUFFER_POOL_PAGES
+INNODB_BUFFER_POOL_PAGES_BLOB
+INNODB_BUFFER_POOL_PAGES_INDEX
+INNODB_CHANGED_PAGES
+INNODB_CMP
+INNODB_CMPMEM
+INNODB_CMPMEM_RESET
+INNODB_CMP_RESET
+INNODB_INDEX_STATS
+INNODB_LOCKS
+INNODB_LOCK_WAITS
+INNODB_RSEG
+INNODB_SYS_INDEXES
+INNODB_SYS_STATS
+INNODB_SYS_TABLES
+INNODB_TABLE_STATS
+INNODB_TRX
+SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='INFORMATION_SCHEMA' AND TABLE_NAME LIKE 'XTRADB%' ORDER BY TABLE_NAME;
+TABLE_NAME
+XTRADB_ADMIN_COMMAND
+SELECT * FROM INFORMATION_SCHEMA.INNODB_BUFFER_POOL_PAGES_INDEX;
+index_id	space_id	page_no	n_recs	data_size	hashed	access_time	modified	dirty	old	lru_position	fix_count	flush_type
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_BUFFER_POOL_PAGES_INDEX but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_RSEG;
+rseg_id	space_id	zip_size	page_no	max_size	curr_size
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_RSEG but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_CMP;
+page_size	compress_ops	compress_ops_ok	compress_time	uncompress_ops	uncompress_time
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_CMP but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_TRX;
+trx_id	trx_state	trx_started	trx_requested_lock_id	trx_wait_started	trx_weight	trx_mysql_thread_id	trx_query
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_TRX but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_LOCK_WAITS;
+requesting_trx_id	requested_lock_id	blocking_trx_id	blocking_lock_id
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_LOCK_WAITS but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_LOCKS;
+lock_id	lock_trx_id	lock_mode	lock_type	lock_table	lock_index	lock_space	lock_page	lock_rec	lock_data
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_LOCKS but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_CMP_RESET;
+page_size	compress_ops	compress_ops_ok	compress_time	uncompress_ops	uncompress_time
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_CMP_RESET but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_BUFFER_POOL_PAGES;
+page_type	space_id	page_no	lru_position	fix_count	flush_type
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_BUFFER_POOL_PAGES but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES;
+SCHEMA	NAME	ID	N_COLS	TYPE	MIX_ID	MIX_LEN	CLUSTER_NAME	SPACE
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_SYS_TABLES but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_BUFFER_POOL_PAGES_INDEX;
+index_id	space_id	page_no	n_recs	data_size	hashed	access_time	modified	dirty	old	lru_position	fix_count	flush_type
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_BUFFER_POOL_PAGES_INDEX but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_CMPMEM;
+page_size	pages_used	pages_free	relocation_ops	relocation_time
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_CMPMEM but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_BUFFER_POOL_PAGES_BLOB;
+space_id	page_no	compressed	part_len	next_page_no	lru_position	fix_count	flush_type
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_BUFFER_POOL_PAGES_BLOB but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_CMPMEM_RESET;
+page_size	pages_used	pages_free	relocation_ops	relocation_time
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_CMPMEM_RESET but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS;
+table_schema	table_name	rows	clust_size	other_size	modified
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_TABLE_STATS but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_STATS;
+INDEX_ID	KEY_COLS	DIFF_VALS	NON_NULL_VALS
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_SYS_STATS but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_INDEX_STATS;
+table_schema	table_name	index_name	fields	row_per_keys	index_size	leaf_pages
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_INDEX_STATS but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_INDEXES;
+TABLE_ID	ID	NAME	N_FIELDS	TYPE	SPACE	PAGE_NO
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_SYS_INDEXES but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.XTRADB_ADMIN_COMMAND;
+result_message
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.XTRADB_ADMIN_COMMAND but the InnoDB storage engine is not installed
 
=== added directory 'Percona-Server/mysql-test/suite/innodb_plugin/t'
=== renamed file 'Percona-Server/mysql-test/suite/innodb/t/percona_bug_951588.test' => 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_bug_951588.test'
--- Percona-Server/mysql-test/suite/innodb/t/percona_bug_951588.test	2012-06-07 11:22:38 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_bug_951588.test	2012-08-15 14:13:50 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 # Test for bug 951588 (Querying I_S.TEMPORARY_TABLES crashes parallel threads working on temp tables)
 
 --source include/have_innodb.inc
@@ -27,3 +28,34 @@
 DROP TABLE t1;
 
 SET DEBUG_SYNC='reset';
+=======
+# Test for bug 951588 (Querying I_S.TEMPORARY_TABLES crashes parallel threads working on temp tables)
+
+--source include/have_innodb_plugin.inc
+--source include/have_debug_sync.inc
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+CREATE TEMPORARY TABLE t1 (a INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1), (2), (3);
+
+SET DEBUG_SYNC= 'start_ha_write_row SIGNAL write_in_progress WAIT_FOR i_s_completed';
+send ALTER TABLE t1 ADD COLUMN b VARCHAR(10);
+
+connect (conn2,localhost,root,,);
+connection conn2;
+
+SET DEBUG_SYNC= 'now WAIT_FOR write_in_progress';
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.GLOBAL_TEMPORARY_TABLES;
+SET DEBUG_SYNC= 'now SIGNAL i_s_completed';
+
+disconnect conn2;
+connection default;
+reap;
+
+DROP TABLE t1;
+
+SET DEBUG_SYNC='reset';
+>>>>>>> MERGE-SOURCE
 
=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp-master.opt'
--- Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp-master.opt	2012-08-15 14:13:50 +0000
@@ -0,0 +1,1 @@
+--innodb_track_changed_pages=TRUE --innodb_log_file_size=1M --innodb_file_per_table --skip-stack-trace --skip-core-file
 
=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp.test'
--- Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp.test	2012-08-15 14:13:50 +0000
@@ -0,0 +1,100 @@
+# 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_plugin.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
+
+# 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;
+
+# Restart the server again with the very fast shutdown
+SET GLOBAL INNODB_FAST_SHUTDOWN=2;
+
+--source include/restart_mysqld.inc
+
+file_exists $BITMAP_FILE;
+
+# 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;
+
+# 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;
+
+DROP TABLE t1, t2;
 
=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_no_restart-master.opt'
--- Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_no_restart-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_no_restart-master.opt	2012-08-15 14:13:50 +0000
@@ -0,0 +1,1 @@
+--innodb_track_changed_pages=TRUE --innodb-file-per-table
 
=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_no_restart.test'
--- Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_no_restart.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_no_restart.test	2012-08-15 14:13:50 +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_plugin.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/innodb_plugin/t/percona_changed_pages-master.opt'
--- Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_pages-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_pages-master.opt	2012-08-15 14:13:50 +0000
@@ -0,0 +1,1 @@
+--innodb_track_changed_pages=TRUE --innodb_log_file_size=1M --innodb-file-per-table
 
=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_pages.test'
--- Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_pages.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_pages.test	2012-08-15 14:13:50 +0000
@@ -0,0 +1,103 @@
+###########################################
+# Test for I_S.INNODB_CHANGED_PAGES table #
+###########################################
+
+--source include/have_innodb_plugin.inc
+
+SELECT @@innodb_track_changed_pages;
+
+SET @OLD_INNODB_CHANGED_PAGES_LIMIT = @@GLOBAL.INNODB_CHANGED_PAGES_LIMIT;
+
+SET GLOBAL INNODB_CHANGED_PAGES_LIMIT = 0;
+
+CREATE TABLE T1 (F1 CHAR(255)) ENGINE=INNODB;
+SET @t1_space_id =
+	(SELECT SPACE
+		FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+		WHERE
+		INFORMATION_SCHEMA.INNODB_SYS_TABLES.SCHEMA='test' AND
+		INFORMATION_SCHEMA.INNODB_SYS_TABLES.NAME='T1');
+
+--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");
+}
+
+###################################################################
+# Gather data for condition pushdown testing not using conditions #
+###################################################################
+SET @cond_test_lsn=
+	(SELECT MIN(end_lsn)
+		FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES);
+
+SET @cond_test_pages_count=
+	(SELECT count(*)
+		FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+		GROUP BY end_lsn
+		ORDER BY end_lsn
+		LIMIT 1);
+
+--enable_query_log
+--enable_result_log
+
+###############################################################
+# Check if the number of changed pages is greater than 1M/16K #
+###############################################################
+SET GLOBAL INNODB_CHANGED_PAGES_LIMIT = 0;
+SELECT COUNT(DISTINCT PAGE_ID) >= (1024000/16384)
+  FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+  WHERE SPACE_ID = @t1_space_id;
+############################################################# 
+# Check if the maximum page id is less than resonable limit #
+#############################################################
+SELECT MAX(PAGE_ID) < (3*1024000/16384)
+  FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+  WHERE SPACE_ID = @t1_space_id;
+########################################################
+# The records where START_LSN >= END_LSN should absent #
+########################################################
+SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+  WHERE START_LSN >= END_LSN;
+
+######################################################
+# Check condition if pushdown doesn't break anything #
+######################################################
+SELECT COUNT(*) = @cond_test_pages_count
+  FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
+  WHERE
+  END_LSN > (@cond_test_lsn - 1) AND
+  END_LSN < (@cond_test_lsn + 1);
+
+################################################
+# Check how limit for maximum rows count works #
+################################################
+SET GLOBAL INNODB_CHANGED_PAGES_LIMIT = 1;
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES;
+
+SET GLOBAL INNODB_CHANGED_PAGES_LIMIT = @OLD_INNODB_CHANGED_PAGES_LIMIT;
+
+DROP TABLE T1;
 
=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_pages_empty-master.opt'
--- Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_pages_empty-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_pages_empty-master.opt	2012-08-15 14:13:50 +0000
@@ -0,0 +1,1 @@
+--innodb_track_changed_pages=false
 
=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_pages_empty.test'
--- Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_pages_empty.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_pages_empty.test	2012-08-15 14:13:50 +0000
@@ -0,0 +1,8 @@
+###############################################################################
+# Test for empty I_S.INNODB_CHANGED_PAGES table. The table should be empty if#
+# innodb_track_changed_pages is false.                                        #
+###############################################################################
+
+--source include/have_innodb_plugin.inc
+
+SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES; 
 
=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_skip_innodb_i_s-master.opt'
--- Percona-Server/mysql-test/suite/innodb_plugin/t/percona_skip_innodb_i_s-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_skip_innodb_i_s-master.opt	2012-08-15 14:13:50 +0000
@@ -0,0 +1,1 @@
+--skip-innodb
 
=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_skip_innodb_i_s.test'
--- Percona-Server/mysql-test/suite/innodb_plugin/t/percona_skip_innodb_i_s.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_skip_innodb_i_s.test	2012-08-15 14:13:50 +0000
@@ -0,0 +1,21 @@
+# we just test that we don't crash. The SELECT below is to ensure we update the test if we add I_S tables for INNODB or XTRADB
+SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='INFORMATION_SCHEMA' AND TABLE_NAME LIKE 'INNODB%' ORDER BY TABLE_NAME;
+SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='INFORMATION_SCHEMA' AND TABLE_NAME LIKE 'XTRADB%' ORDER BY TABLE_NAME;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_BUFFER_POOL_PAGES_INDEX;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_RSEG;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_CMP;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_TRX;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_LOCK_WAITS;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_LOCKS;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_CMP_RESET;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_BUFFER_POOL_PAGES;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_BUFFER_POOL_PAGES_INDEX;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_CMPMEM;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_BUFFER_POOL_PAGES_BLOB;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_CMPMEM_RESET;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_STATS;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_INDEX_STATS;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_INDEXES;
+SELECT * FROM INFORMATION_SCHEMA.XTRADB_ADMIN_COMMAND;
 
=== modified file 'Percona-Server/sql/handler.cc'
--- Percona-Server/sql/handler.cc	2012-08-13 13:42:13 +0000
+++ Percona-Server/sql/handler.cc	2012-08-15 14:13:50 +0000
@@ -38,8 +38,12 @@
 #include <myisampack.h>
 #include "transaction.h"
 #include <errno.h>
+<<<<<<< TREE
 #include "probes_mysql.h"
 #include "debug_sync.h"         // DEBUG_SYNC
+=======
+#include "debug_sync.h"         // DEBUG_SYNC
+>>>>>>> MERGE-SOURCE
 
 #ifdef WITH_PARTITION_STORAGE_ENGINE
 #include "ha_partition.h"
 
=== modified file 'Percona-Server/sql/signal_handler.cc'
=== modified file 'Percona-Server/sql/sql_show.cc'
=== modified file 'Percona-Server/storage/innobase/dict/dict0dict.c'
=== modified file 'Percona-Server/storage/innobase/fil/fil0fil.c'
--- Percona-Server/storage/innobase/fil/fil0fil.c	2012-08-07 06:10:00 +0000
+++ Percona-Server/storage/innobase/fil/fil0fil.c	2012-08-15 14:13:50 +0000
@@ -3558,9 +3558,15 @@
 						}
 					}
 
+<<<<<<< TREE
 					if (fil_page_get_type(page) ==
 					    FIL_PAGE_INDEX && !is_descr_page) {
 						index_id_t tmp = mach_read_from_8(page + (PAGE_HEADER + PAGE_INDEX_ID));
+=======
+					if (fil_page_get_type(page) ==
+					    FIL_PAGE_INDEX && !is_descr_page) {
+						dulint tmp = mach_read_from_8(page + (PAGE_HEADER + PAGE_INDEX_ID));
+>>>>>>> MERGE-SOURCE
 
 						for (i = 0; i < n_index; i++) {
 							if (old_id[i] == tmp) {
 
=== 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-15 14:13:50 +0000
@@ -12658,6 +12658,18 @@
   "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);
+
+static MYSQL_SYSVAR_ULONGLONG(changed_pages_limit, srv_changed_pages_limit,
+  PLUGIN_VAR_RQCMDARG,
+  "The maximum number of rows for "
+  "INFORMATION_SCHEMA.INNODB_CHANGED_PAGES table, "
+  "0 - unlimited",
+  NULL, NULL, 1000000, 0, ~0ULL, 0);
+
 #if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
 static MYSQL_SYSVAR_UINT(change_buffering_debug, ibuf_debug,
   PLUGIN_VAR_RQCMDARG,
@@ -12942,6 +12954,8 @@
   MYSQL_SYSVAR(use_sys_malloc),
   MYSQL_SYSVAR(use_native_aio),
   MYSQL_SYSVAR(change_buffering),
+  MYSQL_SYSVAR(track_changed_pages),
+  MYSQL_SYSVAR(changed_pages_limit),
 #if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
   MYSQL_SYSVAR(change_buffering_debug),
 #endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
@@ -12996,12 +13010,16 @@
 i_s_innodb_sys_foreign,
 i_s_innodb_sys_foreign_cols,
 i_s_innodb_sys_stats,
+<<<<<<< TREE
 i_s_innodb_table_stats,
 i_s_innodb_index_stats,
 i_s_innodb_buffer_pool_pages,
 i_s_innodb_buffer_pool_pages_index,
 i_s_innodb_buffer_pool_pages_blob,
 i_s_innodb_admin_command
+=======
+i_s_innodb_changed_pages
+>>>>>>> MERGE-SOURCE
 mysql_declare_plugin_end;
 
 /** @brief Initialize the default value of innodb_commit_concurrency.
 
=== modified file 'Percona-Server/storage/innobase/handler/i_s.cc'
--- Percona-Server/storage/innobase/handler/i_s.cc	2012-06-19 16:19:46 +0000
+++ Percona-Server/storage/innobase/handler/i_s.cc	2012-08-15 14:13:50 +0000
@@ -22,6 +22,14 @@
 
 Created July 18, 2007 Vasil Dimov
 *******************************************************/
+#ifndef MYSQL_SERVER
+#define MYSQL_SERVER /* For Item_* classes */
+#include <mysql_priv.h>
+/* Prevent influence of this definition to other headers */
+#undef MYSQL_SERVER
+#else
+#include <mysql_priv.h>
+#endif //MYSQL_SERVER
 
 #include <mysqld_error.h>
 #include <sql_acl.h>                            // PROCESS_ACL
@@ -32,8 +40,12 @@
 #include <mysys_err.h>
 #include <my_sys.h>
 #include "i_s.h"
+<<<<<<< TREE
 #include <sql_plugin.h>
 #include <mysql/innodb_priv.h>
+=======
+#include <mysql/plugin.h>
+>>>>>>> MERGE-SOURCE
 
 extern "C" {
 #include "btr0pcur.h"	/* for file sys_tables related info. */
@@ -52,7 +64,11 @@
 #include "trx0sys.h" /* for trx_sys */
 #include "dict0dict.h" /* for dict_sys */
 #include "buf0lru.h" /* for XTRA_LRU_[DUMP/RESTORE] */
+<<<<<<< TREE
 #include "btr0btr.h" /* for btr_page_get_index_id */
+=======
+#include "log0online.h"
+>>>>>>> MERGE-SOURCE
 }
 
 #define OK(expr)		\
@@ -221,6 +237,713 @@
 	return(ret);
 }
 
+<<<<<<< TREE
+=======
+static struct st_mysql_information_schema	i_s_info =
+{
+	MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION
+};
+
+static ST_FIELD_INFO	i_s_innodb_buffer_pool_pages_fields_info[] =
+{
+	{STRUCT_FLD(field_name,		"page_type"),
+	 STRUCT_FLD(field_length,	64),
+	 STRUCT_FLD(field_type,		MYSQL_TYPE_STRING),
+	 STRUCT_FLD(value,		0),
+	 STRUCT_FLD(field_flags,	MY_I_S_MAYBE_NULL),
+	 STRUCT_FLD(old_name,		""),
+	 STRUCT_FLD(open_method,	SKIP_OPEN_TABLE)},
+
+	{STRUCT_FLD(field_name,		"space_id"),
+	 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,		"page_no"),
+	 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,		"lru_position"),
+	 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,		"fix_count"),
+	 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,		"flush_type"),
+	 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
+};
+
+static ST_FIELD_INFO	i_s_innodb_buffer_pool_pages_index_fields_info[] =
+{
+	{STRUCT_FLD(field_name,		"index_id"),
+	 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,		"space_id"),
+	 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,		"page_no"),
+	 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,		"n_recs"),
+	 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,		"data_size"),
+	 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,		"hashed"),
+	 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,		"access_time"),
+	 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,		"modified"),
+	 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,		"dirty"),
+	 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,		"old"),
+	 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,		"lru_position"),
+	 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,		"fix_count"),
+	 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,		"flush_type"),
+	 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
+};
+
+static ST_FIELD_INFO	i_s_innodb_buffer_pool_pages_blob_fields_info[] =
+{
+	{STRUCT_FLD(field_name,		"space_id"),
+	 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,		"page_no"),
+	 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,		"compressed"),
+	 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,		"part_len"),
+	 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,		"next_page_no"),
+	 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,		"lru_position"),
+	 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,		"fix_count"),
+	 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,		"flush_type"),
+	 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_buffer_pool_pages. */
+static
+int
+i_s_innodb_buffer_pool_pages_fill(
+/*================*/
+				/* out: 0 on success, 1 on failure */
+	THD*		thd,	/* in: thread */
+	TABLE_LIST*	tables,	/* in/out: tables to fill */
+	COND*		cond)	/* in: condition (ignored) */
+{
+	TABLE*	table	= (TABLE *) tables->table;
+	int	status	= 0;
+
+  ulint		n_chunks, n_blocks;
+
+	buf_chunk_t*	chunk;
+
+	DBUG_ENTER("i_s_innodb_buffer_pool_pages_fill");
+
+	/* deny access to non-superusers */
+	if (check_global_access(thd, PROCESS_ACL)) {
+
+		DBUG_RETURN(0);
+	}
+
+	RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
+
+	buf_pool_mutex_enter();
+	
+	chunk = buf_pool->chunks;
+  
+	for (n_chunks = buf_pool->n_chunks; n_chunks--; chunk++) {
+		buf_block_t*	block		= chunk->blocks;
+
+    for (n_blocks	= chunk->size; n_blocks--; block++) {
+      const buf_frame_t* frame = block->frame;
+  
+      char page_type[64];
+
+      switch(fil_page_get_type(frame))
+      {
+      case FIL_PAGE_INDEX:
+        strcpy(page_type, "index");
+        break;
+      case FIL_PAGE_UNDO_LOG:
+        strcpy(page_type, "undo_log");
+        break;
+      case FIL_PAGE_INODE:
+        strcpy(page_type, "inode");
+        break;
+      case FIL_PAGE_IBUF_FREE_LIST:
+        strcpy(page_type, "ibuf_free_list");
+        break;
+      case FIL_PAGE_TYPE_ALLOCATED:
+        strcpy(page_type, "allocated");
+        break;
+      case FIL_PAGE_IBUF_BITMAP:
+        strcpy(page_type, "bitmap");
+        break;
+      case FIL_PAGE_TYPE_SYS:
+        strcpy(page_type, "sys");
+        break;
+      case FIL_PAGE_TYPE_TRX_SYS:
+        strcpy(page_type, "trx_sys");
+        break;
+      case FIL_PAGE_TYPE_FSP_HDR:
+        strcpy(page_type, "fsp_hdr");
+        break;
+      case FIL_PAGE_TYPE_XDES:
+        strcpy(page_type, "xdes");
+        break;
+      case FIL_PAGE_TYPE_BLOB:
+        strcpy(page_type, "blob");
+        break;
+      case FIL_PAGE_TYPE_ZBLOB:
+        strcpy(page_type, "zblob");
+        break;
+      case FIL_PAGE_TYPE_ZBLOB2:
+        strcpy(page_type, "zblob2");
+        break;
+      default:
+        sprintf(page_type, "unknown (type=%li)", fil_page_get_type(frame));
+      }
+      
+      field_store_string(table->field[0], page_type);
+      table->field[1]->store(block->page.space);
+      table->field[2]->store(block->page.offset);
+      table->field[3]->store(0);
+      table->field[4]->store(block->page.buf_fix_count);
+      table->field[5]->store(block->page.flush_type);
+
+      if (schema_table_store_record(thd, table)) {
+        status = 1;
+        break;
+      }
+      
+    }      
+	}
+
+	buf_pool_mutex_exit();
+
+	DBUG_RETURN(status);
+}
+
+/***********************************************************************
+Fill the dynamic table information_schema.innodb_buffer_pool_pages_index. */
+static
+int
+i_s_innodb_buffer_pool_pages_index_fill(
+/*================*/
+				/* out: 0 on success, 1 on failure */
+	THD*		thd,	/* in: thread */
+	TABLE_LIST*	tables,	/* in/out: tables to fill */
+	COND*		cond)	/* in: condition (ignored) */
+{
+	TABLE*	table	= (TABLE *) tables->table;
+	int	status	= 0;
+
+  ulint		n_chunks, n_blocks;
+  dulint		index_id;
+
+	buf_chunk_t*	chunk;
+
+	DBUG_ENTER("i_s_innodb_buffer_pool_pages_index_fill");
+
+	/* deny access to non-superusers */
+	if (check_global_access(thd, PROCESS_ACL)) {
+
+		DBUG_RETURN(0);
+	}
+
+	RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
+
+	buf_pool_mutex_enter();
+	
+	chunk = buf_pool->chunks;
+  
+	for (n_chunks = buf_pool->n_chunks; n_chunks--; chunk++) {
+		buf_block_t*	block		= chunk->blocks;
+
+		for (n_blocks	= chunk->size; n_blocks--; block++) {
+			const buf_frame_t* frame = block->frame;
+  
+      if (fil_page_get_type(frame) == FIL_PAGE_INDEX) {
+        index_id = btr_page_get_index_id(frame);
+        table->field[0]->store(ut_conv_dulint_to_longlong(index_id));
+        table->field[1]->store(block->page.space);
+        table->field[2]->store(block->page.offset);
+        table->field[3]->store(page_get_n_recs(frame));
+        table->field[4]->store(page_get_data_size(frame));
+        table->field[5]->store(block->index != NULL); /* is_hashed */
+        table->field[6]->store(block->page.access_time);
+        table->field[7]->store(block->page.newest_modification != 0);
+        table->field[8]->store(block->page.oldest_modification != 0);
+        table->field[9]->store(block->page.old);
+        table->field[10]->store(0);
+        table->field[11]->store(block->page.buf_fix_count);
+        table->field[12]->store(block->page.flush_type);
+          
+        if (schema_table_store_record(thd, table)) {
+          status = 1;
+          break;
+        }
+      }      
+    }
+	}
+
+	buf_pool_mutex_exit();
+
+	DBUG_RETURN(status);
+}
+
+/***********************************************************************
+Fill the dynamic table information_schema.innodb_buffer_pool_pages_index. */
+static
+int
+i_s_innodb_buffer_pool_pages_blob_fill(
+/*================*/
+				/* out: 0 on success, 1 on failure */
+	THD*		thd,	/* in: thread */
+	TABLE_LIST*	tables,	/* in/out: tables to fill */
+	COND*		cond)	/* in: condition (ignored) */
+{
+	TABLE*	table	= (TABLE *) tables->table;
+	int	status	= 0;
+
+  ulint		n_chunks, n_blocks;
+	buf_chunk_t*	chunk;
+	page_zip_des_t*	block_page_zip;
+
+	ulint		part_len;
+	ulint		next_page_no;
+
+	DBUG_ENTER("i_s_innodb_buffer_pool_pages_blob_fill");
+
+	/* deny access to non-superusers */
+	if (check_global_access(thd, PROCESS_ACL)) {
+
+		DBUG_RETURN(0);
+	}
+
+	RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
+
+	buf_pool_mutex_enter();
+	
+	chunk = buf_pool->chunks;
+    
+	for (n_chunks = buf_pool->n_chunks; n_chunks--; chunk++) {
+		buf_block_t*	block		= chunk->blocks;
+    block_page_zip = buf_block_get_page_zip(block);
+
+    for (n_blocks	= chunk->size; n_blocks--; block++) {
+      const buf_frame_t* frame = block->frame;
+
+      if (fil_page_get_type(frame) == FIL_PAGE_TYPE_BLOB) {
+
+        if (UNIV_LIKELY_NULL(block_page_zip)) {
+          part_len = 0; /* hmm, can't figure it out */
+  
+          next_page_no = mach_read_from_4(
+            buf_block_get_frame(block)
+            + FIL_PAGE_NEXT);        
+        } else {
+          part_len = mach_read_from_4(
+            buf_block_get_frame(block)
+            + FIL_PAGE_DATA
+            + 0 /*BTR_BLOB_HDR_PART_LEN*/);
+  
+          next_page_no = mach_read_from_4(
+            buf_block_get_frame(block)
+            + FIL_PAGE_DATA
+            + 4 /*BTR_BLOB_HDR_NEXT_PAGE_NO*/);
+        }
+
+        table->field[0]->store(block->page.space);
+        table->field[1]->store(block->page.offset);
+        table->field[2]->store(block_page_zip != NULL);
+        table->field[3]->store(part_len);
+
+        if(next_page_no == FIL_NULL)
+        {
+          table->field[4]->store(0);
+        } else {
+          table->field[4]->store(block->page.offset);
+        }
+
+        table->field[5]->store(0);
+        table->field[6]->store(block->page.buf_fix_count);
+        table->field[7]->store(block->page.flush_type);
+  
+        if (schema_table_store_record(thd, table)) {
+          status = 1;
+          break;
+        }
+
+      }
+    }      
+	}
+
+	buf_pool_mutex_exit();
+
+	DBUG_RETURN(status);
+}
+
+/***********************************************************************
+Bind the dynamic table information_schema.innodb_buffer_pool_pages. */
+static
+int
+i_s_innodb_buffer_pool_pages_init(
+/*=========*/
+			/* out: 0 on success */
+	void*	p)	/* in/out: table schema object */
+{
+	DBUG_ENTER("i_s_innodb_buffer_pool_pages_init");
+	ST_SCHEMA_TABLE* schema = (ST_SCHEMA_TABLE*) p;
+
+	schema->fields_info = i_s_innodb_buffer_pool_pages_fields_info;
+	schema->fill_table = i_s_innodb_buffer_pool_pages_fill;
+
+	DBUG_RETURN(0);
+}
+
+/***********************************************************************
+Bind the dynamic table information_schema.innodb_buffer_pool_pages. */
+static
+int
+i_s_innodb_buffer_pool_pages_index_init(
+/*=========*/
+			/* out: 0 on success */
+	void*	p)	/* in/out: table schema object */
+{
+	DBUG_ENTER("i_s_innodb_buffer_pool_pages_index_init");
+	ST_SCHEMA_TABLE* schema = (ST_SCHEMA_TABLE*) p;
+
+	schema->fields_info = i_s_innodb_buffer_pool_pages_index_fields_info;
+	schema->fill_table = i_s_innodb_buffer_pool_pages_index_fill;
+
+	DBUG_RETURN(0);
+}
+
+/***********************************************************************
+Bind the dynamic table information_schema.innodb_buffer_pool_pages. */
+static
+int
+i_s_innodb_buffer_pool_pages_blob_init(
+/*=========*/
+			/* out: 0 on success */
+	void*	p)	/* in/out: table schema object */
+{
+	DBUG_ENTER("i_s_innodb_buffer_pool_pages_blob_init");
+	ST_SCHEMA_TABLE* schema = (ST_SCHEMA_TABLE*) p;
+
+	schema->fields_info = i_s_innodb_buffer_pool_pages_blob_fields_info;
+	schema->fill_table = i_s_innodb_buffer_pool_pages_blob_fill;
+
+	DBUG_RETURN(0);
+}
+
+
+UNIV_INTERN struct st_mysql_plugin	i_s_innodb_buffer_pool_pages =
+{
+	/* the plugin type (a MYSQL_XXX_PLUGIN value) */
+	/* int */
+	STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
+
+	/* pointer to type-specific plugin descriptor */
+	/* void* */
+	STRUCT_FLD(info, &i_s_info),
+
+	/* plugin name */
+	/* const char* */
+	STRUCT_FLD(name, "INNODB_BUFFER_POOL_PAGES"),
+
+	/* plugin author (for SHOW PLUGINS) */
+	/* const char* */
+	STRUCT_FLD(author, "Percona"),
+
+	/* general descriptive text (for SHOW PLUGINS) */
+	/* const char* */
+	STRUCT_FLD(descr, "InnoDB buffer pool pages"),
+
+	/* the plugin license (PLUGIN_LICENSE_XXX) */
+	/* int */
+	STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
+
+	/* the function to invoke when plugin is loaded */
+	/* int (*)(void*); */
+	STRUCT_FLD(init, i_s_innodb_buffer_pool_pages_init),
+
+	/* the function to invoke when plugin is unloaded */
+	/* int (*)(void*); */
+	STRUCT_FLD(deinit, i_s_common_deinit),
+
+	/* plugin version (for SHOW PLUGINS) */
+	/* unsigned int */
+	STRUCT_FLD(version, 0x0100 /* 1.0 */),
+
+	/* struct st_mysql_show_var* */
+	STRUCT_FLD(status_vars, NULL),
+
+	/* struct st_mysql_sys_var** */
+	STRUCT_FLD(system_vars, NULL),
+
+	/* reserved for dependency checking */
+	/* void* */
+	STRUCT_FLD(__reserved1, NULL)
+};
+
+UNIV_INTERN struct st_mysql_plugin	i_s_innodb_buffer_pool_pages_index =
+{
+	/* the plugin type (a MYSQL_XXX_PLUGIN value) */
+	/* int */
+	STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
+
+	/* pointer to type-specific plugin descriptor */
+	/* void* */
+	STRUCT_FLD(info, &i_s_info),
+
+	/* plugin name */
+	/* const char* */
+	STRUCT_FLD(name, "INNODB_BUFFER_POOL_PAGES_INDEX"),
+
+	/* plugin author (for SHOW PLUGINS) */
+	/* const char* */
+	STRUCT_FLD(author, "Percona"),
+
+	/* general descriptive text (for SHOW PLUGINS) */
+	/* const char* */
+	STRUCT_FLD(descr, "InnoDB buffer pool index pages"),
+
+	/* the plugin license (PLUGIN_LICENSE_XXX) */
+	/* int */
+	STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
+
+	/* the function to invoke when plugin is loaded */
+	/* int (*)(void*); */
+	STRUCT_FLD(init, i_s_innodb_buffer_pool_pages_index_init),
+
+	/* the function to invoke when plugin is unloaded */
+	/* int (*)(void*); */
+	STRUCT_FLD(deinit, i_s_common_deinit),
+
+	/* plugin version (for SHOW PLUGINS) */
+	/* unsigned int */
+	STRUCT_FLD(version, 0x0100 /* 1.0 */),
+
+	/* struct st_mysql_show_var* */
+	STRUCT_FLD(status_vars, NULL),
+
+	/* struct st_mysql_sys_var** */
+	STRUCT_FLD(system_vars, NULL),
+
+	/* reserved for dependency checking */
+	/* void* */
+	STRUCT_FLD(__reserved1, NULL)
+};
+
+UNIV_INTERN struct st_mysql_plugin	i_s_innodb_buffer_pool_pages_blob =
+{
+	/* the plugin type (a MYSQL_XXX_PLUGIN value) */
+	/* int */
+	STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
+
+	/* pointer to type-specific plugin descriptor */
+	/* void* */
+	STRUCT_FLD(info, &i_s_info),
+
+	/* plugin name */
+	/* const char* */
+	STRUCT_FLD(name, "INNODB_BUFFER_POOL_PAGES_BLOB"),
+
+	/* plugin author (for SHOW PLUGINS) */
+	/* const char* */
+	STRUCT_FLD(author, "Percona"),
+
+	/* general descriptive text (for SHOW PLUGINS) */
+	/* const char* */
+	STRUCT_FLD(descr, "InnoDB buffer pool blob pages"),
+
+	/* the plugin license (PLUGIN_LICENSE_XXX) */
+	/* int */
+	STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
+
+	/* the function to invoke when plugin is loaded */
+	/* int (*)(void*); */
+	STRUCT_FLD(init, i_s_innodb_buffer_pool_pages_blob_init),
+
+	/* the function to invoke when plugin is unloaded */
+	/* int (*)(void*); */
+	STRUCT_FLD(deinit, i_s_common_deinit),
+
+	/* plugin version (for SHOW PLUGINS) */
+	/* unsigned int */
+	STRUCT_FLD(version, 0x0100 /* 1.0 */),
+
+	/* struct st_mysql_show_var* */
+	STRUCT_FLD(status_vars, NULL),
+
+	/* struct st_mysql_sys_var** */
+	STRUCT_FLD(system_vars, NULL),
+
+	/* reserved for dependency checking */
+	/* void* */
+	STRUCT_FLD(__reserved1, NULL)
+};
+
+
+>>>>>>> MERGE-SOURCE
 /* Fields of the dynamic table INFORMATION_SCHEMA.innodb_trx */
 static ST_FIELD_INFO	innodb_trx_fields_info[] =
 {
@@ -1290,6 +2013,8 @@
 
 	DBUG_ENTER("i_s_cmp_fill_low");
 
+	RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
+
 	/* deny access to non-superusers */
 	if (check_global_access(thd, PROCESS_ACL)) {
 
@@ -1574,6 +2299,8 @@
 
 	DBUG_ENTER("i_s_cmpmem_fill_low");
 
+	RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
+
 	/* deny access to non-superusers */
 	if (check_global_access(thd, PROCESS_ACL)) {
 
@@ -3819,6 +4546,8 @@
 
 	DBUG_ENTER("i_s_innodb_rseg_fill");
 
+	RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
+
 	/* deny access to non-superusers */
 	if (check_global_access(thd, PROCESS_ACL)) {
 
@@ -3910,11 +4639,183 @@
 
 	/* reserved for dependency checking */
 	/* void* */
+<<<<<<< TREE
 	STRUCT_FLD(__reserved1, NULL),
 
 	/* Plugin flags */
 	/* unsigned long */
 	STRUCT_FLD(flags, 0UL),
+=======
+	STRUCT_FLD(__reserved1, NULL)
+};
+
+/***********************************************************************
+*/
+static ST_FIELD_INFO	i_s_innodb_admin_command_info[] =
+{
+	{STRUCT_FLD(field_name,		"result_message"),
+	 STRUCT_FLD(field_length,	1024),
+	 STRUCT_FLD(field_type,		MYSQL_TYPE_STRING),
+	 STRUCT_FLD(value,		0),
+	 STRUCT_FLD(field_flags,	0),
+	 STRUCT_FLD(old_name,		""),
+	 STRUCT_FLD(open_method,	SKIP_OPEN_TABLE)},
+
+	END_OF_ST_FIELD_INFO
+};
+
+#ifndef INNODB_COMPATIBILITY_HOOKS
+#error InnoDB needs MySQL to be built with #define INNODB_COMPATIBILITY_HOOKS
+#endif
+
+extern "C" {
+char **thd_query(MYSQL_THD thd);
+}
+
+static
+int
+i_s_innodb_admin_command_fill(
+/*==========================*/
+	THD*		thd,
+	TABLE_LIST*	tables,
+	COND*		cond)
+{
+	TABLE*	i_s_table	= (TABLE *) tables->table;
+	char**	query_str;
+	char*	ptr;
+	char	quote	= '\0';
+	const char*	command_head = "XTRA_";
+
+	DBUG_ENTER("i_s_innodb_admin_command_fill");
+
+	RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
+
+	/* deny access to non-superusers */
+	if (check_global_access(thd, PROCESS_ACL)) {
+		DBUG_RETURN(0);
+	}
+
+	if(thd_sql_command(thd) != SQLCOM_SELECT) {
+		field_store_string(i_s_table->field[0],
+			"SELECT command is only accepted.");
+		goto end_func;
+	}
+
+	query_str = thd_query(thd);
+	ptr = *query_str;
+	
+	for (; *ptr; ptr++) {
+		if (*ptr == quote) {
+			quote = '\0';
+		} else if (quote) {
+		} else if (*ptr == '`' || *ptr == '"') {
+			quote = *ptr;
+		} else {
+			long	i;
+			for (i = 0; command_head[i]; i++) {
+				if (toupper((int)(unsigned char)(ptr[i]))
+				    != toupper((int)(unsigned char)
+				      (command_head[i]))) {
+					goto nomatch;
+				}
+			}
+			break;
+nomatch:
+			;
+		}
+	}
+
+	if (!*ptr) {
+		field_store_string(i_s_table->field[0],
+			"No XTRA_* command in the SQL statement."
+			" Please add /*!XTRA_xxxx*/ to the SQL.");
+		goto end_func;
+	}
+
+	if (!strncasecmp("XTRA_HELLO", ptr, 10)) {
+		/* This is example command XTRA_HELLO */
+
+		ut_print_timestamp(stderr);
+		fprintf(stderr, " InnoDB: administration command test for XtraDB"
+				" 'XTRA_HELLO' was detected.\n");
+
+		field_store_string(i_s_table->field[0],
+			"Hello!");
+		goto end_func;
+	}
+	else if (!strncasecmp("XTRA_LRU_DUMP", ptr, 13)) {
+		ut_print_timestamp(stderr);
+		fprintf(stderr, " InnoDB: administration command 'XTRA_LRU_DUMP'"
+				" was detected.\n");
+
+		if (buf_LRU_file_dump()) {
+			field_store_string(i_s_table->field[0],
+				"XTRA_LRU_DUMP was succeeded.");
+		} else {
+			field_store_string(i_s_table->field[0],
+				"XTRA_LRU_DUMP was failed.");
+		}
+
+		goto end_func;
+	}
+	else if (!strncasecmp("XTRA_LRU_RESTORE", ptr, 16)) {
+		ut_print_timestamp(stderr);
+		fprintf(stderr, " InnoDB: administration command 'XTRA_LRU_RESTORE'"
+				" was detected.\n");
+
+		if (buf_LRU_file_restore()) {
+			field_store_string(i_s_table->field[0],
+				"XTRA_LRU_RESTORE was succeeded.");
+		} else {
+			field_store_string(i_s_table->field[0],
+				"XTRA_LRU_RESTORE was failed.");
+		}
+
+		goto end_func;
+	}
+
+	field_store_string(i_s_table->field[0],
+		"Undefined XTRA_* command.");
+	goto end_func;
+
+end_func:
+	if (schema_table_store_record(thd, i_s_table)) {
+		DBUG_RETURN(1);
+	} else {
+		DBUG_RETURN(0);
+	}
+}
+
+static
+int
+i_s_innodb_admin_command_init(
+/*==========================*/
+	void*	p)
+{
+	DBUG_ENTER("i_s_innodb_admin_command_init");
+	ST_SCHEMA_TABLE* schema = (ST_SCHEMA_TABLE*) p;
+
+	schema->fields_info = i_s_innodb_admin_command_info;
+	schema->fill_table = i_s_innodb_admin_command_fill;
+
+	DBUG_RETURN(0);
+}
+
+UNIV_INTERN struct st_mysql_plugin	i_s_innodb_admin_command =
+{
+	STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
+	STRUCT_FLD(info, &i_s_info),
+	STRUCT_FLD(name, "XTRADB_ADMIN_COMMAND"),
+	STRUCT_FLD(author, "Percona"),
+	STRUCT_FLD(descr, "XtraDB specific command acceptor"),
+	STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
+	STRUCT_FLD(init, i_s_innodb_admin_command_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
 };
 
 /***********************************************************************
@@ -4308,6 +5209,8 @@
 
 	RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
 
+	RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
+
 	/* deny access to non-superusers */
 	if (check_global_access(thd, PROCESS_ACL)) {
 		DBUG_RETURN(0);
@@ -4410,6 +5313,7 @@
 /*==========================*/
 	void*	p)
 {
+<<<<<<< TREE
 	DBUG_ENTER("i_s_innodb_admin_command_init");
 	ST_SCHEMA_TABLE* schema = (ST_SCHEMA_TABLE*) p;
 
@@ -5389,3 +6293,346 @@
 	STRUCT_FLD(flags, 0UL),
 };
 
+=======
+	DBUG_ENTER("i_s_innodb_sys_stats_init");
+	ST_SCHEMA_TABLE* schema = (ST_SCHEMA_TABLE*) p;
+
+	schema->fields_info = i_s_innodb_sys_stats_info;
+	schema->fill_table = i_s_innodb_schema_table_fill;
+
+	DBUG_RETURN(0);
+}
+
+UNIV_INTERN struct st_mysql_plugin   i_s_innodb_sys_tables =
+{
+	STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
+	STRUCT_FLD(info, &i_s_info),
+	STRUCT_FLD(name, "INNODB_SYS_TABLES"),
+	STRUCT_FLD(author, "Percona"),
+	STRUCT_FLD(descr, "InnoDB SYS_TABLES table"),
+	STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
+	STRUCT_FLD(init, i_s_innodb_sys_tables_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)
+};
+
+UNIV_INTERN struct st_mysql_plugin   i_s_innodb_sys_indexes =
+{
+	STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
+	STRUCT_FLD(info, &i_s_info),
+	STRUCT_FLD(name, "INNODB_SYS_INDEXES"),
+	STRUCT_FLD(author, "Percona"),
+	STRUCT_FLD(descr, "InnoDB SYS_INDEXES table"),
+	STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
+	STRUCT_FLD(init, i_s_innodb_sys_indexes_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)
+};
+
+UNIV_INTERN struct st_mysql_plugin   i_s_innodb_sys_stats =
+{
+	STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
+	STRUCT_FLD(info, &i_s_info),
+	STRUCT_FLD(name, "INNODB_SYS_STATS"),
+	STRUCT_FLD(author, "Percona"),
+	STRUCT_FLD(descr, "InnoDB SYS_STATS table"),
+	STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
+	STRUCT_FLD(init, i_s_innodb_sys_stats_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)
+};
+
+static ST_FIELD_INFO	i_s_innodb_changed_pages_info[] =
+{
+	{STRUCT_FLD(field_name,		"space_id"),
+	 STRUCT_FLD(field_length,	MY_INT32_NUM_DECIMAL_DIGITS),
+	 STRUCT_FLD(field_type,		MYSQL_TYPE_LONG),
+	 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,		"page_id"),
+	 STRUCT_FLD(field_length,	MY_INT32_NUM_DECIMAL_DIGITS),
+	 STRUCT_FLD(field_type,		MYSQL_TYPE_LONG),
+	 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,		"start_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,		"end_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)},
+
+	END_OF_ST_FIELD_INFO
+};
+
+/***********************************************************************
+  This function parses condition and gets upper bounds for start and end LSN's
+  if condition corresponds to certain pattern.
+
+  We can't know right position to avoid scanning bitmap files from the beginning
+  to the lower bound. But we can stop scanning bitmap files if we reach upper bound.
+
+  It's expected the most used queries will be like the following:
+
+  SELECT * FROM INNODB_CHANGED_PAGES WHERE START_LSN > num1 AND start_lsn < num2;
+
+  That's why the pattern is:
+
+  pattern:  comp | and_comp;
+  comp:     lsn <  int_num | lsn <= int_num | int_num > lsn  | int_num >= lsn;
+  lsn:	    start_lsn | end_lsn;
+  and_comp: some_expression AND some_expression  | some_expression AND and_comp;
+  some_expression: comp	| any_other_expression;
+
+  Suppose the condition is start_lsn < 100, this means we have to read all
+  blocks with start_lsn < 100. Which is equivalent to reading all the blocks
+  with end_lsn <= 99, or just end_lsn < 100. That's why it's enough to find
+  maximum lsn value, doesn't matter if this is start or end lsn and compare
+  it with "start_lsn" field.
+
+  Example:
+
+  SELECT * FROM INNODB_CHANGED_PAGES
+    WHERE
+    start_lsn > 10  AND
+    end_lsn <= 1111 AND
+    555 > end_lsn   AND
+    page_id = 100;
+
+  max_lsn will be set to 555.
+*/
+static
+void
+limit_lsn_range_from_condition(
+/*===========================*/
+	TABLE*		table,   /*!<in: table */
+	COND*		cond,    /*!<in: condition */
+	ib_uint64_t*	max_lsn) /*!<in/out: maximum LSN
+				 (must be initialized with maximum
+				 available value) */
+{
+	if (cond->type() != Item::COND_ITEM &&
+	    cond->type() != Item::FUNC_ITEM)
+		return;
+
+	switch (((Item_func*) cond)->functype())
+	{
+		case Item_func::COND_AND_FUNC:
+		{
+			List_iterator<Item>	li(*((Item_cond*) cond)->
+						   argument_list());
+			Item			*item;
+			while ((item= li++))
+				limit_lsn_range_from_condition(table,
+							       item,
+							       max_lsn);
+			break;
+		}
+		case Item_func::LT_FUNC:
+		case Item_func::LE_FUNC:
+		case Item_func::GT_FUNC:
+		case Item_func::GE_FUNC:
+		{
+			Item			*left;
+			Item			*right;
+			Item_field		*item_field;
+			ib_uint64_t		tmp_result;
+
+			/*
+			   a <= b equals to b >= a that's why we just exchange
+			   "left" and "right" in the case of ">" or ">="
+			   function
+			*/
+			if (((Item_func*) cond)->functype() ==
+				Item_func::LT_FUNC ||
+			    ((Item_func*) cond)->functype() ==
+				Item_func::LE_FUNC)
+			{
+				left = ((Item_func*) cond)->arguments()[0];
+				right = ((Item_func*) cond)->arguments()[1];
+			} else {
+				left = ((Item_func*) cond)->arguments()[1];
+				right = ((Item_func*) cond)->arguments()[0];
+			}
+
+			if (!left || !right)
+				return;
+			if (left->type() != Item::FIELD_ITEM)
+				return;
+			if (right->type() != Item::INT_ITEM)
+				return;
+
+			item_field = (Item_field*)left;
+
+			if (/* START_LSN */
+			    table->field[2] != item_field->field &&
+			    /* END_LSN */
+			    table->field[3] != item_field->field)
+			{
+				return;
+			}
+
+			/* Check if the current field belongs to our table */
+			if (table != item_field->field->table)
+				return;
+
+			tmp_result = right->val_int();
+			if (tmp_result < *max_lsn)
+				*max_lsn = tmp_result;
+
+			break;
+		}
+		default:;
+	}
+
+}
+
+/***********************************************************************
+Fill the dynamic table information_schema.innodb_changed_pages.
+@return 0 on success, 1 on failure */
+static
+int
+i_s_innodb_changed_pages_fill(
+/*==========================*/
+	THD*		thd,	/*!<in: thread */
+	TABLE_LIST*	tables,	/*!<in/out: tables to fill */
+	COND*		cond)	/*!<in: condition */
+{
+	TABLE*			table = (TABLE *) tables->table;
+	log_bitmap_iterator_t	i;
+	ib_uint64_t		output_rows_num = 0UL;
+	ib_uint64_t		max_lsn = ~0ULL;
+
+	if (!srv_track_changed_pages)
+		return 0;
+
+	if (!log_online_bitmap_iterator_init(&i))
+		return 1;
+
+	if (cond)
+		limit_lsn_range_from_condition(table, cond, &max_lsn);
+
+	while(log_online_bitmap_iterator_next(&i) &&
+	      (!srv_changed_pages_limit ||
+	       output_rows_num < srv_changed_pages_limit) &&
+	      /*
+	        There is no need to compare both start LSN and end LSN fields
+	        with maximum value. It's enough to compare only start LSN.
+	        Example:
+
+	                              max_lsn = 100
+	        \\\\\\\\\\\\\\\\\\\\\\\\\|\\\\\\\\        - Query 1
+	        I------I I-------I I-------------I I----I
+		//////////////////       |                - Query 2
+	           1        2             3          4
+
+	        Query 1:
+	        SELECT * FROM INNODB_CHANGED_PAGES WHERE start_lsn < 100
+	        will select 1,2,3 bitmaps
+	        Query 2:
+	        SELECT * FROM INNODB_CHANGED_PAGES WHERE end_lsn < 100
+	        will select 1,2 bitmaps
+
+	        The condition start_lsn <= 100 will be false after reading
+	        1,2,3 bitmaps which suits for both cases.
+	      */
+	      LOG_BITMAP_ITERATOR_START_LSN(i) <= max_lsn)
+	{
+		if (!LOG_BITMAP_ITERATOR_PAGE_CHANGED(i))
+			continue;
+
+		/* SPACE_ID */
+		table->field[0]->store(
+				       LOG_BITMAP_ITERATOR_SPACE_ID(i));
+		/* PAGE_ID */
+		table->field[1]->store(
+				       LOG_BITMAP_ITERATOR_PAGE_NUM(i));
+		/* START_LSN */
+		table->field[2]->store(
+				       LOG_BITMAP_ITERATOR_START_LSN(i));
+		/* END_LSN */
+		table->field[3]->store(
+				       LOG_BITMAP_ITERATOR_END_LSN(i));
+
+		/*
+		  I_S tables are in-memory tables. If bitmap file is big enough
+		  a lot of memory can be used to store the table. But the size
+		  of used memory can be diminished if we store only data which
+		  corresponds to some conditions (in WHERE sql clause). Here
+		  conditions are checked for the field values stored above.
+
+		  Conditions are checked twice. The first is here (during table
+		  generation) and the second during query execution. Maybe it
+		  makes sense to use some flag in THD object to avoid double
+		  checking.
+		*/
+		if (cond && !cond->val_int())
+			continue;
+
+		if (schema_table_store_record(thd, table))
+		{
+			log_online_bitmap_iterator_release(&i);
+			return 1;
+		}
+
+		++output_rows_num;
+	}
+
+	log_online_bitmap_iterator_release(&i);
+	return 0;
+}
+
+static
+int
+i_s_innodb_changed_pages_init(
+/*==========================*/
+	void*	p)
+{
+	DBUG_ENTER("i_s_innodb_changed_pages_init");
+	ST_SCHEMA_TABLE* schema = (ST_SCHEMA_TABLE*) p;
+
+	schema->fields_info = i_s_innodb_changed_pages_info;
+	schema->fill_table = i_s_innodb_changed_pages_fill;
+
+	DBUG_RETURN(0);
+}
+
+UNIV_INTERN struct st_mysql_plugin   i_s_innodb_changed_pages =
+{
+	STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
+	STRUCT_FLD(info, &i_s_info),
+	STRUCT_FLD(name, "INNODB_CHANGED_PAGES"),
+	STRUCT_FLD(author, "Percona"),
+	STRUCT_FLD(descr, "InnoDB CHANGED_PAGES table"),
+	STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
+	STRUCT_FLD(init, i_s_innodb_changed_pages_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/innobase/handler/i_s.h'
--- Percona-Server/storage/innobase/handler/i_s.h	2012-06-19 16:19:46 +0000
+++ Percona-Server/storage/innobase/handler/i_s.h	2012-08-15 14:13:50 +0000
@@ -35,6 +35,7 @@
 extern struct st_mysql_plugin	i_s_innodb_cmp_reset;
 extern struct st_mysql_plugin	i_s_innodb_cmpmem;
 extern struct st_mysql_plugin	i_s_innodb_cmpmem_reset;
+<<<<<<< TREE
 extern struct st_mysql_plugin	i_s_innodb_sys_tables;
 extern struct st_mysql_plugin	i_s_innodb_sys_tablestats;
 extern struct st_mysql_plugin	i_s_innodb_sys_indexes;
@@ -42,14 +43,23 @@
 extern struct st_mysql_plugin   i_s_innodb_sys_fields;
 extern struct st_mysql_plugin   i_s_innodb_sys_foreign;
 extern struct st_mysql_plugin   i_s_innodb_sys_foreign_cols;
+=======
+>>>>>>> MERGE-SOURCE
 extern struct st_mysql_plugin	i_s_innodb_rseg;
 extern struct st_mysql_plugin	i_s_innodb_undo_logs;
 extern struct st_mysql_plugin	i_s_innodb_sys_stats;
 extern struct st_mysql_plugin	i_s_innodb_table_stats;
 extern struct st_mysql_plugin	i_s_innodb_index_stats;
 extern struct st_mysql_plugin	i_s_innodb_admin_command;
+<<<<<<< TREE
 extern struct st_mysql_plugin	i_s_innodb_buffer_pool_pages;
 extern struct st_mysql_plugin	i_s_innodb_buffer_pool_pages_index;
 extern struct st_mysql_plugin	i_s_innodb_buffer_pool_pages_blob;
+=======
+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;
+extern struct st_mysql_plugin	i_s_innodb_changed_pages;
+>>>>>>> MERGE-SOURCE
 
 #endif /* i_s_h */
 
=== 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-15 14:13:50 +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-15 14:13:50 +0000
@@ -0,0 +1,111 @@
+/*****************************************************************************
+
+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"
+#include "os0file.h"
+
+/*********************************************************************//**
+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();
+/*=========================*/
+
+/** The iterator through all bits of changed pages bitmap blocks */
+struct log_bitmap_iterator_struct
+{
+	char		in_name[FN_REFLEN]; /*!< the file name for bitmap
+					    input */
+	os_file_t	in;                 /*!< the bitmap input file */
+	ib_uint64_t	in_offset;          /*!< the next write position in the
+					    bitmap output file */
+	ib_uint32_t	bit_offset;         /*!< bit offset inside of bitmap
+					    block*/
+	ib_uint64_t	start_lsn;          /*!< Start lsn of the block */
+	ib_uint64_t	end_lsn;            /*!< End lsn of the block */
+	ib_uint32_t	space_id;           /*!< Block space id */
+	ib_uint32_t	first_page_id;      /*!< First block page id */
+	ibool		changed;            /*!< true if current page was changed */
+	byte*		page;               /*!< Bitmap block */
+};
+
+typedef struct log_bitmap_iterator_struct log_bitmap_iterator_t;
+
+#define LOG_BITMAP_ITERATOR_START_LSN(i) \
+        ((i).start_lsn)
+#define LOG_BITMAP_ITERATOR_END_LSN(i) \
+        ((i).end_lsn)
+#define LOG_BITMAP_ITERATOR_SPACE_ID(i) \
+        ((i).space_id)
+#define LOG_BITMAP_ITERATOR_PAGE_NUM(i) \
+        ((i).first_page_id + (i).bit_offset)
+#define LOG_BITMAP_ITERATOR_PAGE_CHANGED(i) \
+        ((i).changed)
+
+/*********************************************************************//**
+Initializes log bitmap iterator.
+@return TRUE if the iterator is initialized OK, FALSE otherwise. */
+UNIV_INTERN
+ibool
+log_online_bitmap_iterator_init(
+/*============================*/
+	log_bitmap_iterator_t *i); /*!<in/out:  iterator */
+
+/*********************************************************************//**
+Releases log bitmap iterator. */
+UNIV_INTERN
+void
+log_online_bitmap_iterator_release(
+/*===============================*/
+	log_bitmap_iterator_t *i); /*!<in/out:  iterator */
+
+/*********************************************************************//**
+Iterates through bits of saved bitmap blocks.
+Sequentially reads blocks from bitmap file(s) and interates through
+their bits. Ignores blocks with wrong checksum.
+@return TRUE if iteration is successful, FALSE if all bits are iterated. */
+UNIV_INTERN
+ibool
+log_online_bitmap_iterator_next(
+/*============================*/
+	log_bitmap_iterator_t *i); /*!<in/out: iterator */
+
+#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-15 14:13:50 +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-15 14:13:50 +0000
@@ -867,7 +867,18 @@
 /*============*/
 	FILE*		file);	/*!< in: file to be truncated */
 /***********************************************************************//**
+<<<<<<< TREE
 NOTE! Use the corresponding macro os_file_flush(), not directly this function!
+=======
+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 */
+/***********************************************************************//**
+>>>>>>> MERGE-SOURCE
 Flushes the write buffers of a given file to the disk.
 @return	TRUE if success */
 UNIV_INTERN
 
=== 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-15 14:13:50 +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-15 14:13:50 +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,16 @@
 
 extern ibool	srv_recovery_stats;
 
+<<<<<<< TREE
+=======
+extern ulint	srv_use_purge_thread;
+
+extern my_bool	srv_track_changed_pages;
+
+extern
+ulonglong       srv_changed_pages_limit;
+
+>>>>>>> MERGE-SOURCE
 extern ibool	srv_auto_extend_last_data_file;
 extern ulint	srv_last_file_size_max;
 extern char**	srv_log_group_home_dirs;
@@ -694,6 +712,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 */
 
=== added file 'Percona-Server/storage/innobase/include/ut0rbt.h.OTHER'
--- Percona-Server/storage/innobase/include/ut0rbt.h.OTHER	1970-01-01 00:00:00 +0000
+++ Percona-Server/storage/innobase/include/ut0rbt.h.OTHER	2012-08-15 14:13:50 +0000
@@ -0,0 +1,332 @@
+/*****************************************************************************
+Copyright (c) 2006, 2009, Innobase Oy. 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/ut0rbt.h
+Red-Black tree implementation.
+
+Created 2007-03-20 Sunny Bains
+************************************************************************/
+
+#ifndef INNOBASE_UT0RBT_H
+#define INNOBASE_UT0RBT_H
+
+#if !defined(IB_RBT_TESTING)
+#include "univ.i"
+#include "ut0mem.h"
+#else
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+#define	ut_malloc	malloc
+#define	ut_free		free
+#define	ulint		unsigned long
+#define	ut_a(c)		assert(c)
+#define ut_error	assert(0)
+#define	ibool		unsigned int
+#define	TRUE		1
+#define	FALSE		0
+#endif
+
+/* Red black tree typedefs */
+typedef struct ib_rbt_struct ib_rbt_t;
+typedef struct ib_rbt_node_struct ib_rbt_node_t;
+/* FIXME: Iterator is a better name than _bound_ */
+typedef struct ib_rbt_bound_struct ib_rbt_bound_t;
+typedef void (*ib_rbt_print_node)(const ib_rbt_node_t* node);
+typedef int (*ib_rbt_compare)(const void* p1, const void* p2);
+
+/* Red black tree color types */
+enum ib_rbt_color_enum {
+	IB_RBT_RED,
+	IB_RBT_BLACK
+};
+
+typedef enum ib_rbt_color_enum ib_rbt_color_t;
+
+/* Red black tree node */
+struct ib_rbt_node_struct {
+	ib_rbt_color_t	color;			/* color of this node */
+
+	ib_rbt_node_t*	left;			/* points left child */
+	ib_rbt_node_t*	right;			/* points right child */
+	ib_rbt_node_t*	parent;			/* points parent node */
+
+	char		value[1];		/* Data value */
+};
+
+/* Red black tree instance.*/
+struct	ib_rbt_struct {
+	ib_rbt_node_t*	nil;			/* Black colored node that is
+						used as a sentinel. This is
+						pre-allocated too.*/
+
+	ib_rbt_node_t*	root;			/* Root of the tree, this is
+						pre-allocated and the first
+						data node is the left child.*/
+
+	ulint		n_nodes;		/* Total number of data nodes */
+
+	ib_rbt_compare	compare;		/* Fn. to use for comparison */
+	ulint		sizeof_value;		/* Sizeof the item in bytes */
+};
+
+/* The result of searching for a key in the tree, this is useful for
+a speedy lookup and insert if key doesn't exist.*/
+struct ib_rbt_bound_struct {
+	const ib_rbt_node_t*
+			last;			/* Last node visited */
+
+	int		result;			/* Result of comparing with
+						the last non-nil node that
+						was visited */
+};
+
+/* Size in elements (t is an rb tree instance) */
+#define rbt_size(t)	(t->n_nodes)
+
+/* Check whether the rb tree is empty (t is an rb tree instance) */
+#define rbt_empty(t)	(rbt_size(t) == 0)
+
+/* Get data value (t is the data type, n is an rb tree node instance) */
+#define rbt_value(t, n) ((t*) &n->value[0])
+
+/* 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
+void
+rbt_free(
+/*=====*/
+	ib_rbt_t*	tree);		/*!< in: rb tree to free */
+/****************************************************************//**
+Create an instance of a red black tree
+@return	rb tree instance */
+UNIV_INTERN
+ib_rbt_t*
+rbt_create(
+/*=======*/
+	size_t		sizeof_value,	/*!< in: size in bytes */
+	ib_rbt_compare	compare);	/*!< in: comparator */
+/****************************************************************//**
+Delete a node from the red black tree, identified by key.
+@return TRUE if success FALSE if not found */
+UNIV_INTERN
+ibool
+rbt_delete(
+/*=======*/
+	ib_rbt_t*	tree,		/*!< in: rb tree */
+	const void*	key);		/*!< in: key to delete */
+/****************************************************************//**
+Remove a node from the rb tree, the node is not free'd, that is the
+callers responsibility.
+@return	the deleted node with the const. */
+UNIV_INTERN
+ib_rbt_node_t*
+rbt_remove_node(
+/*============*/
+	ib_rbt_t*	tree,		/*!< in: rb tree */
+	const ib_rbt_node_t*
+			node);		/*!< in: node to delete, this
+					is a fudge and declared const
+					because the caller has access
+					only to const nodes.*/
+/****************************************************************//**
+Find a matching node in the rb tree.
+@return	node if found else return NULL */
+UNIV_INTERN
+const ib_rbt_node_t*
+rbt_lookup(
+/*=======*/
+	const ib_rbt_t*	tree,		/*!< in: rb tree to search */
+	const void*	key);		/*!< in: key to lookup */
+/****************************************************************//**
+Generic insert of a value in the rb tree.
+@return	inserted node */
+UNIV_INTERN
+const ib_rbt_node_t*
+rbt_insert(
+/*=======*/
+	ib_rbt_t*	tree,		/*!< in: rb tree */
+	const void*	key,		/*!< in: key for ordering */
+	const void*	value);		/*!< in: data that will be
+					copied to the node.*/
+/****************************************************************//**
+Add a new node to the tree, useful for data that is pre-sorted.
+@return	appended node */
+UNIV_INTERN
+const ib_rbt_node_t*
+rbt_add_node(
+/*=========*/
+	ib_rbt_t*	tree,		/*!< in: rb tree */
+	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 */
+UNIV_INTERN
+const ib_rbt_node_t*
+rbt_first(
+/*======*/
+	const ib_rbt_t*	tree);		/*!< in: rb tree */
+/****************************************************************//**
+Return the right most data node in the tree
+@return	right most node */
+UNIV_INTERN
+const ib_rbt_node_t*
+rbt_last(
+/*=====*/
+	const ib_rbt_t*	tree);		/*!< in: rb tree */
+/****************************************************************//**
+Return the next node from current.
+@return	successor node to current that is passed in. */
+UNIV_INTERN
+const ib_rbt_node_t*
+rbt_next(
+/*=====*/
+	const ib_rbt_t*	tree,		/*!< in: rb tree */
+	const ib_rbt_node_t*		/*!< in: current node */
+			current);
+/****************************************************************//**
+Return the prev node from current.
+@return	precedessor node to current that is passed in */
+UNIV_INTERN
+const ib_rbt_node_t*
+rbt_prev(
+/*=====*/
+	const ib_rbt_t*	tree,		/*!< in: rb tree */
+	const ib_rbt_node_t*		/*!< in: current node */
+			current);
+/****************************************************************//**
+Find the node that has the lowest key that is >= key.
+@return	node that satisfies the lower bound constraint or NULL */
+UNIV_INTERN
+const ib_rbt_node_t*
+rbt_lower_bound(
+/*============*/
+	const ib_rbt_t*	tree,		/*!< in: rb tree */
+	const void*	key);		/*!< in: key to search */
+/****************************************************************//**
+Find the node that has the greatest key that is <= key.
+@return	node that satisifies the upper bound constraint or NULL */
+UNIV_INTERN
+const ib_rbt_node_t*
+rbt_upper_bound(
+/*============*/
+	const ib_rbt_t*	tree,		/*!< in: rb tree */
+	const void*	key);		/*!< in: key to search */
+/****************************************************************//**
+Search for the key, a node will be retuned in parent.last, whether it
+was found or not. If not found then parent.last will contain the
+parent node for the possibly new key otherwise the matching node.
+@return	result of last comparison */
+UNIV_INTERN
+int
+rbt_search(
+/*=======*/
+	const ib_rbt_t*	tree,		/*!< in: rb tree */
+	ib_rbt_bound_t*	parent,		/*!< in: search bounds */
+	const void*	key);		/*!< in: key to search */
+/****************************************************************//**
+Search for the key, a node will be retuned in parent.last, whether it
+was found or not. If not found then parent.last will contain the
+parent node for the possibly new key otherwise the matching node.
+@return	result of last comparison */
+UNIV_INTERN
+int
+rbt_search_cmp(
+/*===========*/
+	const ib_rbt_t*	tree,		/*!< in: rb tree */
+	ib_rbt_bound_t*	parent,		/*!< in: search bounds */
+	const void*	key,		/*!< in: key to search */
+	ib_rbt_compare	compare);	/*!< in: comparator */
+/****************************************************************//**
+Clear the tree, deletes (and free's) all the nodes. */
+UNIV_INTERN
+void
+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 */
+UNIV_INTERN
+ulint
+rbt_merge_uniq(
+/*===========*/
+	ib_rbt_t*	dst,		/*!< in: dst rb tree */
+	const ib_rbt_t*	src);		/*!< in: src rb tree */
+/****************************************************************//**
+Merge the node from dst into src. Return the number of nodes merged.
+Delete the nodes from src after copying node to dst. As a side effect
+the duplicates will be left untouched in the src, since we don't support
+duplicates (yet). NOTE: src and dst must be similar, the function doesn't
+check for this condition (yet).
+@return	no. of recs merged */
+UNIV_INTERN
+ulint
+rbt_merge_uniq_destructive(
+/*=======================*/
+	ib_rbt_t*	dst,		/*!< in: dst rb tree */
+	ib_rbt_t*	src);		/*!< in: src rb tree */
+/****************************************************************//**
+Verify the integrity of the RB tree. For debugging. 0 failure else height
+of tree (in count of black nodes).
+@return	TRUE if OK FALSE if tree invalid. */
+UNIV_INTERN
+ibool
+rbt_validate(
+/*=========*/
+	const ib_rbt_t*	tree);		/*!< in: tree to validate */
+/****************************************************************//**
+Iterate over the tree in depth first order. */
+UNIV_INTERN
+void
+rbt_print(
+/*======*/
+	const ib_rbt_t*		tree,	/*!< in: tree to traverse */
+	ib_rbt_print_node	print);	/*!< in: print function */
+
+#endif /* INNOBASE_UT0RBT_H */
 
=== 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-15 14:13:50 +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 */
@@ -3113,12 +3204,18 @@
 logs_empty_and_mark_files_at_shutdown(void)
 /*=======================================*/
 {
+<<<<<<< TREE
 	ib_uint64_t		lsn;
 	ulint			arch_log_no;
 	ibool			server_busy;
 	ulint			count = 0;
 	ulint			pending_io;
 	ulint			active_thd;
+=======
+	ib_uint64_t	lsn;
+	ib_uint64_t	tracked_lsn;
+	ulint		arch_log_no;
+>>>>>>> MERGE-SOURCE
 
 	if (srv_print_verbose_log) {
 		ut_print_timestamp(stderr);
@@ -3308,9 +3405,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 +3468,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 +3493,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 +3623,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-15 14:13:50 +0000
@@ -0,0 +1,1083 @@
+/*****************************************************************************
+
+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 "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))
+
+/* Tests if num bit of bitmap is set */
+#define IS_BIT_SET(bitmap, num) \
+        (*((bitmap) + ((num) >> 3)) & (1UL << ((num) & 7UL)))
+
+/** 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 */
+enum { MODIFIED_PAGE_BLOCK_BITMAP_LEN
+       = MODIFIED_PAGE_BLOCK_UNUSED_2 - MODIFIED_PAGE_BLOCK_BITMAP };
+
+
+/****************************************************************//**
+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 / (8 * MODIFIED_PAGE_BLOCK_BITMAP_LEN)
+		* MODIFIED_PAGE_BLOCK_BITMAP_LEN;
+	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_ull(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);
+	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
+		(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
+			(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_ull(page + MODIFIED_PAGE_START_LSN,
+			       log_bmp_sys->start_lsn);
+		mach_write_ull(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);
+}
+
+/*********************************************************************//**
+Initializes log bitmap iterator.
+@return TRUE if the iterator is initialized OK, FALSE otherwise. */
+UNIV_INTERN
+ibool
+log_online_bitmap_iterator_init(
+/*============================*/
+	log_bitmap_iterator_t *i) /*!<in/out:  iterator */
+{
+	ibool	success;
+
+	ut_a(i);
+	ut_snprintf(i->in_name, FN_REFLEN, "%s%s%d", srv_data_home,
+		    modified_page_stem, 1);
+	i->in_offset = 0;
+	/*
+	  Set up bit offset out of the reasonable limit
+	  to intiate reading block from file in
+	  log_online_bitmap_iterator_next()
+	*/
+	i->bit_offset = MODIFIED_PAGE_BLOCK_BITMAP_LEN;