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

[Laurynas Biveinis]

Automerge bug 917942 fix from 5.1. Adjust the InnoDB flavor check in
the testcase.`

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

26611

[Laurynas Biveinis (laurynas-biveinis)]

Will self-approve once 5.1 is accepted.

[Laurynas Biveinis (laurynas-biveinis)]

I have no idea why the preview diff shows the removal of Percona-Server/mysql-test/r/percona_innodb_fake_changes_locks.result. It's a part of prerequisite branch changes, please ignore this, I will repush the branch once the prerequisite is merged.

[Stewart Smith (stewart)]

review: Approve

=== added file 'Percona-Server/mysql-test/r/percona_innodb_fake_changes.result'
--- Percona-Server/mysql-test/r/percona_innodb_fake_changes.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_innodb_fake_changes.result	2012-10-17 11:35:24 +0000
@@ -0,0 +1,75 @@
+DROP TABLE IF EXISTS t1, t2, t3;
+# Checking variables
+SHOW VARIABLES LIKE 'innodb_fake_changes';
+Variable_name	Value
+innodb_fake_changes	OFF
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='innodb_fake_changes';
+VARIABLE_VALUE
+OFF
+SET innodb_fake_changes=1;
+SHOW VARIABLES LIKE 'innodb_fake_changes';
+Variable_name	Value
+innodb_fake_changes	ON
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='innodb_fake_changes';
+VARIABLE_VALUE
+ON
+SET innodb_fake_changes=default;
+SHOW VARIABLES LIKE 'innodb_fake_changes';
+Variable_name	Value
+innodb_fake_changes	OFF
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='innodb_fake_changes';
+VARIABLE_VALUE
+OFF
+# Explicit COMMIT should fail when innodb_fake_changes is enabled
+# DML should be fine
+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1);
+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;
+a
+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
+DROP TABLE t1;
+# DDL must result in error
+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
+SET autocommit=0;
+SET innodb_fake_changes=1;
+BEGIN;
+CREATE TABLE t2 (a INT) ENGINE=InnoDB;
+ERROR HY000: Can't create table 'test.t2' (errno: 131)
+DROP TABLE t1;
+ERROR 42S02: Unknown table 't1'
+TRUNCATE TABLE t1;
+ERROR HY000: Got error 131 during COMMIT
+ALTER TABLE t1 ENGINE=MyISAM;
+ERROR HY000: Got error 131 during COMMIT
+ROLLBACK;
+SET innodb_fake_changes=0;
+CREATE TABLE t3 (a INT primary key, b text) ENGINE=InnoDB;
+INSERT INTO t3 VALUES (1,'');
+COMMIT;
+SET innodb_fake_changes=1;
+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
+CHECK TABLE t3;
+Table	Op	Msg_type	Msg_text
+test.t3	check	status	OK
+should_be_1
+1
+DROP TABLE t1, t3;

=== added 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	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_innodb_fake_changes_bug_917942.result	2012-10-17 11:35:24 +0000
@@ -0,0 +1,151 @@
+DROP TABLE IF EXISTS t1;
+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"));
+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
+UPDATE t1 SET T = LPAD("A", 4600, "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
+should_be_1
+1
+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"));
+SET innodb_fake_changes=1;
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during COMMIT
+ERROR HY000: Got error 131 during 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
+should_be_1
+1
+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"));
+SET innodb_fake_changes=1;
+INSERT INTO t1 VALUES (3, "foo", LPAD("a", 4600, "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
+should_be_1
+1
+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"));
+SET innodb_fake_changes=1;
+INSERT INTO t1 VALUES (3, "foo", LPAD("a", 4600, "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
+should_be_1
+1
+DROP TABLE t1;

=== removed file 'Percona-Server/mysql-test/r/percona_innodb_fake_changes_locks.result'
--- Percona-Server/mysql-test/r/percona_innodb_fake_changes_locks.result	2012-10-17 11:35:24 +0000
+++ Percona-Server/mysql-test/r/percona_innodb_fake_changes_locks.result	1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-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;

=== added file 'Percona-Server/mysql-test/t/percona_innodb_fake_changes_bug_917942-master.opt'
--- Percona-Server/mysql-test/t/percona_innodb_fake_changes_bug_917942-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_innodb_fake_changes_bug_917942-master.opt	2012-10-17 11:35:24 +0000
@@ -0,0 +1,1 @@
+--innodb_file_per_table --innodb_file_format=barracuda

=== added 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	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_innodb_fake_changes_bug_917942.test	2012-10-17 11:35:24 +0000
@@ -0,0 +1,103 @@
+# Test for bug 917942, based on FB percona_innodb_fake_changes_bugs2 and ... _bugs3 test cases.
+# Meant to be run under Valgrind.
+
+--source include/have_innodb.inc 
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+#
+# Confirm that cursor->tree_height is initialized when calling btr_cur_pessimistic_update
+# for transactions with innodb_fake_changes set
+#
+
+--echo 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"));
+let $t1_checksum_1= `CHECKSUM TABLE t1 EXTENDED`;
+
+SET innodb_fake_changes=1;
+
+--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
+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;
+
+--disable_query_log
+let $x = 50;
+while ($x)
+{
+  --error 1180
+  eval INSERT INTO t1 VALUES ($x, "foo", lpad("a", (($x * 100) + 4500) MOD 9000, "b")) ON DUPLICATE KEY UPDATE t = VALUES(t);
+  --error 1180
+  eval UPDATE t1 SET t = LPAD("a", (($x * 100) + 4500) MOD 9000, "b");
+  dec $x;
+}
+--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
+DROP TABLE t1;
+
+#
+# Confirm that cursor->tree_height is initialized when calling btr_cur_pessimistic_insert
+# for transactions with innodb_fake_changes set
+#
+
+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;
+
+--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
+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"));
+let $t1_checksum_1= `CHECKSUM TABLE t1 EXTENDED`;
+
+SET innodb_fake_changes=1;
+
+--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
+DROP TABLE t1;

=== modified file 'Percona-Server/storage/innobase/btr/btr0cur.c'
--- Percona-Server/storage/innobase/btr/btr0cur.c	2012-10-17 11:35:24 +0000
+++ Percona-Server/storage/innobase/btr/btr0cur.c	2012-10-17 11:35:24 +0000
@@ -1572,6 +1572,9 @@
 	}
 
 	if (!(flags & BTR_NO_UNDO_LOG_FLAG)) {
+
+		ut_a(cursor->tree_height != ULINT_UNDEFINED);
+
 		/* First reserve enough free space for the file segments
 		of the index tree, so that the insert will not fail because
 		of lack of space */
@@ -1866,7 +1869,8 @@
 	ulint		length,	/*!< in: size needed */
 	ibool		create,	/*!< in: TRUE=delete-and-insert,
 				FALSE=update-in-place */
-	mtr_t*		mtr)	/*!< in: mini-transaction */
+	mtr_t*		mtr,	/*!< in: mini-transaction */
+	trx_t*		trx)	/*!< in: NULL or transaction */
 {
 	ut_a(page_zip == buf_block_get_page_zip(block));
 	ut_ad(page_zip);
@@ -1883,6 +1887,14 @@
 		return(FALSE);
 	}
 
+	if (trx && trx->fake_changes) {
+	    /* Don't call page_zip_compress_write_log_no_data as that has
+	    assert which would fail. Assume there won't be a compression
+	    failure. */
+
+	    return TRUE;
+	}
+
 	if (!page_zip_compress(page_zip, buf_block_get_frame(block),
 			       index, mtr)) {
 		/* Unable to compress the page */
@@ -1966,7 +1978,8 @@
 	/* Check that enough space is available on the compressed page. */
 	if (page_zip
 	    && !btr_cur_update_alloc_zip(page_zip, block, index,
-					 rec_offs_size(offsets), FALSE, mtr)) {
+					 rec_offs_size(offsets), FALSE, mtr,
+					 trx)) {
 		return(DB_ZIP_OVERFLOW);
 	}
 
@@ -2165,7 +2178,8 @@
 
 	if (page_zip
 	    && !btr_cur_update_alloc_zip(page_zip, block, index,
-					 new_rec_size, TRUE, mtr)) {
+					 new_rec_size, TRUE, mtr,
+					 thr_get_trx(thr))) {
 		err = DB_ZIP_OVERFLOW;
 		goto err_exit;
 	}
@@ -2404,7 +2418,15 @@
 		of the index tree, so that the update will not fail because
 		of lack of space */
 
-		n_extents = cursor->tree_height / 16 + 3;
+		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);
+			n_extents = 3;
+		}
+		else {
+			n_extents = cursor->tree_height / 16 + 3;
+		}
 
 		if (flags & BTR_NO_UNDO_LOG_FLAG) {
 			reserve_flag = FSP_CLEANING;
@@ -3205,6 +3227,8 @@
 		of the index tree, so that the node pointer updates will
 		not fail because of lack of space */
 
+		ut_a(cursor->tree_height != ULINT_UNDEFINED);
+
 		n_extents = cursor->tree_height / 32 + 1;
 
 		success = fsp_reserve_free_extents(&n_reserved,

=== modified file 'Percona-Server/storage/innobase/btr/btr0pcur.c'
--- Percona-Server/storage/innobase/btr/btr0pcur.c	2012-06-01 12:15:25 +0000
+++ Percona-Server/storage/innobase/btr/btr0pcur.c	2012-10-17 11:35:24 +0000
@@ -47,6 +47,7 @@
 
 	pcur->btr_cur.index = NULL;
 	btr_pcur_init(pcur);
+	pcur->btr_cur.tree_height = ULINT_UNDEFINED;
 
 	return(pcur);
 }

=== modified file 'Percona-Server/storage/innobase/ibuf/ibuf0ibuf.c'
--- Percona-Server/storage/innobase/ibuf/ibuf0ibuf.c	2012-06-01 12:15:25 +0000
+++ Percona-Server/storage/innobase/ibuf/ibuf0ibuf.c	2012-10-17 11:35:24 +0000
@@ -4037,7 +4037,7 @@
 							    update)
 		    && (!page_zip || btr_cur_update_alloc_zip(
 				page_zip, block, index,
-				rec_offs_size(offsets), FALSE, mtr))) {
+				rec_offs_size(offsets), FALSE, mtr, NULL))) {
 			/* This is the easy case. Do something similar
 			to btr_cur_update_in_place(). */
 			row_upd_rec_in_place(rec, index, offsets,

=== modified file 'Percona-Server/storage/innobase/include/btr0cur.h'
--- Percona-Server/storage/innobase/include/btr0cur.h	2012-05-10 07:49:14 +0000
+++ Percona-Server/storage/innobase/include/btr0cur.h	2012-10-17 11:35:24 +0000
@@ -259,8 +259,9 @@
 	ulint		length,	/*!< in: size needed */
 	ibool		create,	/*!< in: TRUE=delete-and-insert,
 				FALSE=update-in-place */
-	mtr_t*		mtr)	/*!< in: mini-transaction */
-	__attribute__((nonnull, warn_unused_result));
+	mtr_t*		mtr,	/*!< in: mini-transaction */
+	trx_t*		trx)	/*!< in: NULL or transaction */
+    __attribute__((nonnull (1, 2, 3, 6), warn_unused_result));
 /*************************************************************//**
 Updates a record when the update causes no size changes in its fields.
 @return	DB_SUCCESS or error number */