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

[Laurynas Biveinis]

No BT or ST but blocks BT 20439.

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

Merge bug 1188168 fix from 5.1

[Sergei Glushchenko (sergei.glushchenko)]

This branch is proposed to merge to 5.6 while it should be proposed to merge to 5.5

review: Needs Fixing (g2)

[Sergei Glushchenko (sergei.glushchenko)]

Approve

review: Approve (g2)

=== added file 'Percona-Server/mysql-test/r/percona_innodb_fake_changes_bug_1188168.result'
--- Percona-Server/mysql-test/r/percona_innodb_fake_changes_bug_1188168.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_innodb_fake_changes_bug_1188168.result	2013-10-17 09:13:59 +0000
@@ -0,0 +1,52 @@
+SET @@GLOBAL.userstat=ON;
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1(id INT NOT NULL PRIMARY KEY, data TEXT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES(1, '');
+INSERT INTO t1 VALUES(2, '');
+INSERT INTO t1 VALUES(3, '');
+INSERT INTO t1 VALUES(4, '');
+DELETE FROM t1 WHERE id = 4;
+SELECT @@global.userstat = 1 AS should_be_1;
+should_be_1
+1
+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';
+SET innodb_fake_changes=1;
+INSERT INTO t1 VALUES (4, LPAD('a', 12000, '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
+DROP TABLE t1;
+SET @@GLOBAL.userstat=default;

=== added file 'Percona-Server/mysql-test/t/percona_innodb_fake_changes_bug_1188168.test'
--- Percona-Server/mysql-test/t/percona_innodb_fake_changes_bug_1188168.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_innodb_fake_changes_bug_1188168.test	2013-10-17 09:13:59 +0000
@@ -0,0 +1,28 @@
+--source include/have_innodb.inc
+
+SET @@GLOBAL.userstat=ON;
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+CREATE TABLE t1(id INT NOT NULL PRIMARY KEY, data TEXT) ENGINE=InnoDB;
+
+INSERT INTO t1 VALUES(1, '');
+INSERT INTO t1 VALUES(2, '');
+INSERT INTO t1 VALUES(3, '');
+INSERT INTO t1 VALUES(4, '');
+
+DELETE FROM t1 WHERE id = 4;
+
+--let $fake_changes_table=t1
+--source include/start_fake_changes.inc
+
+--error ER_ERROR_DURING_COMMIT
+INSERT INTO t1 VALUES (4, LPAD('a', 12000, 'b'));
+
+--source include/stop_fake_changes.inc
+
+DROP TABLE t1;
+
+SET @@GLOBAL.userstat=default;

=== modified file 'Percona-Server/storage/innobase/row/row0ins.c'
--- Percona-Server/storage/innobase/row/row0ins.c	2013-10-17 07:44:31 +0000
+++ Percona-Server/storage/innobase/row/row0ins.c	2013-10-17 09:13:59 +0000
@@ -2122,6 +2122,11 @@
 
 			if (big_rec) {
 				ut_a(err == DB_SUCCESS);
+				if (UNIV_UNLIKELY(thr_get_trx(thr)->
+						  fake_changes)) {
+					goto stored_big_rec;
+				}
+
 				/* Write out the externally stored
 				columns while still x-latching
 				index->lock and block->lock. Allocate