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

[Laurynas Biveinis]

- No new Jenkins, as the only code changes are formatting and comments.

Merge bug 1059738 fix from 5.1. Not an automerge, but close.

26611

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

[Laurynas Biveinis (laurynas-biveinis)]

Will self-approve myself after 5.1 is approved.

[Alexey Kopytov (akopytov)]

Same comments as in 5.1 + what are the test case changes for?

review: Needs Fixing

[Laurynas Biveinis (laurynas-biveinis)]

> what are the test case changes for?

These are not the part of the commit being MP'ed. They look like prerequisite branch changes shown for some reason.

[Alexey Kopytov (akopytov)]

review: Approve

=== added file 'Percona-Server/mysql-test/r/percona_innodb_fake_changes_locks.result'
--- Percona-Server/mysql-test/r/percona_innodb_fake_changes_locks.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_innodb_fake_changes_locks.result	2012-10-29 08:57:32 +0000
@@ -0,0 +1,83 @@
+DROP TABLE IF EXISTS t1, t2;
+CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1);
+CREATE TABLE t2 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (1, 1);
+# Verifying that X_LOCK not acquired
+SET autocommit=0;
+SET innodb_fake_changes=1;
+BEGIN;
+SELECT * FROM t1 FOR UPDATE;
+a
+1
+SET innodb_lock_wait_timeout=3;
+UPDATE t1 SET a=2;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+SELECT * FROM t1 LOCK IN SHARE MODE;
+a
+1
+ROLLBACK;
+# Confirm no lock wait timeouts when innodb_locking_fake_changes=0
+SET GLOBAL innodb_locking_fake_changes=0;
+BEGIN;
+SELECT * FROM t1 FOR UPDATE;
+a
+1
+BEGIN;
+UPDATE t1 SET a=3 WHERE a=1;
+SELECT * FROM t1 LOCK IN SHARE MODE;
+a
+3
+ROLLBACK;
+ROLLBACK;
+# Confirm that fake UPDATE does not hold a lock
+BEGIN;
+SELECT * FROM t1 FOR UPDATE;
+a
+1
+BEGIN;
+UPDATE t1 SET a=3 WHERE a=1;
+ROLLBACK;
+ROLLBACK;
+BEGIN;
+UPDATE t1 SET a=3 WHERE a=1;
+BEGIN;
+UPDATE t1 SET a=3 WHERE a=1;
+ROLLBACK;
+ROLLBACK;
+# Confirm that fake INSERT does not hold a lock
+BEGIN;
+INSERT INTO t1 VALUES(4);
+BEGIN;
+INSERT INTO t1 VALUES(4);
+ROLLBACK;
+ROLLBACK;
+# Confirm that fake DELETE does not hold a lock
+BEGIN;
+DELETE FROM t1 WHERE a=1;
+BEGIN;
+DELETE FROM t1 WHERE a=1;
+ROLLBACK;
+ROLLBACK;
+# Confirm that fake REPLACE does not hold a lock
+BEGIN;
+REPLACE INTO t2 VALUES(1, 2);
+BEGIN;
+REPLACE INTO t2 VALUES(1, 2);
+ROLLBACK;
+ROLLBACK;
+SET innodb_fake_changes=default;
+SET GLOBAL innodb_locking_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
+# Verify that the fake changes to t2 did not leak through
+CHECK TABLE t2;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+should_be_1
+1
+DROP TABLE t1, t2;

=== removed file 'Percona-Server/mysql-test/t/percona_innodb_fake_changes.test'
--- Percona-Server/mysql-test/t/percona_innodb_fake_changes.test	2012-10-29 08:57:31 +0000
+++ Percona-Server/mysql-test/t/percona_innodb_fake_changes.test	1970-01-01 00:00:00 +0000
@@ -1,139 +0,0 @@
---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
-SET @@GLOBAL.userstat= TRUE;
-CREATE TABLE t1 (a INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1);
-
-let $t1_checksum_1= `CHECKSUM TABLE t1 EXTENDED`;
-let $innodb_rows_inserted_1= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_inserted'`;
-let $innodb_rows_deleted_1= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted'`;
-let $innodb_rows_updated_1= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated'`;
-let $table_rows_estimate_1= `SELECT ROWS FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'`;
-let $table_rows_changed_1= `SELECT ROWS_CHANGED FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'`;
-let $table_rows_changed_x_indexes_1= `SELECT ROWS_CHANGED_X_INDEXES FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'`;
-
-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`;
-let $innodb_rows_inserted_2= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_inserted'`;
-let $innodb_rows_deleted_2= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted'`;
-let $innodb_rows_updated_2= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated'`;
-let $table_rows_estimate_2= `SELECT ROWS FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'`;
-let $table_rows_changed_2= `SELECT ROWS_CHANGED FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'`;
-let $table_rows_changed_x_indexes_2= `SELECT ROWS_CHANGED_X_INDEXES FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'`;
---disable_query_log
-eval SELECT "$t1_checksum_1" LIKE "$t1_checksum_2" AS should_be_1;
-eval SELECT "$innodb_rows_inserted_2" - "$innodb_rows_inserted_1" AS should_be_0;
-eval SELECT "$innodb_rows_deleted_2" - "$innodb_rows_deleted_1" AS should_be_0;
-eval SELECT "$innodb_rows_updated_2" - "$innodb_rows_updated_1" AS should_be_0;
-eval SELECT "$table_rows_estimate_2" - "$table_rows_estimate_1" AS should_be_0;
-eval SELECT "$table_rows_changed_2" - "$table_rows_changed_1" AS should_be_0;
-eval SELECT "$table_rows_changed_x_indexes_2" - "$table_rows_changed_x_indexes_1" AS should_be_0;
---enable_query_log
-DROP TABLE t1;
-
---echo # DDL must result in error
-CREATE TABLE t1 (a INT PRIMARY KEY) 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 stat counters foreign key constraints
-SET innodb_fake_changes=0;
-INSERT INTO t1 VALUES (1), (2);
-COMMIT;
-CREATE TABLE t2 (a INT PRIMARY KEY, b INT, INDEX b_ind (b),
-       FOREIGN KEY (b) REFERENCES t1(a) ON DELETE CASCADE ON UPDATE CASCADE) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1, 1);
-INSERT INTO t2 VALUES (2, 2);
-COMMIT;
-
-let $t2_checksum_1= `CHECKSUM TABLE t2 EXTENDED`;
-let $innodb_rows_deleted_1= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted'`;
-let $innodb_rows_updated_1= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated'`;
-let $table_rows_estimate_1= `SELECT ROWS FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't2'`;
-let $table_rows_changed_1= `SELECT ROWS_CHANGED FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't2'`;
-let $table_rows_changed_x_indexes_1= `SELECT ROWS_CHANGED_X_INDEXES FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't2'`;
-
-SET innodb_fake_changes=1;
-DELETE FROM t1 WHERE a=1;
-UPDATE t1 SET a=3 WHERE a=2;
---error 1180
-COMMIT;
-
-let $t2_checksum_2= `CHECKSUM TABLE t2 EXTENDED`;
-let $innodb_rows_deleted_2= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted'`;
-let $innodb_rows_updated_2= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated'`;
-let $table_rows_estimate_2= `SELECT ROWS FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't2'`;
-let $table_rows_changed_2= `SELECT ROWS_CHANGED FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't2'`;
-let $table_rows_changed_x_indexes_2= `SELECT ROWS_CHANGED_X_INDEXES FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't2'`;
-
---disable_query_log
-eval SELECT "$t2_checksum_1" LIKE "$t2_checksum_2" AS should_be_1;
-eval SELECT "$innodb_rows_deleted_2" - "$innodb_rows_deleted_1" AS should_be_0;
-eval SELECT "$innodb_rows_updated_2" - "$innodb_rows_updated_1" AS should_be_0;
-eval SELECT "$table_rows_estimate_2" - "$table_rows_estimate_1" AS should_be_0;
-eval SELECT "$table_rows_changed_2" - "$table_rows_changed_1" AS should_be_0;
-eval SELECT "$table_rows_changed_x_indexes_2" - "$table_rows_changed_x_indexes_1" AS should_be_0;
---enable_query_log
-
-SET innodb_fake_changes=0;
-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;
-
-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;
-
-SET @@GLOBAL.userstat= default;

=== modified file 'Percona-Server/storage/innobase/btr/btr0cur.c'
--- Percona-Server/storage/innobase/btr/btr0cur.c	2012-10-29 08:57:31 +0000
+++ Percona-Server/storage/innobase/btr/btr0cur.c	2012-10-29 08:57:32 +0000
@@ -239,6 +239,7 @@
 	mtr_t*		mtr)		/*!< in: mtr */
 {
 	ulint		mode;
+	ulint		sibling_mode;
 	ulint		left_page_no;
 	ulint		right_page_no;
 	buf_block_t*	get_block;
@@ -261,14 +262,21 @@
 #endif /* UNIV_BTR_DEBUG */
 		get_block->check_index_page_at_flush = TRUE;
 		return;
+	case BTR_SEARCH_TREE:
 	case BTR_MODIFY_TREE:
-		/* x-latch also brothers from left to right */
+		if (UNIV_UNLIKELY(latch_mode == BTR_SEARCH_TREE)) {
+			mode = RW_S_LATCH;
+			sibling_mode = RW_NO_LATCH;
+		} else {
+			mode = sibling_mode = RW_X_LATCH;
+		}
+		/* Fetch and possibly latch also brothers from left to right */
 		left_page_no = btr_page_get_prev(page, mtr);
 
 		if (left_page_no != FIL_NULL) {
 			get_block = btr_block_get(
 				space, zip_size, left_page_no,
-				RW_X_LATCH, cursor->index, mtr);
+				sibling_mode, cursor->index, mtr);
 
 			if (srv_pass_corrupt_table && !get_block) {
 				return;
@@ -280,12 +288,21 @@
 			ut_a(btr_page_get_next(get_block->frame, mtr)
 			     == page_get_page_no(page));
 #endif /* UNIV_BTR_DEBUG */
-			get_block->check_index_page_at_flush = TRUE;
+			if (sibling_mode == RW_NO_LATCH) {
+				/* btr_block_get() called with RW_NO_LATCH will
+				fix the read block in the buffer.  This serves
+				no purpose for the fake changes prefetching,
+				thus we unfix the sibling blocks immediately.*/
+				mtr_memo_release(mtr, get_block,
+						 MTR_MEMO_BUF_FIX);
+			} else {
+				get_block->check_index_page_at_flush = TRUE;
+			}
 		}
 
 		get_block = btr_block_get(
 			space, zip_size, page_no,
-			RW_X_LATCH, cursor->index, mtr);
+			mode, cursor->index, mtr);
 
 		if (srv_pass_corrupt_table && !get_block) {
 			return;
@@ -301,7 +318,7 @@
 		if (right_page_no != FIL_NULL) {
 			get_block = btr_block_get(
 				space, zip_size, right_page_no,
-				RW_X_LATCH, cursor->index, mtr);
+				sibling_mode, cursor->index, mtr);
 
 			if (srv_pass_corrupt_table && !get_block) {
 				return;
@@ -313,7 +330,12 @@
 			ut_a(btr_page_get_prev(get_block->frame, mtr)
 			     == page_get_page_no(page));
 #endif /* UNIV_BTR_DEBUG */
-			get_block->check_index_page_at_flush = TRUE;
+			if (sibling_mode == RW_NO_LATCH) {
+				mtr_memo_release(mtr, get_block,
+						 MTR_MEMO_BUF_FIX);
+			} else {
+				get_block->check_index_page_at_flush = TRUE;
+			}
 		}
 
 		return;

=== modified file 'Percona-Server/storage/innobase/include/btr0btr.h'
--- Percona-Server/storage/innobase/include/btr0btr.h	2012-08-07 06:10:00 +0000
+++ Percona-Server/storage/innobase/include/btr0btr.h	2012-10-29 08:57:32 +0000
@@ -65,7 +65,10 @@
 	/** Search the previous record. */
 	BTR_SEARCH_PREV = 35,
 	/** Modify the previous record. */
-	BTR_MODIFY_PREV = 36
+	BTR_MODIFY_PREV = 36,
+	/** Weaker BTR_MODIFY_TREE that does not lock the leaf page siblings,
+	used for fake changes.  */
+	BTR_SEARCH_TREE = 37 /* BTR_MODIFY_TREE | 4 */
 };
 
 /* BTR_INSERT, BTR_DELETE and BTR_DELETE_MARK are mutually exclusive. */

=== modified file 'Percona-Server/storage/innobase/row/row0ins.c'
--- Percona-Server/storage/innobase/row/row0ins.c	2012-10-17 03:47:45 +0000
+++ Percona-Server/storage/innobase/row/row0ins.c	2012-10-29 08:57:32 +0000
@@ -2012,7 +2012,10 @@
 	the function will return in both low_match and up_match of the
 	cursor sensible values */
 
-	if (dict_index_is_clust(index)) {
+	if (UNIV_UNLIKELY(thr_get_trx(thr)->fake_changes)) {
+		search_mode = (mode & BTR_MODIFY_TREE)
+			? BTR_SEARCH_TREE : BTR_SEARCH_LEAF;
+	} else if (dict_index_is_clust(index)) {
 		search_mode = mode;
 	} else if (!(thr_get_trx(thr)->check_unique_secondary)) {
 		search_mode = mode | BTR_INSERT | BTR_IGNORE_SEC_UNIQUE;
@@ -2021,7 +2024,7 @@
 	}
 
 	btr_cur_search_to_nth_level(index, 0, entry, PAGE_CUR_LE,
-				    thr_get_trx(thr)->fake_changes ? BTR_SEARCH_LEAF : search_mode,
+				    search_mode,
 				    &cursor, 0, __FILE__, __LINE__, &mtr);
 
 	if (cursor.flag == BTR_CUR_INSERT_TO_IBUF) {

=== modified file 'Percona-Server/storage/innobase/row/row0upd.c'
--- Percona-Server/storage/innobase/row/row0upd.c	2012-05-10 07:49:14 +0000
+++ Percona-Server/storage/innobase/row/row0upd.c	2012-10-29 08:57:32 +0000
@@ -2018,7 +2018,8 @@
 	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_LEAF : BTR_MODIFY_TREE,
+	ut_a(btr_pcur_restore_position(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),