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

[Laurynas Biveinis]

No BT or ST but BT 20439 prerequisite.

3rd MP:

http://jenkins.percona.com/job/percona-server-5.6-param/199/
Re-merged from 5.5.

2nd MP:
http://jenkins.percona.com/job/percona-server-5.6-param/197/

1st MP:

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

Merge bug 1190604 fix from 5.5.

Merge bug 1200162 changes from 5.5.

[Laurynas Biveinis (laurynas-biveinis)]

Same comment as for the 5.5 MP.

review: Needs Fixing

[Laurynas Biveinis (laurynas-biveinis)]

The 5.5 review comment re. redundant thr checks does not apply here, it's still reviewable.

[Sergei Glushchenko (sergei.glushchenko)]

Layrynas,

I think I see some places

btr0cur.cc line 2397, btr_cur_optimistic_update
lock0lock.cc line 6162, lock_clust_rec_modify_check_and_lock
lock0lock.cc line 6228, lock_sec_rec_modify_check_and_lock
que0que.cc line 6228, que_eval_sql

also, regardless this MP, there is

btr0cur.cc line 1394 -- double check of
 ut_ad((thr && thr_get_trx(thr)->fake_changes)
       || mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX));

[Sergei Glushchenko (sergei.glushchenko)]

Laurynas, sorry for misspelling

[Laurynas Biveinis (laurynas-biveinis)]

Sergei -

> btr0cur.cc line 2397, btr_cur_optimistic_update
> lock0lock.cc line 6162, lock_clust_rec_modify_check_and_lock
> lock0lock.cc line 6228, lock_sec_rec_modify_check_and_lock
> que0que.cc line 6228, que_eval_sql

I reviewed them yesterday. Please show how each of them guarantees thr != NULL, because I was not able to prove that.

> btr0cur.cc line 1394 -- double check of
> ut_ad((thr && thr_get_trx(thr)->fake_changes)
> || mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX));

Yup, bug 1204443.

[Sergei Glushchenko (sergei.glushchenko)]

thr_get_trx expects that thr is NULL

btr0cur.cc line 2397, btr_cur_optimistic_update

line 2260:
ut_ad(thr_get_trx(thr)->id == trx_id
      || (flags & ~(BTR_KEEP_POS_FLAG | BTR_KEEP_IBUF_BITMAP))
      == (BTR_NO_UNDO_LOG_FLAG | BTR_NO_LOCKING_FLAG
   | BTR_CREATE_FLAG | BTR_KEEP_SYS_FLAG));
is either bug or thr should never be NULL here

lock0lock.cc line 6162, lock_clust_rec_modify_check_and_lock

line 6177:
ut_ad(lock_table_has(thr_get_trx(thr), index->table, LOCK_IX));

lock0lock.cc line 6228, lock_sec_rec_modify_check_and_lock

line 6241:
ut_ad(lock_table_has(thr_get_trx(thr), index->table, LOCK_IX));

que0que.cc line 6228, que_eval_sql

line 1294:
graph->trx = trx;

[Sergei Glushchenko (sergei.glushchenko)]

Nevermind of que0que.cc line 6228, que_eval_sql :)

[Laurynas Biveinis (laurynas-biveinis)]

> thr_get_trx expects that thr is NULL

(_not_ NULL)

You are right, thanks, I have reviewed and updated accordingly.

> btr0cur.cc line 2397, btr_cur_optimistic_update
>
> line 2260:
> ut_ad(thr_get_trx(thr)->id == trx_id
> || (flags & ~(BTR_KEEP_POS_FLAG | BTR_KEEP_IBUF_BITMAP))
> == (BTR_NO_UNDO_LOG_FLAG | BTR_NO_LOCKING_FLAG
> | BTR_CREATE_FLAG | BTR_KEEP_SYS_FLAG));
> is either bug or thr should never be NULL here

Thanks, http://bugs.mysql.com/bug.php?id=69847.

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-26 10:51:39 +0000
@@ -0,0 +1,37 @@
+#
+# 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.
+
+# Requires large index dive sample pages values
+SELECT @@global.innodb_stats_transient_sample_pages = 30000 AS should_be_1;
+
+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 NUM_ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/$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';
+eval SELECT MODIFIED_COUNTER INTO @table_dml_counter_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/$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-26 10:51:39 +0000
@@ -0,0 +1,34 @@
+#
+# 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 NUM_ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/$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';
+eval SELECT MODIFIED_COUNTER INTO @table_dml_counter_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/$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;
+SELECT @table_dml_counter_2 - @table_dml_counter_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	2013-05-06 15:43:51 +0000
+++ Percona-Server/mysql-test/r/percona_innodb_fake_changes.result	2013-07-26 10:51:39 +0000
@@ -22,10 +22,28 @@
 OFF
 # Explicit COMMIT should fail when innodb_fake_changes is enabled
 # DML should be fine
-SET @@GLOBAL.userstat= TRUE;
+SET @@GLOBAL.userstat=TRUE;
+SET @@GLOBAL.innodb_stats_transient_sample_pages=30000;
 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
+SELECT @@global.innodb_stats_transient_sample_pages = 30000 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 NUM_ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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';
+SELECT MODIFIED_COUNTER INTO @table_dml_counter_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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,31 +54,449 @@
 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
-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 NUM_ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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';
+SELECT MODIFIED_COUNTER INTO @table_dml_counter_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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
+SELECT @table_dml_counter_2 - @table_dml_counter_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
+SELECT @@global.innodb_stats_transient_sample_pages = 30000 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 NUM_ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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';
+SELECT MODIFIED_COUNTER INTO @table_dml_counter_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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 NUM_ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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';
+SELECT MODIFIED_COUNTER INTO @table_dml_counter_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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
+SELECT @table_dml_counter_2 - @table_dml_counter_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
+SELECT @@global.innodb_stats_transient_sample_pages = 30000 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 NUM_ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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';
+SELECT MODIFIED_COUNTER INTO @table_dml_counter_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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 NUM_ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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';
+SELECT MODIFIED_COUNTER INTO @table_dml_counter_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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
+SELECT @table_dml_counter_2 - @table_dml_counter_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
+SELECT @@global.innodb_stats_transient_sample_pages = 30000 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 NUM_ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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';
+SELECT MODIFIED_COUNTER INTO @table_dml_counter_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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 NUM_ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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';
+SELECT MODIFIED_COUNTER INTO @table_dml_counter_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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
+SELECT @table_dml_counter_2 - @table_dml_counter_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
+SELECT @@global.innodb_stats_transient_sample_pages = 30000 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 NUM_ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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';
+SELECT MODIFIED_COUNTER INTO @table_dml_counter_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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;
@@ -68,52 +504,179 @@
 DROP TABLE t1;
 ERROR 42S02: Unknown table 'test.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 NUM_ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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';
+SELECT MODIFIED_COUNTER INTO @table_dml_counter_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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
+SELECT @table_dml_counter_2 - @table_dml_counter_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
+SELECT @@global.innodb_stats_transient_sample_pages = 30000 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 NUM_ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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';
+SELECT MODIFIED_COUNTER INTO @table_dml_counter_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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 NUM_ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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';
+SELECT MODIFIED_COUNTER INTO @table_dml_counter_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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
-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
+SELECT @table_dml_counter_2 - @table_dml_counter_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
+SELECT @@global.innodb_stats_transient_sample_pages = 30000 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 NUM_ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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';
+SELECT MODIFIED_COUNTER INTO @table_dml_counter_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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 NUM_ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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';
+SELECT MODIFIED_COUNTER INTO @table_dml_counter_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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
+SELECT @table_dml_counter_2 - @table_dml_counter_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;
+SET @@GLOBAL.innodb_stats_transient_sample_pages=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-26 10:51:39 +0000
@@ -1,7 +1,29 @@
 DROP TABLE IF EXISTS t1;
+SET @@GLOBAL.userstat=ON;
+SET @@GLOBAL.innodb_stats_transient_sample_pages=30000;
 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
+SELECT @@global.innodb_stats_transient_sample_pages = 30000 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 NUM_ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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';
+SELECT MODIFIED_COUNTER INTO @table_dml_counter_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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 +56,43 @@
 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 NUM_ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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';
+SELECT MODIFIED_COUNTER INTO @table_dml_counter_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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
+SELECT @table_dml_counter_2 - @table_dml_counter_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;
+SET @@GLOBAL.innodb_stats_transient_sample_pages=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-26 10:51:39 +0000
@@ -1,7 +1,28 @@
 DROP TABLE IF EXISTS t1;
+SET @@GLOBAL.userstat=ON;
+SET @@GLOBAL.innodb_stats_transient_sample_pages=30000;
 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
+SELECT @@global.innodb_stats_transient_sample_pages = 30000 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 NUM_ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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';
+SELECT MODIFIED_COUNTER INTO @table_dml_counter_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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 +32,62 @@
 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 NUM_ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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';
+SELECT MODIFIED_COUNTER INTO @table_dml_counter_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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
+SELECT @table_dml_counter_2 - @table_dml_counter_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
+SELECT @@global.innodb_stats_transient_sample_pages = 30000 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 NUM_ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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';
+SELECT MODIFIED_COUNTER INTO @table_dml_counter_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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 +193,61 @@
 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 NUM_ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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';
+SELECT MODIFIED_COUNTER INTO @table_dml_counter_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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
+SELECT @table_dml_counter_2 - @table_dml_counter_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
+SELECT @@global.innodb_stats_transient_sample_pages = 30000 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 NUM_ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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';
+SELECT MODIFIED_COUNTER INTO @table_dml_counter_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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 +255,39 @@
 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 NUM_ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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';
+SELECT MODIFIED_COUNTER INTO @table_dml_counter_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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
+SELECT @table_dml_counter_2 - @table_dml_counter_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 +301,5 @@
 should_be_1
 1
 DROP TABLE t1;
+SET @@GLOBAL.userstat=default;
+SET @@GLOBAL.innodb_stats_transient_sample_pages=default;

=== modified file 'Percona-Server/mysql-test/t/percona_innodb_fake_changes.test'
--- Percona-Server/mysql-test/t/percona_innodb_fake_changes.test	2013-05-06 15:43:51 +0000
+++ Percona-Server/mysql-test/t/percona_innodb_fake_changes.test	2013-07-26 10:51:39 +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,21 +16,15 @@
 
 --echo # Explicit COMMIT should fail when innodb_fake_changes is enabled
 --echo # DML should be fine
-SET @@GLOBAL.userstat= TRUE;
+SET @@GLOBAL.userstat=TRUE;
+SET @@GLOBAL.innodb_stats_transient_sample_pages=30000;
+
 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 NUM_ROWS FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'`;
-let $table_dml_counter_1= `SELECT MODIFIED_COUNTER FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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;
@@ -39,107 +32,341 @@
 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 NUM_ROWS FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'`;
-let $table_dml_counter_2= `SELECT MODIFIED_COUNTER FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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_dml_counter_2" - "$table_dml_counter_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 ER_ILLEGAL_HA
 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 NUM_ROWS FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t2'`;
-let $table_dml_counter_1= `SELECT MODIFIED_COUNTER FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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'`;
+--let $fake_changes_table=t1
+--source include/start_fake_changes.inc
 
-SET innodb_fake_changes=1;
+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 NUM_ROWS FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t2'`;
-let $table_dml_counter_2= `SELECT MODIFIED_COUNTER FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/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_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;
+SET @@GLOBAL.innodb_stats_transient_sample_pages=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-26 10:51:39 +0000
@@ -7,11 +7,16 @@
 DROP TABLE IF EXISTS t1;
 --enable_warnings
 
+SET @@GLOBAL.userstat=ON;
+SET @@GLOBAL.innodb_stats_transient_sample_pages=30000;
+
 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 +57,9 @@
 --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;
+SET @@GLOBAL.innodb_stats_transient_sample_pages=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-26 10:51:39 +0000
@@ -7,6 +7,9 @@
 DROP TABLE IF EXISTS t1;
 --enable_warnings
 
+SET @@GLOBAL.userstat=ON;
+SET @@GLOBAL.innodb_stats_transient_sample_pages=30000;
+
 #
 # Confirm that cursor->tree_height is initialized when calling btr_cur_pessimistic_update
 # for transactions with innodb_fake_changes set
@@ -16,30 +19,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 +51,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 +63,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 +90,6 @@
 eval SELECT "$t1_checksum_1" LIKE "$t1_checksum_2" AS should_be_1;
 --enable_query_log
 DROP TABLE t1;
+
+SET @@GLOBAL.userstat=default;
+SET @@GLOBAL.innodb_stats_transient_sample_pages=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-26 10:51:39 +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/handler.cc'
--- Percona-Server/sql/handler.cc	2013-07-26 10:51:37 +0000
+++ Percona-Server/sql/handler.cc	2013-07-26 10:51:39 +0000
@@ -2096,7 +2096,7 @@
         and committing the transaction in other engines.
       */
       if (!ha_info->is_trx_read_write()
-          && !(ht->is_fake_change && ht->is_fake_change(ht, thd)))
+          && likely(!(ht->is_fake_change && ht->is_fake_change(ht, thd))))
         continue;
       if ((err= ht->prepare(ht, thd, all)))
       {

=== modified file 'Percona-Server/sql/sql_insert.cc'
--- Percona-Server/sql/sql_insert.cc	2013-06-25 13:13:06 +0000
+++ Percona-Server/sql/sql_insert.cc	2013-07-26 10:51:39 +0000
@@ -1860,7 +1860,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.cc'
--- Percona-Server/storage/innobase/btr/btr0cur.cc	2013-06-25 13:13:06 +0000
+++ Percona-Server/storage/innobase/btr/btr0cur.cc	2013-07-26 10:51:39 +0000
@@ -1251,7 +1251,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);
 	}
@@ -1513,7 +1513,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 */
@@ -1718,7 +1718,7 @@
 		}
 	}
 
-	if (thr && thr_get_trx(thr)->fake_changes) {
+	if (UNIV_UNLIKELY(thr && thr_get_trx(thr)->fake_changes)) {
 		/* skip CHANGE, LOG */
 		if (n_reserved > 0) {
 			fil_space_release_free_extents(index->space,
@@ -1784,7 +1784,7 @@
 
 	ut_ad(thr || (flags & BTR_NO_LOCKING_FLAG));
 
-	if (thr && thr_get_trx(thr)->fake_changes) {
+	if (UNIV_UNLIKELY(thr && thr_get_trx(thr)->fake_changes)) {
 		/* skip LOCK, UNDO */
 		return(DB_SUCCESS);
 	}
@@ -2252,7 +2252,8 @@
 	rec = btr_cur_get_rec(cursor);
 	index = cursor->index;
 	ut_ad(!!page_rec_is_comp(rec) == dict_table_is_comp(index->table));
-	ut_ad((thr && thr_get_trx(thr)->fake_changes) || mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX));
+	ut_ad(thr_get_trx(thr)->fake_changes
+	      || mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX));
 	/* The insert buffer tree should never be updated in place. */
 	ut_ad(!dict_index_is_ibuf(index));
 	ut_ad(dict_index_is_online_ddl(index) == !!(flags & BTR_CREATE_FLAG)
@@ -2397,7 +2398,7 @@
 		goto func_exit;
 	}
 
-	if (thr && thr_get_trx(thr)->fake_changes) {
+	if (UNIV_UNLIKELY(thr_get_trx(thr)->fake_changes)) {
 		/* skip CHANGE, LOG */
 		ut_ad(err == DB_SUCCESS);
 		return(DB_SUCCESS);
@@ -2554,9 +2555,11 @@
 	page_zip = buf_block_get_page_zip(block);
 	index = cursor->index;
 
-	ut_ad((thr && thr_get_trx(thr)->fake_changes) || mtr_memo_contains(mtr, dict_index_get_lock(index),
-				MTR_MEMO_X_LOCK));
-	ut_ad((thr && thr_get_trx(thr)->fake_changes) || mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX));
+	ut_ad(thr_get_trx(thr)->fake_changes
+	      || mtr_memo_contains(mtr, dict_index_get_lock(index),
+				   MTR_MEMO_X_LOCK));
+	ut_ad(thr_get_trx(thr)->fake_changes
+	      || mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX));
 #ifdef UNIV_ZIP_DEBUG
 	ut_a(!page_zip || page_zip_validate(page_zip, page, index));
 #endif /* UNIV_ZIP_DEBUG */
@@ -2613,7 +2616,7 @@
 		if (UNIV_UNLIKELY(cursor->tree_height == ULINT_UNDEFINED)) {
 			/* When the tree height is uninitialized due to fake
 			changes, reserve some hardcoded number of extents.  */
-			ut_a(thr && thr_get_trx(thr)->fake_changes);
+			ut_a(thr_get_trx(thr)->fake_changes);
 			n_extents = 3;
 		}
 		else {
@@ -2652,7 +2655,7 @@
 
 	trx = thr_get_trx(thr);
 
-	if (!(flags & BTR_KEEP_SYS_FLAG) && !trx->fake_changes) {
+	if (!(flags & BTR_KEEP_SYS_FLAG) && UNIV_LIKELY(!trx->fake_changes)) {
 		row_upd_index_entry_sys_field(new_entry, index, DATA_ROLL_PTR,
 					      roll_ptr);
 		row_upd_index_entry_sys_field(new_entry, index, DATA_TRX_ID,
@@ -2724,7 +2727,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;
@@ -3056,9 +3059,9 @@
 	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) {
-	    /* skip LOCK, UNDO, CHANGE, LOG */
-	    return(DB_SUCCESS);
+	if (UNIV_UNLIKELY(thr_get_trx(thr)->fake_changes)) {
+		/* skip LOCK, UNDO, CHANGE, LOG */
+		return(DB_SUCCESS);
 	}
 
 	err = lock_clust_rec_modify_check_and_lock(BTR_NO_LOCKING_FLAG, block,
@@ -3199,7 +3202,7 @@
 	rec_t*		rec;
 	dberr_t		err;
 
-	if (thr && thr_get_trx(thr)->fake_changes) {
+	if (UNIV_UNLIKELY(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-26 10:51:37 +0000
+++ Percona-Server/storage/innobase/handler/ha_innodb.cc	2013-07-26 10:51:39 +0000
@@ -1472,7 +1472,7 @@
 ha_innobase::is_fake_change_enabled(THD* thd)
 {
 	trx_t*	trx	= thd_to_trx(thd);
-	return(trx && trx->fake_changes);
+	return(trx && UNIV_UNLIKELY(trx->fake_changes));
 }
 
 /********************************************************************//**
@@ -3688,7 +3688,7 @@
 				whom the transaction is being committed */
 {
 	trx_t*	trx = check_trx_exists(thd);
-	return trx->fake_changes;
+	return UNIV_UNLIKELY(trx->fake_changes);
 }
 
 /*****************************************************************//**
@@ -3784,9 +3784,11 @@
 		trx_search_latch_release_if_reserved(trx);
 	}
 
-	if (trx->fake_changes &&
+	if (UNIV_UNLIKELY(trx->fake_changes &&
 	    (commit_trx ||
-	     (!thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)))) {
+	     (!thd_test_options(thd,
+				OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))))) {
+
 		/* rollback implicitly */
 		innobase_rollback(hton, thd, commit_trx);
 		/* because debug assertion code complains, if something left */
@@ -9937,7 +9939,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);
@@ -10309,7 +10311,7 @@
 		DBUG_RETURN(HA_ERR_CRASHED);
 	}
 
-	if (prebuilt->trx->fake_changes) {
+	if (UNIV_UNLIKELY(prebuilt->trx->fake_changes)) {
 		DBUG_RETURN(HA_ERR_WRONG_COMMAND);
 	}
 
@@ -10397,7 +10399,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);
@@ -10527,7 +10529,7 @@
 #endif
 	trx = innobase_trx_allocate(thd);
 
-	if (trx->fake_changes) {
+	if (UNIV_UNLIKELY(trx->fake_changes)) {
 		my_free(namebuf);
 		innobase_commit_low(trx);
 		trx_free_for_mysql(trx);
@@ -10707,7 +10709,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/lock/lock0lock.cc'
--- Percona-Server/storage/innobase/lock/lock0lock.cc	2013-06-25 13:13:06 +0000
+++ Percona-Server/storage/innobase/lock/lock0lock.cc	2013-07-26 10:51:39 +0000
@@ -4415,7 +4415,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;
 	}
 
@@ -5943,7 +5943,7 @@
 
 	trx = thr_get_trx(thr);
 
-	if (trx->fake_changes) {
+	if (UNIV_UNLIKELY(trx->fake_changes)) {
 		return(DB_SUCCESS);
 	}
 
@@ -6159,7 +6159,7 @@
 		return(DB_SUCCESS);
 	}
 
-	if (thr && thr_get_trx(thr)->fake_changes) {
+	if (UNIV_UNLIKELY(thr_get_trx(thr)->fake_changes)) {
 		return(DB_SUCCESS);
 	}
 
@@ -6225,7 +6225,7 @@
 		return(DB_SUCCESS);
 	}
 
-	if (thr && thr_get_trx(thr)->fake_changes) {
+	if (UNIV_UNLIKELY(thr_get_trx(thr)->fake_changes)) {
 		return(DB_SUCCESS);
 	}
 

=== modified file 'Percona-Server/storage/innobase/que/que0que.cc'
--- Percona-Server/storage/innobase/que/que0que.cc	2013-05-10 09:39:17 +0000
+++ Percona-Server/storage/innobase/que/que0que.cc	2013-07-26 10:51:39 +0000
@@ -1273,7 +1273,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.cc'
--- Percona-Server/storage/innobase/row/row0ins.cc	2013-06-25 13:13:06 +0000
+++ Percona-Server/storage/innobase/row/row0ins.cc	2013-07-26 10:51:39 +0000
@@ -2757,8 +2757,9 @@
 
 		btr_cur_search_to_nth_level(
 			index, 0, entry, PAGE_CUR_LE,
-			thr_get_trx(thr)->fake_changes ? BTR_SEARCH_LEAF :
-			(btr_latch_mode)
+			UNIV_UNLIKELY(thr_get_trx(thr)->fake_changes)
+			? BTR_SEARCH_LEAF
+			: (btr_latch_mode)
 			(search_mode & ~(BTR_INSERT | BTR_IGNORE_SEC_UNIQUE)),
 			&cursor, 0, __FILE__, __LINE__, &mtr);
 	}

=== modified file 'Percona-Server/storage/innobase/row/row0upd.cc'
--- Percona-Server/storage/innobase/row/row0upd.cc	2013-06-20 15:16:00 +0000
+++ Percona-Server/storage/innobase/row/row0upd.cc	2013-07-26 10:51:39 +0000
@@ -1751,7 +1751,7 @@
 	btr_pcur_get_btr_cur(&pcur)->thr = thr;
 
 	search_result = row_search_index_entry(index, entry,
-					       trx->fake_changes
+					       UNIV_UNLIKELY(trx->fake_changes)
 					       ? BTR_SEARCH_LEAF
 					       : (btr_latch_mode)mode,
 					       &pcur, &mtr);
@@ -2015,7 +2015,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);
@@ -2049,7 +2049,8 @@
 		delete-marked old record, mark them disowned by the
 		old record and owned by the new entry. */
 
-		if (rec_offs_any_extern(offsets) && !(trx->fake_changes)) {
+		if (rec_offs_any_extern(offsets)
+		    && UNIV_LIKELY(!(trx->fake_changes))) {
 			change_ownership = row_upd_clust_rec_by_insert_inherit(
 				rec, offsets, entry, node->update);
 
@@ -2204,9 +2205,10 @@
 	the same transaction do not modify the record in the meantime.
 	Therefore we can assert that the restoration of the cursor succeeds. */
 
-	ut_a(btr_pcur_restore_position(thr_get_trx(thr)->fake_changes
-				       ? BTR_SEARCH_TREE : BTR_MODIFY_TREE,
-				       pcur, mtr));
+	ut_a(btr_pcur_restore_position(
+		 UNIV_UNLIKELY(thr_get_trx(thr)->fake_changes)
+		 ? BTR_SEARCH_TREE : BTR_MODIFY_TREE,
+		 pcur, mtr));
 
 	ut_ad(!rec_get_deleted_flag(btr_pcur_get_rec(pcur),
 				    dict_table_is_comp(index->table)));
@@ -2220,7 +2222,7 @@
 		&offsets, offsets_heap, heap, &big_rec,
 		node->update, node->cmpl_info,
 		thr, thr_get_trx(thr)->id, mtr);
-	if (big_rec && !(thr_get_trx(thr)->fake_changes)) {
+	if (big_rec && UNIV_LIKELY(!(thr_get_trx(thr)->fake_changes))) {
 		ut_a(err == DB_SUCCESS);
 		/* Write out the externally stored
 		columns while still x-latching