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

[Laurynas Biveinis]

No BT or ST but blocks BT 20439.

http://jenkins.percona.com/job/percona-server-5.1-param/561/

    Fix bug 1188168 (Fake changes assertion fail in
    row_ins_clust_index_entry_by_modify() |
    btr_store_big_rec_extern_fields ()).

    The issue is caused that fake changes, while normally skipping the
    write of externally-stored columns, failed to so for one path in
    row_ins_index_entry_low(). Adjust accordingly and add a regression
    testcase.

[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-07-17 03:43:40 +0000
@@ -0,0 +1,12 @@
+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;
+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;
+DROP TABLE t1;
 
=== 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-07-17 03:43:40 +0000
@@ -0,0 +1,23 @@
+--source include/have_innodb_plugin.inc
+
+--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;
+
+SET innodb_fake_changes=1;
+
+--error ER_ERROR_DURING_COMMIT
+INSERT INTO t1 VALUES (4, LPAD('a', 12000, 'b'));
+
+SET innodb_fake_changes=0;
+
+DROP TABLE t1;
 
=== modified file 'Percona-Server/storage/innodb_plugin/row/row0ins.c'
--- Percona-Server/storage/innodb_plugin/row/row0ins.c	2013-05-23 09:09:56 +0000
+++ Percona-Server/storage/innodb_plugin/row/row0ins.c	2013-07-17 03:43:40 +0000
@@ -2127,6 +2127,10 @@
 
 			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