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

[Laurynas Biveinis]

Add the already null-merged bug 898306 fix from 5.1, reusing 5.1 file
ids.

Tweak the percona_innodb_fake_changes_bug_898306 test case to check
for InnoDB correctly, also add CHECK TABLE to ensure that fake changes
have not violated data integrity.

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

26611

[Stewart Smith (stewart)]

review: Approve

=== added 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	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_innodb_fake_changes_bug_898306.result	2012-10-12 13:26:24 +0000
@@ -0,0 +1,43 @@
+DROP TABLE IF EXISTS t1;
+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;
+# Confirm that duplicate key errors on REPLACE works
+REPLACE INTO t1 VALUES (1,1);
+ERROR HY000: Got error 131 during COMMIT
+REPLACE INTO t1 VALUES (1,2);
+ERROR HY000: Got error 131 during COMMIT
+# Confirm that duplicate key errors are OK
+BEGIN;
+REPLACE INTO t1 VALUES (1,2);
+SELECT * from t1;
+a	b
+1	1
+REPLACE INTO t1 VALUES (1,1);
+SELECT * from t1;
+a	b
+1	1
+ROLLBACK;
+BEGIN;
+REPLACE INTO t1 VALUES (2,1);
+ERROR 23000: Duplicate entry '1' for key 'b'
+INSERT INTO t1 VALUES (1,1);
+ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
+INSERT INTO t1 VALUES (1,2);
+ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
+INSERT INTO t1 VALUES (2,1);
+ERROR 23000: Duplicate entry '1' for key 'b'
+ROLLBACK;
+INSERT INTO t1 VALUES (1,1) ON DUPLICATE KEY UPDATE b=b+10;
+ERROR HY000: Got error 131 during COMMIT
+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
+DROP TABLE t1;

=== added file 'Percona-Server/mysql-test/t/percona_innodb_fake_changes.test'
--- Percona-Server/mysql-test/t/percona_innodb_fake_changes.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_innodb_fake_changes.test	2012-10-12 13:26:24 +0000
@@ -0,0 +1,75 @@
+--source include/have_innodb.inc
+
+--disable_warnings
+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';
+SET innodb_fake_changes=1;
+SHOW VARIABLES LIKE 'innodb_fake_changes';
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='innodb_fake_changes';
+SET innodb_fake_changes=default;
+SHOW VARIABLES LIKE 'innodb_fake_changes';
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='innodb_fake_changes';
+
+--echo # Explicit COMMIT should fail when innodb_fake_changes is enabled
+--echo # DML should be fine
+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1);
+let $t1_checksum_1= `CHECKSUM TABLE t1 EXTENDED`;
+SET autocommit=0;
+SET innodb_fake_changes=1;
+BEGIN;
+INSERT INTO t1 VALUES (2);
+UPDATE t1 SET a=0;
+DELETE FROM t1 LIMIT 1;
+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`;
+--disable_query_log
+eval SELECT "$t1_checksum_1" LIKE "$t1_checksum_2" AS should_be_1;
+--enable_query_log
+DROP TABLE t1;
+
+--echo # DDL must result in error
+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
+SET autocommit=0;
+SET innodb_fake_changes=1;
+BEGIN;
+--error 1005
+CREATE TABLE t2 (a INT) ENGINE=InnoDB;
+--error 1051
+DROP TABLE t1;
+--error 1180
+TRUNCATE TABLE t1;
+--error 1180
+ALTER TABLE t1 ENGINE=MyISAM;
+ROLLBACK;
+
+# Test for bug 890404: uninitialized value warning in btr_cur_pessimistic_update
+SET innodb_fake_changes=0;
+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;
+
+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
+DROP TABLE t1, t3;

=== added 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	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_innodb_fake_changes_bug_898306.test	2012-10-12 13:26:24 +0000
@@ -0,0 +1,59 @@
+# Test case for Bug #898306: innodb_fake_changes doesn't handle duplicate keys on REPLACE
+# https://bugs.launchpad.net/percona-server/+bug/898306
+# Test ensures that REPLACE statement behaviour respects innodb_fake_changes feature
+--source include/have_innodb.inc
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+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;
+
+--echo # Confirm that duplicate key errors on REPLACE works
+
+--error ER_ERROR_DURING_COMMIT
+REPLACE INTO t1 VALUES (1,1);
+
+--error ER_ERROR_DURING_COMMIT
+REPLACE INTO t1 VALUES (1,2);
+
+--echo # Confirm that duplicate key errors are OK
+
+BEGIN;
+REPLACE INTO t1 VALUES (1,2);
+SELECT * from t1;
+REPLACE INTO t1 VALUES (1,1);
+SELECT * from t1;
+ROLLBACK;
+
+BEGIN;
+
+--error ER_DUP_ENTRY
+REPLACE INTO t1 VALUES (2,1);
+
+--error ER_DUP_ENTRY
+INSERT INTO t1 VALUES (1,1);
+
+--error ER_DUP_ENTRY
+INSERT INTO t1 VALUES (1,2);
+
+--error ER_DUP_ENTRY
+INSERT INTO t1 VALUES (2,1);
+
+ROLLBACK;
+
+--error ER_ERROR_DURING_COMMIT
+INSERT INTO t1 VALUES (1,1) ON DUPLICATE KEY UPDATE b=b+10;
+
+--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;
+
+DROP TABLE t1;

=== modified file 'Percona-Server/sql/handler.h'
--- Percona-Server/sql/handler.h	2012-05-18 04:37:44 +0000
+++ Percona-Server/sql/handler.h	2012-10-12 13:26:24 +0000
@@ -1923,6 +1923,12 @@
   void update_global_table_stats();
   void update_global_index_stats();
 
+  /**
+     Return true when innodb_fake_changes was set for the current transaction
+     on this handler.
+  */
+  virtual my_bool is_fake_change_enabled(THD *thd) { return FALSE; }
+
 #define CHF_CREATE_FLAG 0
 #define CHF_DELETE_FLAG 1
 #define CHF_RENAME_FLAG 2

=== modified file 'Percona-Server/sql/sql_insert.cc'
--- Percona-Server/sql/sql_insert.cc	2012-08-13 13:42:13 +0000
+++ Percona-Server/sql/sql_insert.cc	2012-10-12 13:26:24 +0000
@@ -1752,6 +1752,15 @@
             trg_error= 1;
             goto ok_or_after_trg_err;
           }
+
+          /*
+            Avoid the infinite loop
+            1) get dup key on fake insert
+            2) do nothing on fake delete
+            3) goto #1
+          */
+          if (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/handler/ha_innodb.cc'
--- Percona-Server/storage/innobase/handler/ha_innodb.cc	2012-10-12 13:26:24 +0000
+++ Percona-Server/storage/innobase/handler/ha_innodb.cc	2012-10-12 13:26:24 +0000
@@ -1050,6 +1050,13 @@
 	return(*(trx_t**) thd_ha_data(thd, innodb_hton_ptr));
 }
 
+my_bool
+ha_innobase::is_fake_change_enabled(THD* thd)
+{
+	trx_t*	trx	= thd_to_trx(thd);
+	return(trx && trx->fake_changes);
+}
+
 /********************************************************************//**
 Call this function when mysqld passes control to the client. That is to
 avoid deadlocks on the adaptive hash S-latch possibly held by thd. For more

=== modified file 'Percona-Server/storage/innobase/handler/ha_innodb.h'
--- Percona-Server/storage/innobase/handler/ha_innodb.h	2012-09-17 13:08:32 +0000
+++ Percona-Server/storage/innobase/handler/ha_innodb.h	2012-10-12 13:26:24 +0000
@@ -138,6 +138,7 @@
 	int close(void);
 	double scan_time();
 	double read_time(uint index, uint ranges, ha_rows rows);
+	my_bool is_fake_change_enabled(THD *thd);
 	bool is_corrupt() const;
 
 	int write_row(uchar * buf);