Merge lp:~laurynas-biveinis/percona-server/fake-changes-from-fb-5.5 into lp:percona-server/5.5

[Laurynas Biveinis]

No BT or ST but BT 20439 prerequisite.
http://jenkins.percona.com/job/percona-server-5.5-param/798/

Fix bug 1190604 (Missing branch predictor annotations for fake
changes) by adding likely/unlikely/UNIV_LIKELY/UNIV_LIKELY annotations
to all the fake changes check branches that are missing them.

Fix bug 1200162 (Missing MTR tests for fake changes with BLOBs and
secondary indexes) by reviewing Facebook patch and adding
corresponding tests to our fake changes tests.

At the same time: create two new include files start_fake_changes.inc
and stop_fake_changes.inc. They start or stop fake changes and also
take the snapshot of the server state that should not change during
the fake changes workload. Use these files instead of setting
fake_changes session variable directly where applicable for additional
verification.

[Laurynas Biveinis (laurynas-biveinis)]

start|stop_fake_changes.inc:

SELECT ROWS FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS and SHOW INDEXES may cause test instabilities if there is a non-fake-change session workload for the same table running in parallel to the fake change one and the automatic stat recalculation kicks in at a wrong time. This need either ANALYZE TABLE, either disabling auto recalc. Right now the former seems like a better option IMHO.

review: Needs Fixing

=== added file 'Percona-Server/mysql-test/include/start_fake_changes.inc'
--- Percona-Server/mysql-test/include/start_fake_changes.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/start_fake_changes.inc	2013-07-15 16:19:41 +0000
@@ -0,0 +1,32 @@
+#
+# Include this file in a session before fake changes workload.  It will enable 
+# the fake changes for the current session and save the relevant server state 
+# to variables that will be used by stop_fake_changes.inc that it didn't change.
+#
+# Since some of the state checked is global InnoDB counters, do not issue a 
+# non-fake-changes workload in parallel.
+#
+
+# Requires userstat
+SELECT @@global.userstat = 1 AS should_be_1;
+
+# Have up-to-date stats for the fake changes table, so that, if there is a
+# non-fake-changes session running in parallel, it does not trigger an auto
+# stat recalc which then fails these checks.
+eval ANALYZE TABLE $fake_changes_table;
+
+let $t_checksum_1= `CHECKSUM TABLE $fake_changes_table EXTENDED`;
+SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_deleted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_updated_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_updated';
+eval SELECT ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE '$fake_changes_table';
+eval SELECT ROWS_CHANGED INTO @table_rows_changed_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE '$fake_changes_table';
+eval SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE '$fake_changes_table';
+
+#
+# Index stats should not change, but it's only possible to inspect them 
+# manually.
+#
+eval SHOW INDEXES IN $fake_changes_table;
+
+SET innodb_fake_changes=1;
 
=== added file 'Percona-Server/mysql-test/include/stop_fake_changes.inc'
--- Percona-Server/mysql-test/include/stop_fake_changes.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/stop_fake_changes.inc	2013-07-15 16:19:41 +0000
@@ -0,0 +1,32 @@
+#
+# Include this file in a session after fake changes workload.  It will disable the fake 
+# changes and assert that the relevant server state has not changed from the one saved
+# by a previous start_fake_changes.inc.
+#
+SET innodb_fake_changes=0;
+
+eval CHECK TABLE $fake_changes_table;
+
+let $t_checksum_2= `CHECKSUM TABLE $fake_changes_table EXTENDED`;
+SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_updated_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated';
+eval SELECT ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE '$fake_changes_table';
+eval SELECT ROWS_CHANGED INTO @table_rows_changed_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE '$fake_changes_table';
+eval SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE '$fake_changes_table';
+
+--disable_query_log
+eval SELECT "$t_checksum_1" LIKE "$t_checksum_2" AS should_be_1;
+--enable_query_log
+SELECT @innodb_rows_inserted_2 - @innodb_rows_inserted_1 AS should_be_0;
+SELECT @innodb_rows_deleted_2 - @innodb_rows_deleted_1 AS should_be_0;
+SELECT @innodb_rows_updated_2 - @innodb_rows_updated_1 AS should_be_0;
+SELECT @table_rows_estimate_2 - @table_rows_estimate_1 AS should_be_0;
+SELECT @table_rows_changed_2 - @table_rows_changed_1 AS should_be_0;
+SELECT @table_rows_changed_x_indexes_2 - @table_rows_changed_x_indexes_1 AS should_be_0;
+
+#
+# Index stats should not change, but it's only possible to inspect them 
+# manually.
+#
+eval SHOW INDEXES IN $fake_changes_table;
 
=== modified file 'Percona-Server/mysql-test/r/percona_innodb_fake_changes.result'
--- Percona-Server/mysql-test/r/percona_innodb_fake_changes.result	2012-10-17 11:56:00 +0000
+++ Percona-Server/mysql-test/r/percona_innodb_fake_changes.result	2013-07-15 16:19:41 +0000
@@ -22,10 +22,23 @@
 OFF
 # Explicit COMMIT should fail when innodb_fake_changes is enabled
 # DML should be fine
-SET @@GLOBAL.userstat= TRUE;
+SET @@GLOBAL.userstat=TRUE;
 CREATE TABLE t1 (a INT) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
-SET autocommit=0;
+SELECT @@global.userstat = 1 AS should_be_1;
+should_be_1
+1
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_deleted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_updated_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_updated';
+SELECT ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED INTO @table_rows_changed_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SHOW INDEXES IN t1;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 SET innodb_fake_changes=1;
 BEGIN;
 INSERT INTO t1 VALUES (2);
@@ -36,29 +49,417 @@
 1
 COMMIT;
 ERROR HY000: Got error 131 during COMMIT
-SET innodb_fake_changes=default;
-# Verify that the fake changes to t1 did not leak through
-CHECK TABLE t1;
-Table	Op	Msg_type	Msg_text
-test.t1	check	status	OK
-should_be_1
-1
-should_be_0
-0
-should_be_0
-0
-should_be_0
-0
-should_be_0
-0
-should_be_0
-0
-should_be_0
-0
-DROP TABLE t1;
+SET innodb_fake_changes=0;
+CHECK TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_updated_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated';
+SELECT ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED INTO @table_rows_changed_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+should_be_1
+1
+SELECT @innodb_rows_inserted_2 - @innodb_rows_inserted_1 AS should_be_0;
+should_be_0
+0
+SELECT @innodb_rows_deleted_2 - @innodb_rows_deleted_1 AS should_be_0;
+should_be_0
+0
+SELECT @innodb_rows_updated_2 - @innodb_rows_updated_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_estimate_2 - @table_rows_estimate_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_changed_2 - @table_rows_changed_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_changed_x_indexes_2 - @table_rows_changed_x_indexes_1 AS should_be_0;
+should_be_0
+0
+SHOW INDEXES IN t1;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+DROP TABLE t1;
+CREATE TABLE t1 (a INT PRIMARY KEY, b INT, UNIQUE KEY (b)) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1,1);
+SELECT @@global.userstat = 1 AS should_be_1;
+should_be_1
+1
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_deleted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_updated_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_updated';
+SELECT ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED INTO @table_rows_changed_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SHOW INDEXES IN t1;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	0	PRIMARY	1	a	A	1	NULL	NULL		BTREE		
+t1	0	b	1	b	A	1	NULL	NULL	YES	BTREE		
+SET innodb_fake_changes=1;
+SELECT * FROM t1;
+ERROR HY000: Got error 131 during COMMIT
+INSERT INTO t1 VALUES (2,2);
+ERROR HY000: Got error 131 during COMMIT
+UPDATE t1 SET a=0 where b=1;
+ERROR 23000: Duplicate entry '1' for key 'b'
+UPDATE t1 SET b=0 where a=1;
+ERROR HY000: Got error 131 during COMMIT
+UPDATE t1 SET b=0 where a=2;
+ERROR HY000: Got error 131 during COMMIT
+DELETE FROM t1 where b=2;
+ERROR HY000: Got error 131 during COMMIT
+DELETE FROM t1 where b=1;
+ERROR HY000: Got error 131 during COMMIT
+DELETE FROM t1 where a=2;
+ERROR HY000: Got error 131 during COMMIT
+DELETE FROM t1 where a=1;
+ERROR HY000: Got error 131 during COMMIT
+REPLACE INTO t1 values (2,3);
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+SELECT * FROM t1;
+a	b
+1	1
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+INSERT INTO t1 VALUES (2,2);
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+UPDATE t1 SET a=0 where b=1;
+ERROR 23000: Duplicate entry '1' for key 'b'
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+UPDATE t1 SET b=0 where a=1;
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+UPDATE t1 SET b=0 where a=2;
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+DELETE FROM t1 where b=2;
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+DELETE FROM t1 where b=1;
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+DELETE FROM t1 where a=2;
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+DELETE FROM t1 where a=1;
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+REPLACE INTO t1 values (2,3);
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+INSERT INTO t1 VALUES (1,1) ON DUPLICATE KEY UPDATE b=2;
+ERROR HY000: Got error 131 during COMMIT
+CREATE INDEX bx ON t1(b);
+ERROR HY000: Got error 131 during COMMIT
+SET innodb_fake_changes=0;
+CHECK TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_updated_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated';
+SELECT ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED INTO @table_rows_changed_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+should_be_1
+1
+SELECT @innodb_rows_inserted_2 - @innodb_rows_inserted_1 AS should_be_0;
+should_be_0
+0
+SELECT @innodb_rows_deleted_2 - @innodb_rows_deleted_1 AS should_be_0;
+should_be_0
+0
+SELECT @innodb_rows_updated_2 - @innodb_rows_updated_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_estimate_2 - @table_rows_estimate_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_changed_2 - @table_rows_changed_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_changed_x_indexes_2 - @table_rows_changed_x_indexes_1 AS should_be_0;
+should_be_0
+0
+SHOW INDEXES IN t1;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	0	PRIMARY	1	a	A	1	NULL	NULL		BTREE		
+t1	0	b	1	b	A	1	NULL	NULL	YES	BTREE		
+DROP TABLE t1;
+CREATE TABLE t2 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (1, 1);
+SELECT @@global.userstat = 1 AS should_be_1;
+should_be_1
+1
+ANALYZE TABLE t2;
+Table	Op	Msg_type	Msg_text
+test.t2	analyze	status	OK
+SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_deleted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_updated_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_updated';
+SELECT ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't2';
+SELECT ROWS_CHANGED INTO @table_rows_changed_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't2';
+SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't2';
+SHOW INDEXES IN t2;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t2	0	PRIMARY	1	a	A	1	NULL	NULL		BTREE		
+SET innodb_fake_changes=1;
+SELECT * FROM t2;
+ERROR HY000: Got error 131 during COMMIT
+INSERT INTO t2 VALUES (2,2);
+ERROR HY000: Got error 131 during COMMIT
+UPDATE t2 SET b=0 where a=1;
+ERROR HY000: Got error 131 during COMMIT
+UPDATE t2 SET b=0 where a=2;
+ERROR HY000: Got error 131 during COMMIT
+DELETE FROM t2 where b=2;
+ERROR HY000: Got error 131 during COMMIT
+DELETE FROM t2 where b=1;
+ERROR HY000: Got error 131 during COMMIT
+DELETE FROM t2 where a=2;
+ERROR HY000: Got error 131 during COMMIT
+DELETE FROM t2 where a=1;
+ERROR HY000: Got error 131 during COMMIT
+REPLACE INTO t2 values (2,3);
+ERROR HY000: Got error 131 during COMMIT
+REPLACE INTO t2 VALUES (1,1);
+ERROR HY000: Got error 131 during COMMIT
+REPLACE INTO t2 VALUES (1,2);
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+SELECT * FROM t2;
+a	b
+1	1
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+INSERT INTO t2 VALUES (2,2);
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+UPDATE t2 SET b=0 where a=1;
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+UPDATE t2 SET b=0 where a=2;
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+DELETE FROM t2 where b=2;
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+DELETE FROM t2 where b=1;
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+DELETE FROM t2 where a=2;
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+DELETE FROM t2 where a=1;
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+REPLACE INTO t2 values (2,3);
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+REPLACE INTO t2 VALUES (1,1);
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+REPLACE INTO t2 VALUES (1,2);
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+REPLACE INTO t2 VALUES (1,2);
+SELECT * from t2;
+a	b
+1	1
+REPLACE INTO t2 VALUES (1,1);
+SELECT * from t2;
+a	b
+1	1
+ROLLBACK;
+BEGIN;
+INSERT INTO t2 VALUES (1,1);
+ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
+INSERT INTO t2 VALUES (1,2);
+ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
+ROLLBACK;
+INSERT INTO t2 VALUES (1,1) ON DUPLICATE KEY UPDATE b=2;
+ERROR HY000: Got error 131 during COMMIT
+INSERT INTO t2 VALUES (1,1) ON DUPLICATE KEY UPDATE b=b+10;
+ERROR HY000: Got error 131 during COMMIT
+INSERT INTO t2 VALUES (1,2) ON DUPLICATE KEY UPDATE b=b+10;
+ERROR HY000: Got error 131 during COMMIT
+CREATE INDEX bx ON t2(b);
+ERROR HY000: Got error 131 during COMMIT
+SET innodb_fake_changes=0;
+CHECK TABLE t2;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_updated_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated';
+SELECT ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't2';
+SELECT ROWS_CHANGED INTO @table_rows_changed_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't2';
+SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't2';
+should_be_1
+1
+SELECT @innodb_rows_inserted_2 - @innodb_rows_inserted_1 AS should_be_0;
+should_be_0
+0
+SELECT @innodb_rows_deleted_2 - @innodb_rows_deleted_1 AS should_be_0;
+should_be_0
+0
+SELECT @innodb_rows_updated_2 - @innodb_rows_updated_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_estimate_2 - @table_rows_estimate_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_changed_2 - @table_rows_changed_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_changed_x_indexes_2 - @table_rows_changed_x_indexes_1 AS should_be_0;
+should_be_0
+0
+SHOW INDEXES IN t2;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t2	0	PRIMARY	1	a	A	1	NULL	NULL		BTREE		
+DROP TABLE t2;
+CREATE TABLE t3 (a INT PRIMARY KEY, B TEXT) ENGINE=InnoDB;
+INSERT INTO t3 VALUES (1, '');
+SELECT @@global.userstat = 1 AS should_be_1;
+should_be_1
+1
+ANALYZE TABLE t3;
+Table	Op	Msg_type	Msg_text
+test.t3	analyze	status	OK
+SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_deleted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_updated_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_updated';
+SELECT ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't3';
+SELECT ROWS_CHANGED INTO @table_rows_changed_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't3';
+SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't3';
+SHOW INDEXES IN t3;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t3	0	PRIMARY	1	a	A	1	NULL	NULL		BTREE		
+SET innodb_fake_changes=1;
+SELECT * FROM t3;
+ERROR HY000: Got error 131 during COMMIT
+INSERT INTO t3 VALUES (2,lpad('a',10000, 'b'));
+ERROR HY000: Got error 131 during COMMIT
+UPDATE t3 SET a=0 where a=1;
+ERROR HY000: Got error 131 during COMMIT
+DELETE FROM t3 where a=2;
+ERROR HY000: Got error 131 during COMMIT
+DELETE FROM t3 where a=1;
+ERROR HY000: Got error 131 during COMMIT
+REPLACE INTO t3 values (2,lpad('a',9000,'q'));
+ERROR HY000: Got error 131 during COMMIT
+INSERT INTO t3 VALUES (1,1) ON DUPLICATE KEY UPDATE b=lpad('b',11000,'c');
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+SELECT * FROM t3;
+a	B
+1	
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+INSERT INTO t3 VALUES (2,lpad('a',10000, 'b'));
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+UPDATE t3 SET a=0 where a=1;
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+DELETE FROM t3 where a=2;
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+DELETE FROM t3 where a=1;
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+REPLACE INTO t3 values (2,lpad('a',9000,'q'));
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+BEGIN;
+INSERT INTO t3 VALUES (1,1) ON DUPLICATE KEY UPDATE b=lpad('b',11000,'c');
+COMMIT;
+ERROR HY000: Got error 131 during COMMIT
+SET innodb_fake_changes=0;
+CHECK TABLE t3;
+Table	Op	Msg_type	Msg_text
+test.t3	check	status	OK
+SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_updated_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated';
+SELECT ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't3';
+SELECT ROWS_CHANGED INTO @table_rows_changed_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't3';
+SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't3';
+should_be_1
+1
+SELECT @innodb_rows_inserted_2 - @innodb_rows_inserted_1 AS should_be_0;
+should_be_0
+0
+SELECT @innodb_rows_deleted_2 - @innodb_rows_deleted_1 AS should_be_0;
+should_be_0
+0
+SELECT @innodb_rows_updated_2 - @innodb_rows_updated_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_estimate_2 - @table_rows_estimate_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_changed_2 - @table_rows_changed_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_changed_x_indexes_2 - @table_rows_changed_x_indexes_1 AS should_be_0;
+should_be_0
+0
+SHOW INDEXES IN t3;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t3	0	PRIMARY	1	a	A	1	NULL	NULL		BTREE		
+DROP TABLE t3;
 # DDL must result in error
 CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
-SET autocommit=0;
+SELECT @@global.userstat = 1 AS should_be_1;
+should_be_1
+1
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_deleted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_updated_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_updated';
+SELECT ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED INTO @table_rows_changed_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SHOW INDEXES IN t1;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	0	PRIMARY	1	a	A	0	NULL	NULL		BTREE		
 SET innodb_fake_changes=1;
 BEGIN;
 CREATE TABLE t2 (a INT) ENGINE=InnoDB;
@@ -66,50 +467,157 @@
 DROP TABLE t1;
 ERROR 42S02: Unknown table 't1'
 TRUNCATE TABLE t1;
-ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Table storage engine for 't1' doesn't have this option
 ALTER TABLE t1 ENGINE=MyISAM;
 ERROR HY000: Got error 131 during COMMIT
 ROLLBACK;
 SET innodb_fake_changes=0;
+CHECK TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_updated_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated';
+SELECT ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED INTO @table_rows_changed_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+should_be_1
+1
+SELECT @innodb_rows_inserted_2 - @innodb_rows_inserted_1 AS should_be_0;
+should_be_0
+0
+SELECT @innodb_rows_deleted_2 - @innodb_rows_deleted_1 AS should_be_0;
+should_be_0
+0
+SELECT @innodb_rows_updated_2 - @innodb_rows_updated_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_estimate_2 - @table_rows_estimate_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_changed_2 - @table_rows_changed_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_changed_x_indexes_2 - @table_rows_changed_x_indexes_1 AS should_be_0;
+should_be_0
+0
+SHOW INDEXES IN t1;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	0	PRIMARY	1	a	A	0	NULL	NULL		BTREE		
 INSERT INTO t1 VALUES (1), (2);
-COMMIT;
 CREATE TABLE t2 (a INT PRIMARY KEY, b INT, INDEX b_ind (b),
 FOREIGN KEY (b) REFERENCES t1(a) ON DELETE CASCADE ON UPDATE CASCADE) ENGINE=InnoDB;
 INSERT INTO t2 VALUES (1, 1);
 INSERT INTO t2 VALUES (2, 2);
-COMMIT;
+SELECT @@global.userstat = 1 AS should_be_1;
+should_be_1
+1
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_deleted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_updated_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_updated';
+SELECT ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED INTO @table_rows_changed_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SHOW INDEXES IN t1;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	0	PRIMARY	1	a	A	2	NULL	NULL		BTREE		
 SET innodb_fake_changes=1;
+BEGIN;
 DELETE FROM t1 WHERE a=1;
 UPDATE t1 SET a=3 WHERE a=2;
 COMMIT;
 ERROR HY000: Got error 131 during COMMIT
+SET innodb_fake_changes=0;
+CHECK TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_updated_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated';
+SELECT ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED INTO @table_rows_changed_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
 should_be_1
 1
-should_be_0
-0
-should_be_0
-0
-should_be_0
-0
-should_be_0
-0
-should_be_0
-0
-SET innodb_fake_changes=0;
+SELECT @innodb_rows_inserted_2 - @innodb_rows_inserted_1 AS should_be_0;
+should_be_0
+0
+SELECT @innodb_rows_deleted_2 - @innodb_rows_deleted_1 AS should_be_0;
+should_be_0
+0
+SELECT @innodb_rows_updated_2 - @innodb_rows_updated_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_estimate_2 - @table_rows_estimate_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_changed_2 - @table_rows_changed_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_changed_x_indexes_2 - @table_rows_changed_x_indexes_1 AS should_be_0;
+should_be_0
+0
+SHOW INDEXES IN t1;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	0	PRIMARY	1	a	A	2	NULL	NULL		BTREE		
 DROP TABLE t2;
 CREATE TABLE t3 (a INT primary key, b text) ENGINE=InnoDB;
 INSERT INTO t3 VALUES (1,'');
-COMMIT;
+SELECT @@global.userstat = 1 AS should_be_1;
+should_be_1
+1
+ANALYZE TABLE t3;
+Table	Op	Msg_type	Msg_text
+test.t3	analyze	status	OK
+SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_deleted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_updated_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_updated';
+SELECT ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't3';
+SELECT ROWS_CHANGED INTO @table_rows_changed_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't3';
+SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't3';
+SHOW INDEXES IN t3;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t3	0	PRIMARY	1	a	A	1	NULL	NULL		BTREE		
 SET innodb_fake_changes=1;
+BEGIN;
 UPDATE t3 set b=lpad('b',11000,'c') where a=1;
 COMMIT;
 ERROR HY000: Got error 131 during COMMIT
-SET innodb_fake_changes=default;
-# Verify that the fake changes to t3 did not leak through
+SET innodb_fake_changes=0;
 CHECK TABLE t3;
 Table	Op	Msg_type	Msg_text
 test.t3	check	status	OK
+SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_updated_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated';
+SELECT ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't3';
+SELECT ROWS_CHANGED INTO @table_rows_changed_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't3';
+SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't3';
 should_be_1
 1
+SELECT @innodb_rows_inserted_2 - @innodb_rows_inserted_1 AS should_be_0;
+should_be_0
+0
+SELECT @innodb_rows_deleted_2 - @innodb_rows_deleted_1 AS should_be_0;
+should_be_0
+0
+SELECT @innodb_rows_updated_2 - @innodb_rows_updated_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_estimate_2 - @table_rows_estimate_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_changed_2 - @table_rows_changed_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_changed_x_indexes_2 - @table_rows_changed_x_indexes_1 AS should_be_0;
+should_be_0
+0
+SHOW INDEXES IN t3;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t3	0	PRIMARY	1	a	A	1	NULL	NULL		BTREE		
 DROP TABLE t1, t3;
 SET @@GLOBAL.userstat= default;
 
=== modified file 'Percona-Server/mysql-test/r/percona_innodb_fake_changes_bug_898306.result'
--- Percona-Server/mysql-test/r/percona_innodb_fake_changes_bug_898306.result	2012-10-17 11:30:19 +0000
+++ Percona-Server/mysql-test/r/percona_innodb_fake_changes_bug_898306.result	2013-07-15 16:19:41 +0000
@@ -1,7 +1,24 @@
 DROP TABLE IF EXISTS t1;
+SET @@GLOBAL.userstat=ON;
 CREATE TABLE t1 (a INT primary key, b int, unique key (b)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1,1);
 SET autocommit=1;
+SELECT @@global.userstat = 1 AS should_be_1;
+should_be_1
+1
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_deleted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_updated_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_updated';
+SELECT ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED INTO @table_rows_changed_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SHOW INDEXES IN t1;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	0	PRIMARY	1	a	A	1	NULL	NULL		BTREE		
+t1	0	b	1	b	A	1	NULL	NULL	YES	BTREE		
 SET innodb_fake_changes=1;
 # Confirm that duplicate key errors on REPLACE works
 REPLACE INTO t1 VALUES (1,1);
@@ -34,10 +51,38 @@
 INSERT INTO t1 VALUES (1,2) ON DUPLICATE KEY UPDATE b=b+10;
 ERROR HY000: Got error 131 during COMMIT
 SET innodb_fake_changes=0;
-SELECT * from t1;
-a	b
-1	1
 CHECK TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
+SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_updated_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated';
+SELECT ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED INTO @table_rows_changed_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+should_be_1
+1
+SELECT @innodb_rows_inserted_2 - @innodb_rows_inserted_1 AS should_be_0;
+should_be_0
+0
+SELECT @innodb_rows_deleted_2 - @innodb_rows_deleted_1 AS should_be_0;
+should_be_0
+0
+SELECT @innodb_rows_updated_2 - @innodb_rows_updated_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_estimate_2 - @table_rows_estimate_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_changed_2 - @table_rows_changed_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_changed_x_indexes_2 - @table_rows_changed_x_indexes_1 AS should_be_0;
+should_be_0
+0
+SHOW INDEXES IN t1;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	0	PRIMARY	1	a	A	1	NULL	NULL		BTREE		
+t1	0	b	1	b	A	1	NULL	NULL	YES	BTREE		
 DROP TABLE t1;
+SET @@GLOBAL.userstat=default;
 
=== modified file 'Percona-Server/mysql-test/r/percona_innodb_fake_changes_bug_917942.result'
--- Percona-Server/mysql-test/r/percona_innodb_fake_changes_bug_917942.result	2012-10-16 11:18:45 +0000
+++ Percona-Server/mysql-test/r/percona_innodb_fake_changes_bug_917942.result	2013-07-15 16:19:41 +0000
@@ -1,7 +1,23 @@
 DROP TABLE IF EXISTS t1;
+SET @@GLOBAL.userstat=ON;
 Test compressed
 CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT, v VARCHAR(200), t TEXT) ENGINE=INNODB KEY_BLOCK_SIZE=8;
 INSERT INTO t1 VALUES(NULL, LPAD("v", 2, "b"), LPAD("a", 100, "b"));
+SELECT @@global.userstat = 1 AS should_be_1;
+should_be_1
+1
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_deleted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_updated_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_updated';
+SELECT ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED INTO @table_rows_changed_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SHOW INDEXES IN t1;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	0	PRIMARY	1	id	A	1	NULL	NULL		BTREE		
 SET innodb_fake_changes=1;
 INSERT INTO t1 VALUES(1, "foo", LPAD("a", 4600, "b")) ON DUPLICATE KEY UPDATE T = VALUES(T);
 ERROR HY000: Got error 131 during COMMIT
@@ -11,12 +27,54 @@
 CHECK TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
+SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_updated_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated';
+SELECT ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED INTO @table_rows_changed_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
 should_be_1
 1
+SELECT @innodb_rows_inserted_2 - @innodb_rows_inserted_1 AS should_be_0;
+should_be_0
+0
+SELECT @innodb_rows_deleted_2 - @innodb_rows_deleted_1 AS should_be_0;
+should_be_0
+0
+SELECT @innodb_rows_updated_2 - @innodb_rows_updated_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_estimate_2 - @table_rows_estimate_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_changed_2 - @table_rows_changed_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_changed_x_indexes_2 - @table_rows_changed_x_indexes_1 AS should_be_0;
+should_be_0
+0
+SHOW INDEXES IN t1;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	0	PRIMARY	1	id	A	1	NULL	NULL		BTREE		
 DROP TABLE t1;
 Test for uncompressed
 CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT, v VARCHAR(200), t TEXT) ENGINE=INNODB;
 INSERT INTO t1 VALUES(NULL, LPAD("v", 2, "b"), LPAD("a", 100, "b"));
+SELECT @@global.userstat = 1 AS should_be_1;
+should_be_1
+1
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_deleted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_updated_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_updated';
+SELECT ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED INTO @table_rows_changed_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SHOW INDEXES IN t1;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	0	PRIMARY	1	id	A	1	NULL	NULL		BTREE		
 SET innodb_fake_changes=1;
 ERROR HY000: Got error 131 during COMMIT
 ERROR HY000: Got error 131 during COMMIT
@@ -122,11 +180,53 @@
 CHECK TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
+SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_updated_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated';
+SELECT ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED INTO @table_rows_changed_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
 should_be_1
 1
+SELECT @innodb_rows_inserted_2 - @innodb_rows_inserted_1 AS should_be_0;
+should_be_0
+0
+SELECT @innodb_rows_deleted_2 - @innodb_rows_deleted_1 AS should_be_0;
+should_be_0
+0
+SELECT @innodb_rows_updated_2 - @innodb_rows_updated_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_estimate_2 - @table_rows_estimate_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_changed_2 - @table_rows_changed_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_changed_x_indexes_2 - @table_rows_changed_x_indexes_1 AS should_be_0;
+should_be_0
+0
+SHOW INDEXES IN t1;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	0	PRIMARY	1	id	A	1	NULL	NULL		BTREE		
 DROP TABLE t1;
 CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT, v VARCHAR(200), t TEXT) ENGINE=INNODB KEY_BLOCK_SIZE=8;
 INSERT INTO t1 VALUES(2, LPAD("v", 2, "b"), LPAD("a", 200, "b"));
+SELECT @@global.userstat = 1 AS should_be_1;
+should_be_1
+1
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_deleted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_updated_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_updated';
+SELECT ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED INTO @table_rows_changed_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SHOW INDEXES IN t1;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	0	PRIMARY	1	id	A	1	NULL	NULL		BTREE		
 SET innodb_fake_changes=1;
 INSERT INTO t1 VALUES (3, "foo", LPAD("a", 4600, "b"));
 ERROR HY000: Got error 131 during COMMIT
@@ -134,8 +234,35 @@
 CHECK TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
+SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted';
+SELECT VARIABLE_VALUE INTO @innodb_rows_updated_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated';
+SELECT ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED INTO @table_rows_changed_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
+SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1';
 should_be_1
 1
+SELECT @innodb_rows_inserted_2 - @innodb_rows_inserted_1 AS should_be_0;
+should_be_0
+0
+SELECT @innodb_rows_deleted_2 - @innodb_rows_deleted_1 AS should_be_0;
+should_be_0
+0
+SELECT @innodb_rows_updated_2 - @innodb_rows_updated_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_estimate_2 - @table_rows_estimate_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_changed_2 - @table_rows_changed_1 AS should_be_0;
+should_be_0
+0
+SELECT @table_rows_changed_x_indexes_2 - @table_rows_changed_x_indexes_1 AS should_be_0;
+should_be_0
+0
+SHOW INDEXES IN t1;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	0	PRIMARY	1	id	A	1	NULL	NULL		BTREE		
 DROP TABLE t1;
 CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT, v VARCHAR(200), t TEXT) ENGINE=INNODB;
 INSERT INTO t1 VALUES(2, LPAD("v", 3, "b"), LPAD("a", 100, "b"));
@@ -149,3 +276,4 @@
 should_be_1
 1
 DROP TABLE t1;
+SET @@GLOBAL.userstat=default;
 
=== modified file 'Percona-Server/mysql-test/t/percona_innodb_fake_changes.test'
--- Percona-Server/mysql-test/t/percona_innodb_fake_changes.test	2012-10-17 11:56:00 +0000
+++ Percona-Server/mysql-test/t/percona_innodb_fake_changes.test	2013-07-15 16:19:41 +0000
@@ -4,7 +4,6 @@
 DROP TABLE IF EXISTS t1, t2, t3;
 --enable_warnings
 
-
 --echo # Checking variables
 SHOW VARIABLES LIKE 'innodb_fake_changes';
 SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='innodb_fake_changes';
@@ -17,20 +16,13 @@
 
 --echo # Explicit COMMIT should fail when innodb_fake_changes is enabled
 --echo # DML should be fine
-SET @@GLOBAL.userstat= TRUE;
+SET @@GLOBAL.userstat=TRUE;
 CREATE TABLE t1 (a INT) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
 
-let $t1_checksum_1= `CHECKSUM TABLE t1 EXTENDED`;
-let $innodb_rows_inserted_1= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_inserted'`;
-let $innodb_rows_deleted_1= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted'`;
-let $innodb_rows_updated_1= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated'`;
-let $table_rows_estimate_1= `SELECT ROWS FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'`;
-let $table_rows_changed_1= `SELECT ROWS_CHANGED FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'`;
-let $table_rows_changed_x_indexes_1= `SELECT ROWS_CHANGED_X_INDEXES FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'`;
+--let $fake_changes_table=t1
+--source include/start_fake_changes.inc
 
-SET autocommit=0;
-SET innodb_fake_changes=1;
 BEGIN;
 INSERT INTO t1 VALUES (2);
 UPDATE t1 SET a=0;
@@ -38,102 +30,339 @@
 SELECT * FROM t1;
 --error 1180
 COMMIT;
-SET innodb_fake_changes=default;
---echo # Verify that the fake changes to t1 did not leak through
-CHECK TABLE t1;
-let $t1_checksum_2= `CHECKSUM TABLE t1 EXTENDED`;
-let $innodb_rows_inserted_2= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_inserted'`;
-let $innodb_rows_deleted_2= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted'`;
-let $innodb_rows_updated_2= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated'`;
-let $table_rows_estimate_2= `SELECT ROWS FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'`;
-let $table_rows_changed_2= `SELECT ROWS_CHANGED FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'`;
-let $table_rows_changed_x_indexes_2= `SELECT ROWS_CHANGED_X_INDEXES FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'`;
---disable_query_log
-eval SELECT "$t1_checksum_1" LIKE "$t1_checksum_2" AS should_be_1;
-eval SELECT "$innodb_rows_inserted_2" - "$innodb_rows_inserted_1" AS should_be_0;
-eval SELECT "$innodb_rows_deleted_2" - "$innodb_rows_deleted_1" AS should_be_0;
-eval SELECT "$innodb_rows_updated_2" - "$innodb_rows_updated_1" AS should_be_0;
-eval SELECT "$table_rows_estimate_2" - "$table_rows_estimate_1" AS should_be_0;
-eval SELECT "$table_rows_changed_2" - "$table_rows_changed_1" AS should_be_0;
-eval SELECT "$table_rows_changed_x_indexes_2" - "$table_rows_changed_x_indexes_1" AS should_be_0;
---enable_query_log
-DROP TABLE t1;
+
+--source include/stop_fake_changes.inc
+
+DROP TABLE t1;
+
+#
+# Test primary and secondary index access
+#
+CREATE TABLE t1 (a INT PRIMARY KEY, b INT, UNIQUE KEY (b)) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1,1);
+
+--source include/start_fake_changes.inc
+
+# Test with autocommit
+--error ER_ERROR_DURING_COMMIT
+SELECT * FROM t1;
+--error ER_ERROR_DURING_COMMIT
+INSERT INTO t1 VALUES (2,2);
+--error ER_DUP_ENTRY
+UPDATE t1 SET a=0 where b=1;
+--error ER_ERROR_DURING_COMMIT
+UPDATE t1 SET b=0 where a=1;
+--error ER_ERROR_DURING_COMMIT
+UPDATE t1 SET b=0 where a=2;
+--error ER_ERROR_DURING_COMMIT
+DELETE FROM t1 where b=2;
+--error ER_ERROR_DURING_COMMIT
+DELETE FROM t1 where b=1;
+--error ER_ERROR_DURING_COMMIT
+DELETE FROM t1 where a=2;
+--error ER_ERROR_DURING_COMMIT
+DELETE FROM t1 where a=1;
+--error ER_ERROR_DURING_COMMIT
+REPLACE INTO t1 values (2,3);
+
+# Test with transactions
+BEGIN;
+SELECT * FROM t1;
+--error ER_ERROR_DURING_COMMIT
+COMMIT;
+
+BEGIN;
+INSERT INTO t1 VALUES (2,2);
+--error ER_ERROR_DURING_COMMIT
+COMMIT;
+
+BEGIN;
+--error ER_DUP_ENTRY
+UPDATE t1 SET a=0 where b=1;
+--error ER_ERROR_DURING_COMMIT
+COMMIT;
+
+BEGIN;
+UPDATE t1 SET b=0 where a=1;
+--error ER_ERROR_DURING_COMMIT
+COMMIT;
+
+BEGIN;
+UPDATE t1 SET b=0 where a=2;
+--error ER_ERROR_DURING_COMMIT
+COMMIT;
+
+BEGIN;
+DELETE FROM t1 where b=2;
+--error ER_ERROR_DURING_COMMIT
+COMMIT;
+
+BEGIN;
+DELETE FROM t1 where b=1;
+--error ER_ERROR_DURING_COMMIT
+COMMIT;
+
+BEGIN;
+DELETE FROM t1 where a=2;
+--error ER_ERROR_DURING_COMMIT
+COMMIT;
+
+BEGIN;
+DELETE FROM t1 where a=1;
+--error ER_ERROR_DURING_COMMIT
+COMMIT;
+
+BEGIN;
+REPLACE INTO t1 values (2,3);
+--error ER_ERROR_DURING_COMMIT
+COMMIT;
+
+--error ER_ERROR_DURING_COMMIT
+INSERT INTO t1 VALUES (1,1) ON DUPLICATE KEY UPDATE b=2;
+--error ER_ERROR_DURING_COMMIT
+CREATE INDEX bx ON t1(b);
+
+--source include/stop_fake_changes.inc
+
+DROP TABLE t1;
+
+#
+# Test all accesses through the primary index
+#
+CREATE TABLE t2 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (1, 1);
+
+--let $fake_changes_table=t2
+--source include/start_fake_changes.inc
+
+# Test with autocommit
+--error ER_ERROR_DURING_COMMIT
+SELECT * FROM t2;
+--error ER_ERROR_DURING_COMMIT
+INSERT INTO t2 VALUES (2,2);
+--error ER_ERROR_DURING_COMMIT
+UPDATE t2 SET b=0 where a=1;
+--error ER_ERROR_DURING_COMMIT
+UPDATE t2 SET b=0 where a=2;
+--error ER_ERROR_DURING_COMMIT
+DELETE FROM t2 where b=2;
+--error ER_ERROR_DURING_COMMIT
+DELETE FROM t2 where b=1;
+--error ER_ERROR_DURING_COMMIT
+DELETE FROM t2 where a=2;
+--error ER_ERROR_DURING_COMMIT
+DELETE FROM t2 where a=1;
+--error ER_ERROR_DURING_COMMIT
+REPLACE INTO t2 values (2,3);
+--error ER_ERROR_DURING_COMMIT
+REPLACE INTO t2 VALUES (1,1);
+--error ER_ERROR_DURING_COMMIT
+REPLACE INTO t2 VALUES (1,2);
+
+# Test with transactions
+BEGIN;
+SELECT * FROM t2;
+--error ER_ERROR_DURING_COMMIT
+COMMIT;
+
+BEGIN;
+INSERT INTO t2 VALUES (2,2);
+--error ER_ERROR_DURING_COMMIT
+COMMIT;
+
+BEGIN;
+UPDATE t2 SET b=0 where a=1;
+--error ER_ERROR_DURING_COMMIT
+COMMIT;
+
+BEGIN;
+UPDATE t2 SET b=0 where a=2;
+--error ER_ERROR_DURING_COMMIT
+COMMIT;
+
+BEGIN;
+DELETE FROM t2 where b=2;
+--error ER_ERROR_DURING_COMMIT
+COMMIT;
+
+BEGIN;
+DELETE FROM t2 where b=1;
+--error ER_ERROR_DURING_COMMIT
+COMMIT;
+
+BEGIN;
+DELETE FROM t2 where a=2;
+--error ER_ERROR_DURING_COMMIT
+COMMIT;
+
+BEGIN;
+DELETE FROM t2 where a=1;
+--error ER_ERROR_DURING_COMMIT
+COMMIT;
+
+BEGIN;
+REPLACE INTO t2 values (2,3);
+--error ER_ERROR_DURING_COMMIT
+COMMIT;
+
+BEGIN;
+REPLACE INTO t2 VALUES (1,1);
+--error ER_ERROR_DURING_COMMIT
+COMMIT;
+
+BEGIN;
+REPLACE INTO t2 VALUES (1,2);
+--error ER_ERROR_DURING_COMMIT
+COMMIT;
+
+# Confirm that duplicate key errors are OK
+BEGIN;
+REPLACE INTO t2 VALUES (1,2);
+SELECT * from t2;
+REPLACE INTO t2 VALUES (1,1);
+SELECT * from t2;
+ROLLBACK;
+
+BEGIN;
+--error ER_DUP_ENTRY
+INSERT INTO t2 VALUES (1,1);
+--error ER_DUP_ENTRY
+INSERT INTO t2 VALUES (1,2);
+ROLLBACK;
+
+--error ER_ERROR_DURING_COMMIT
+INSERT INTO t2 VALUES (1,1) ON DUPLICATE KEY UPDATE b=2;
+--error ER_ERROR_DURING_COMMIT
+INSERT INTO t2 VALUES (1,1) ON DUPLICATE KEY UPDATE b=b+10;
+--error ER_ERROR_DURING_COMMIT
+INSERT INTO t2 VALUES (1,2) ON DUPLICATE KEY UPDATE b=b+10;
+--error ER_ERROR_DURING_COMMIT
+CREATE INDEX bx ON t2(b);
+
+--source include/stop_fake_changes.inc
+
+DROP TABLE t2;
+
+#
+# Test TEXT
+#
+CREATE TABLE t3 (a INT PRIMARY KEY, B TEXT) ENGINE=InnoDB;
+INSERT INTO t3 VALUES (1, '');
+
+--let $fake_changes_table=t3
+--source include/start_fake_changes.inc
+
+# Test with autocommit
+--error ER_ERROR_DURING_COMMIT
+SELECT * FROM t3;
+--error ER_ERROR_DURING_COMMIT
+INSERT INTO t3 VALUES (2,lpad('a',10000, 'b'));
+--error ER_ERROR_DURING_COMMIT
+UPDATE t3 SET a=0 where a=1;
+--error ER_ERROR_DURING_COMMIT
+DELETE FROM t3 where a=2;
+--error ER_ERROR_DURING_COMMIT
+DELETE FROM t3 where a=1;
+--error ER_ERROR_DURING_COMMIT
+REPLACE INTO t3 values (2,lpad('a',9000,'q'));
+--error ER_ERROR_DURING_COMMIT
+INSERT INTO t3 VALUES (1,1) ON DUPLICATE KEY UPDATE b=lpad('b',11000,'c');
+
+# Test with transactions
+BEGIN;
+SELECT * FROM t3;
+--error ER_ERROR_DURING_COMMIT
+COMMIT;
+
+BEGIN;
+INSERT INTO t3 VALUES (2,lpad('a',10000, 'b'));
+--error ER_ERROR_DURING_COMMIT
+COMMIT;
+
+BEGIN;
+UPDATE t3 SET a=0 where a=1;
+--error ER_ERROR_DURING_COMMIT
+COMMIT;
+
+BEGIN;
+DELETE FROM t3 where a=2;
+--error ER_ERROR_DURING_COMMIT
+COMMIT;
+
+BEGIN;
+DELETE FROM t3 where a=1;
+--error ER_ERROR_DURING_COMMIT
+COMMIT;
+
+BEGIN;
+REPLACE INTO t3 values (2,lpad('a',9000,'q'));
+--error ER_ERROR_DURING_COMMIT
+COMMIT;
+
+BEGIN;
+INSERT INTO t3 VALUES (1,1) ON DUPLICATE KEY UPDATE b=lpad('b',11000,'c');
+--error ER_ERROR_DURING_COMMIT
+COMMIT;
+
+--source include/stop_fake_changes.inc
+
+DROP TABLE t3;
 
 --echo # DDL must result in error
 CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
-SET autocommit=0;
-SET innodb_fake_changes=1;
+
+--let $fake_changes_table=t1
+--source include/start_fake_changes.inc
+
 BEGIN;
 --error 1005
 CREATE TABLE t2 (a INT) ENGINE=InnoDB;
 --error 1051
 DROP TABLE t1;
---error 1180
+--error 1031
 TRUNCATE TABLE t1;
 --error 1180
 ALTER TABLE t1 ENGINE=MyISAM;
 ROLLBACK;
 
+--source include/stop_fake_changes.inc
+
 # Test stat counters foreign key constraints
-SET innodb_fake_changes=0;
 INSERT INTO t1 VALUES (1), (2);
-COMMIT;
+
 CREATE TABLE t2 (a INT PRIMARY KEY, b INT, INDEX b_ind (b),
        FOREIGN KEY (b) REFERENCES t1(a) ON DELETE CASCADE ON UPDATE CASCADE) ENGINE=InnoDB;
 INSERT INTO t2 VALUES (1, 1);
 INSERT INTO t2 VALUES (2, 2);
-COMMIT;
-
-let $t2_checksum_1= `CHECKSUM TABLE t2 EXTENDED`;
-let $innodb_rows_deleted_1= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted'`;
-let $innodb_rows_updated_1= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated'`;
-let $table_rows_estimate_1= `SELECT ROWS FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't2'`;
-let $table_rows_changed_1= `SELECT ROWS_CHANGED FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't2'`;
-let $table_rows_changed_x_indexes_1= `SELECT ROWS_CHANGED_X_INDEXES FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't2'`;
-
-SET innodb_fake_changes=1;
+
+--let $fake_changes_table=t1
+--source include/start_fake_changes.inc
+
+BEGIN;
 DELETE FROM t1 WHERE a=1;
 UPDATE t1 SET a=3 WHERE a=2;
 --error 1180
 COMMIT;
 
-let $t2_checksum_2= `CHECKSUM TABLE t2 EXTENDED`;
-let $innodb_rows_deleted_2= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted'`;
-let $innodb_rows_updated_2= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated'`;
-let $table_rows_estimate_2= `SELECT ROWS FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't2'`;
-let $table_rows_changed_2= `SELECT ROWS_CHANGED FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't2'`;
-let $table_rows_changed_x_indexes_2= `SELECT ROWS_CHANGED_X_INDEXES FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't2'`;
-
---disable_query_log
-eval SELECT "$t2_checksum_1" LIKE "$t2_checksum_2" AS should_be_1;
-eval SELECT "$innodb_rows_deleted_2" - "$innodb_rows_deleted_1" AS should_be_0;
-eval SELECT "$innodb_rows_updated_2" - "$innodb_rows_updated_1" AS should_be_0;
-eval SELECT "$table_rows_estimate_2" - "$table_rows_estimate_1" AS should_be_0;
-eval SELECT "$table_rows_changed_2" - "$table_rows_changed_1" AS should_be_0;
-eval SELECT "$table_rows_changed_x_indexes_2" - "$table_rows_changed_x_indexes_1" AS should_be_0;
---enable_query_log
-
-SET innodb_fake_changes=0;
+--source include/stop_fake_changes.inc
+
 DROP TABLE t2;
 
 # Test for bug 890404: uninitialized value warning in btr_cur_pessimistic_update
 CREATE TABLE t3 (a INT primary key, b text) ENGINE=InnoDB;
 INSERT INTO t3 VALUES (1,'');
-COMMIT;
 let $t3_checksum_1= `CHECKSUM TABLE t3 EXTENDED`;
-SET innodb_fake_changes=1;
-
+
+--let $fake_changes_table=t3
+--source include/start_fake_changes.inc
+
+BEGIN;
 UPDATE t3 set b=lpad('b',11000,'c') where a=1;
 --error ER_ERROR_DURING_COMMIT
 COMMIT;
 
-SET innodb_fake_changes=default;
---echo # Verify that the fake changes to t3 did not leak through
-CHECK TABLE t3;
-let $t3_checksum_2= `CHECKSUM TABLE t3 EXTENDED`;
---disable_query_log
-eval SELECT "$t3_checksum_1" LIKE "$t3_checksum_2" AS should_be_1;
---enable_query_log
+--source include/stop_fake_changes.inc
+
 DROP TABLE t1, t3;
 
 SET @@GLOBAL.userstat= default;
 
=== modified file 'Percona-Server/mysql-test/t/percona_innodb_fake_changes_bug_898306.test'
--- Percona-Server/mysql-test/t/percona_innodb_fake_changes_bug_898306.test	2012-10-17 11:30:19 +0000
+++ Percona-Server/mysql-test/t/percona_innodb_fake_changes_bug_898306.test	2013-07-15 16:19:41 +0000
@@ -7,11 +7,15 @@
 DROP TABLE IF EXISTS t1;
 --enable_warnings
 
+SET @@GLOBAL.userstat=ON;
+
 CREATE TABLE t1 (a INT primary key, b int, unique key (b)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1,1);
 
 SET autocommit=1;
-SET innodb_fake_changes=1;
+
+--let $fake_changes_table=t1
+--source include/start_fake_changes.inc
 
 --echo # Confirm that duplicate key errors on REPLACE works
 
@@ -52,8 +56,8 @@
 --error ER_ERROR_DURING_COMMIT
 INSERT INTO t1 VALUES (1,2) ON DUPLICATE KEY UPDATE b=b+10;
 
-SET innodb_fake_changes=0;
-SELECT * from t1;
-CHECK TABLE t1;
+--source include/stop_fake_changes.inc
 
 DROP TABLE t1;
+
+SET @@GLOBAL.userstat=default;
 
=== modified file 'Percona-Server/mysql-test/t/percona_innodb_fake_changes_bug_917942.test'
--- Percona-Server/mysql-test/t/percona_innodb_fake_changes_bug_917942.test	2012-10-17 11:30:19 +0000
+++ Percona-Server/mysql-test/t/percona_innodb_fake_changes_bug_917942.test	2013-07-15 16:19:41 +0000
@@ -7,6 +7,8 @@
 DROP TABLE IF EXISTS t1;
 --enable_warnings
 
+SET @@GLOBAL.userstat=ON;
+
 #
 # Confirm that cursor->tree_height is initialized when calling btr_cur_pessimistic_update
 # for transactions with innodb_fake_changes set
@@ -16,30 +18,25 @@
 CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT, v VARCHAR(200), t TEXT) ENGINE=INNODB KEY_BLOCK_SIZE=8;
 
 INSERT INTO t1 VALUES(NULL, LPAD("v", 2, "b"), LPAD("a", 100, "b"));
-let $t1_checksum_1= `CHECKSUM TABLE t1 EXTENDED`;
 
-SET innodb_fake_changes=1;
+--let $fake_changes_table=t1
+--source include/start_fake_changes.inc
 
 --error 1180
 INSERT INTO t1 VALUES(1, "foo", LPAD("a", 4600, "b")) ON DUPLICATE KEY UPDATE T = VALUES(T);
 --error 1180
 UPDATE t1 SET T = LPAD("A", 4600, "b");
 
-SET innodb_fake_changes=0;
-CHECK TABLE t1;
-let $t1_checksum_2= `CHECKSUM TABLE t1 EXTENDED`;
---disable_query_log
-eval SELECT "$t1_checksum_1" LIKE "$t1_checksum_2" AS should_be_1;
---enable_query_log
+--source include/stop_fake_changes.inc
+
 DROP TABLE t1;
 
 --echo Test for uncompressed
 CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT, v VARCHAR(200), t TEXT) ENGINE=INNODB;
 
 INSERT INTO t1 VALUES(NULL, LPAD("v", 2, "b"), LPAD("a", 100, "b"));
-let $t1_checksum_1= `CHECKSUM TABLE t1 EXTENDED`;
 
-SET innodb_fake_changes=1;
+--source include/start_fake_changes.inc
 
 --disable_query_log
 let $x = 50;
@@ -53,12 +50,8 @@
 }
 --enable_query_log
 
-SET innodb_fake_changes=0;
-CHECK TABLE t1;
-let $t1_checksum_2= `CHECKSUM TABLE t1 EXTENDED`;
---disable_query_log
-eval SELECT "$t1_checksum_1" LIKE "$t1_checksum_2" AS should_be_1;
---enable_query_log
+--source include/stop_fake_changes.inc
+
 DROP TABLE t1;
 
 #
@@ -69,19 +62,14 @@
 CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT, v VARCHAR(200), t TEXT) ENGINE=INNODB KEY_BLOCK_SIZE=8;
 
 INSERT INTO t1 VALUES(2, LPAD("v", 2, "b"), LPAD("a", 200, "b")); 
-let $t1_checksum_1= `CHECKSUM TABLE t1 EXTENDED`;
 
-SET innodb_fake_changes=1;
+--source include/start_fake_changes.inc
 
 --error 1180
 INSERT INTO t1 VALUES (3, "foo", LPAD("a", 4600, "b"));
 
-SET innodb_fake_changes=0;
-CHECK TABLE t1;
-let $t1_checksum_2= `CHECKSUM TABLE t1 EXTENDED`;
---disable_query_log
-eval SELECT "$t1_checksum_1" LIKE "$t1_checksum_2" AS should_be_1;
---enable_query_log
+--source include/stop_fake_changes.inc
+
 DROP TABLE t1;
 
 CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT, v VARCHAR(200), t TEXT) ENGINE=INNODB;
@@ -101,3 +89,5 @@
 eval SELECT "$t1_checksum_1" LIKE "$t1_checksum_2" AS should_be_1;
 --enable_query_log
 DROP TABLE t1;
+
+SET @@GLOBAL.userstat=default;
 
=== modified file 'Percona-Server/mysql-test/t/percona_innodb_fake_changes_locks.test'
--- Percona-Server/mysql-test/t/percona_innodb_fake_changes_locks.test	2012-10-11 14:18:34 +0000
+++ Percona-Server/mysql-test/t/percona_innodb_fake_changes_locks.test	2013-07-15 16:19:41 +0000
@@ -16,6 +16,7 @@
 --connection conn1
 --echo # Verifying that X_LOCK not acquired
 SET autocommit=0;
+# Cannot use start_fake_changes.inc as conn2 issues real workload before reverting
 SET innodb_fake_changes=1;
 BEGIN;
 SELECT * FROM t1 FOR UPDATE;
 
=== modified file 'Percona-Server/sql/sql_insert.cc'
--- Percona-Server/sql/sql_insert.cc	2013-06-27 15:35:20 +0000
+++ Percona-Server/sql/sql_insert.cc	2013-07-15 16:19:41 +0000
@@ -1758,7 +1758,7 @@
             2) do nothing on fake delete
             3) goto #1
           */
-          if (table->file->is_fake_change_enabled(thd))
+          if (unlikely(table->file->is_fake_change_enabled(thd)))
             goto ok_or_after_trg_err;
           /* Let us attempt do write_row() once more */
         }
 
=== modified file 'Percona-Server/storage/innobase/btr/btr0cur.c'
--- Percona-Server/storage/innobase/btr/btr0cur.c	2013-06-27 15:35:20 +0000
+++ Percona-Server/storage/innobase/btr/btr0cur.c	2013-07-15 16:19:41 +0000
@@ -1189,7 +1189,7 @@
 	rec_t*		rec;
 	roll_ptr_t	roll_ptr;
 
-	if (thr && thr_get_trx(thr)->fake_changes) {
+	if (UNIV_UNLIKELY(thr && thr_get_trx(thr)->fake_changes)) {
 		/* skip LOCK, UNDO */
 		return(DB_SUCCESS);
 	}
@@ -1427,7 +1427,7 @@
 		goto fail_err;
 	}
 
-	if (thr && thr_get_trx(thr)->fake_changes) {
+	if (UNIV_UNLIKELY(thr && thr_get_trx(thr)->fake_changes)) {
 		/* skip CHANGE, LOG */
 		*big_rec = big_rec_vec;
 		return(err); /* == DB_SUCCESS */
@@ -1641,7 +1641,7 @@
 		}
 	}
 
-	if (thr && thr_get_trx(thr)->fake_changes) {
+	if (UNIV_UNLIKELY(thr && thr_get_trx(thr)->fake_changes)) {
 		/* skip CHANGE, LOG */
 		if (n_extents > 0) {
 			fil_space_release_free_extents(index->space,
@@ -1707,7 +1707,7 @@
 
 	ut_ad(cursor && update && thr && roll_ptr);
 
-	if (thr && thr_get_trx(thr)->fake_changes) {
+	if (UNIV_UNLIKELY(thr && thr_get_trx(thr)->fake_changes)) {
 		/* skip LOCK, UNDO */
 		return(DB_SUCCESS);
 	}
@@ -1914,7 +1914,7 @@
 		return(FALSE);
 	}
 
-	if (trx && trx->fake_changes) {
+	if (UNIV_UNLIKELY(trx && trx->fake_changes)) {
 	    /* Don't call page_zip_compress_write_log_no_data as that has
 	    assert which would fail. Assume there won't be a compression
 	    failure. */
@@ -2021,7 +2021,7 @@
 		return(err);
 	}
 
-	if (trx->fake_changes) {
+	if (UNIV_UNLIKELY(trx->fake_changes)) {
 		/* skip CHANGE, LOG */
 		if (UNIV_LIKELY_NULL(heap)) {
 			mem_heap_free(heap);
@@ -2256,7 +2256,7 @@
 		goto err_exit;
 	}
 
-	if (thr && thr_get_trx(thr)->fake_changes) {
+	if (UNIV_UNLIKELY(thr && thr_get_trx(thr)->fake_changes)) {
 		/* skip CHANGE, LOG */
 		goto err_exit; /* == DB_SUCCESS */
 	}
@@ -2552,7 +2552,7 @@
 		ut_ad(flags & BTR_KEEP_POS_FLAG);
 	}
 
-	if (trx->fake_changes) {
+	if (UNIV_UNLIKELY(trx->fake_changes)) {
 		/* skip CHANGE, LOG */
 		err = DB_SUCCESS;
 		goto return_after_reservations;
@@ -2888,7 +2888,7 @@
 	ut_ad(dict_index_is_clust(index));
 	ut_ad(!rec_get_deleted_flag(rec, rec_offs_comp(offsets)));
 
-	if (thr && thr_get_trx(thr)->fake_changes) {
+	if (UNIV_UNLIKELY(thr && thr_get_trx(thr)->fake_changes)) {
 		/* skip LOCK, UNDO, CHANGE, LOG */
 		return(DB_SUCCESS);
 	}
@@ -3027,7 +3027,7 @@
 	rec_t*		rec;
 	ulint		err;
 
-	if (thr && thr_get_trx(thr)->fake_changes) {
+	if (UNIV_UNLIKELY(thr && thr_get_trx(thr)->fake_changes)) {
 		/* skip LOCK, CHANGE, LOG */
 		return(DB_SUCCESS);
 	}
 
=== modified file 'Percona-Server/storage/innobase/handler/ha_innodb.cc'
--- Percona-Server/storage/innobase/handler/ha_innodb.cc	2013-07-15 16:19:40 +0000
+++ Percona-Server/storage/innobase/handler/ha_innodb.cc	2013-07-15 16:19:41 +0000
@@ -3605,7 +3605,10 @@
 		trx_search_latch_release_if_reserved(trx);
 	}
 
-	if (trx->fake_changes && (all || (!thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)))) {
+	if (UNIV_UNLIKELY(trx->fake_changes
+			  && (all || (!thd_test_options(thd,
+				OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))))) {
+
 		innobase_rollback(hton, thd, all); /* rollback implicitly */
 		thd->stmt_da->reset_diagnostics_area(); /* because debug assertion code complains, if something left */
 		DBUG_RETURN(HA_ERR_WRONG_COMMAND);
@@ -8169,7 +8172,7 @@
 
 	trx = innobase_trx_allocate(thd);
 
-	if (trx->fake_changes) {
+	if (UNIV_UNLIKELY(trx->fake_changes)) {
 		innobase_commit_low(trx);
 		trx_free_for_mysql(trx);
 		DBUG_RETURN(HA_ERR_WRONG_COMMAND);
@@ -8395,7 +8398,7 @@
 		DBUG_RETURN(HA_ERR_CRASHED);
 	}
 
-	if (prebuilt->trx->fake_changes) {
+	if (UNIV_UNLIKELY(prebuilt->trx->fake_changes)) {
 		DBUG_RETURN(HA_ERR_WRONG_COMMAND);
 	}
 
@@ -8460,7 +8463,7 @@
 
 	trx = innobase_trx_allocate(thd);
 
-	if (trx->fake_changes) {
+	if (UNIV_UNLIKELY(trx->fake_changes)) {
 		innobase_commit_low(trx);
 		trx_free_for_mysql(trx);
 		DBUG_RETURN(HA_ERR_WRONG_COMMAND);
@@ -8552,13 +8555,13 @@
 	trx->mysql_thd = NULL;
 #else
 	trx = innobase_trx_allocate(thd);
-	if (trx->fake_changes) {
+#endif
+	if (UNIV_UNLIKELY(trx->fake_changes)) {
 		my_free(namebuf);
 		innobase_commit_low(trx);
 		trx_free_for_mysql(trx);
 		return; /* ignore */
 	}
-#endif
 	row_drop_database_for_mysql(namebuf, trx);
 	my_free(namebuf);
 
@@ -8671,7 +8674,7 @@
 	trx_search_latch_release_if_reserved(parent_trx);
 
 	trx = innobase_trx_allocate(thd);
-	if (trx->fake_changes) {
+	if (UNIV_UNLIKELY(trx->fake_changes)) {
 		innobase_commit_low(trx);
 		trx_free_for_mysql(trx);
 		DBUG_RETURN(HA_ERR_WRONG_COMMAND);
 
=== modified file 'Percona-Server/storage/innobase/handler/handler0alter.cc'
--- Percona-Server/storage/innobase/handler/handler0alter.cc	2013-05-23 08:39:28 +0000
+++ Percona-Server/storage/innobase/handler/handler0alter.cc	2013-07-15 16:19:41 +0000
@@ -697,7 +697,7 @@
 	possible adaptive hash latch to avoid deadlocks of threads. */
 	trx_search_latch_release_if_reserved(prebuilt->trx);
 
-	if (prebuilt->trx->fake_changes) {
+	if (UNIV_UNLIKELY(prebuilt->trx->fake_changes)) {
 		DBUG_RETURN(HA_ERR_WRONG_COMMAND);
 	}
 
@@ -742,7 +742,7 @@
 	/* Create a background transaction for the operations on
 	the data dictionary tables. */
 	trx = innobase_trx_allocate(user_thd);
-	if (trx->fake_changes) {
+	if (UNIV_UNLIKELY(trx->fake_changes)) {
 		mem_heap_free(heap);
 		trx_general_rollback_for_mysql(trx, NULL);
 		trx_free_for_mysql(trx);
@@ -1116,7 +1116,7 @@
 	trx_search_latch_release_if_reserved(prebuilt->trx);
 	trx = prebuilt->trx;
 
-	if (trx->fake_changes) {
+	if (UNIV_UNLIKELY(trx->fake_changes)) {
 		DBUG_RETURN(HA_ERR_WRONG_COMMAND);
 	}
 
@@ -1328,7 +1328,7 @@
 	/* Create a background transaction for the operations on
 	the data dictionary tables. */
 	trx = innobase_trx_allocate(user_thd);
-	if (trx->fake_changes) {
+	if (UNIV_UNLIKELY(trx->fake_changes)) {
 		trx_general_rollback_for_mysql(trx, NULL);
 		trx_free_for_mysql(trx);
 		DBUG_RETURN(HA_ERR_WRONG_COMMAND);
 
=== modified file 'Percona-Server/storage/innobase/lock/lock0lock.c'
--- Percona-Server/storage/innobase/lock/lock0lock.c	2013-06-26 07:01:13 +0000
+++ Percona-Server/storage/innobase/lock/lock0lock.c	2013-07-15 16:19:41 +0000
@@ -4019,7 +4019,7 @@
 
 	trx = thr_get_trx(thr);
 
-	if (trx->fake_changes && mode == LOCK_IX) {
+	if (UNIV_UNLIKELY(trx->fake_changes && mode == LOCK_IX)) {
 		mode = LOCK_IS;
 	}
 
@@ -5268,7 +5268,7 @@
 
 	trx = thr_get_trx(thr);
 
-	if (trx->fake_changes) {
+	if (UNIV_UNLIKELY(trx->fake_changes)) {
 		return(DB_SUCCESS);
 	}
 
@@ -5453,7 +5453,7 @@
 		return(DB_SUCCESS);
 	}
 
-	if (thr && thr_get_trx(thr)->fake_changes) {
+	if (UNIV_UNLIKELY(thr && thr_get_trx(thr)->fake_changes)) {
 		return(DB_SUCCESS);
 	}
 
@@ -5515,7 +5515,7 @@
 		return(DB_SUCCESS);
 	}
 
-	if (thr && thr_get_trx(thr)->fake_changes) {
+	if (UNIV_UNLIKELY(thr && thr_get_trx(thr)->fake_changes)) {
 		return(DB_SUCCESS);
 	}
 
 
=== modified file 'Percona-Server/storage/innobase/que/que0que.c'
--- Percona-Server/storage/innobase/que/que0que.c	2012-05-10 07:49:14 +0000
+++ Percona-Server/storage/innobase/que/que0que.c	2013-07-15 16:19:41 +0000
@@ -1417,7 +1417,7 @@
 
 	ut_a(trx->error_state == DB_SUCCESS);
 
-	if (trx->fake_changes) {
+	if (UNIV_UNLIKELY(trx->fake_changes)) {
 		/* fake_changes should not access to system tables */
 		fprintf(stderr, "InnoDB: ERROR: innodb_fake_changes tried to access to system tables.\n");
 		return(DB_ERROR);
 
=== modified file 'Percona-Server/storage/innobase/row/row0ins.c'
--- Percona-Server/storage/innobase/row/row0ins.c	2013-06-26 07:01:13 +0000
+++ Percona-Server/storage/innobase/row/row0ins.c	2013-07-15 16:19:41 +0000
@@ -1512,7 +1512,7 @@
 		mem_heap_free(heap);
 	}
 
-	if (trx->fake_changes) {
+	if (UNIV_UNLIKELY(trx->fake_changes)) {
 		err = DB_SUCCESS;
 	}
 
@@ -2214,7 +2214,7 @@
 		rec_t*	rec;
 		ulint*	offsets;
 
-		if (thr_get_trx(thr)->fake_changes) {
+		if (UNIV_UNLIKELY(thr_get_trx(thr)->fake_changes)) {
 			/* skip store extern */
 			if (modify) {
 				dtuple_big_rec_free(big_rec);
 
=== modified file 'Percona-Server/storage/innobase/row/row0upd.c'
--- Percona-Server/storage/innobase/row/row0upd.c	2012-10-29 08:53:24 +0000
+++ Percona-Server/storage/innobase/row/row0upd.c	2013-07-15 16:19:41 +0000
@@ -1854,7 +1854,7 @@
 		the previous invocation of this function. Mark the
 		off-page columns in the entry inherited. */
 
-		if (!(trx->fake_changes)) {
+		if (UNIV_LIKELY(!trx->fake_changes)) {
 		change_ownership = row_upd_clust_rec_by_insert_inherit(
 			NULL, NULL, entry, node->update);
 		ut_a(change_ownership);