bzr push into mysql-5.1-innodb branch (marko.makela:3458 to 3459)

[marko.makela]

 3459 Marko Mäkelä	2010-05-11
      Fix sys_vars.tx_isolation_func.test, which was broken in revno 3432
      when making READ UNCOMMITTED lock as little as READ COMMITTED.

    modified:
      mysql-test/suite/sys_vars/r/tx_isolation_func.result
      mysql-test/suite/sys_vars/t/tx_isolation_func.test
 3458 Vasil Dimov	2010-05-11 [merge]
      Merge mysql-5.1-innodb from bk-internal locally

    added:
      mysql-test/suite/innodb_plugin/r/innodb_bug53290.result
      mysql-test/suite/innodb_plugin/t/innodb_bug53290.test
    modified:
      storage/innodb_plugin/btr/btr0btr.c
      storage/innodb_plugin/buf/buf0lru.c
      storage/innodb_plugin/include/buf0buf.ic
      storage/innodb_plugin/include/rem0cmp.h
      storage/innodb_plugin/page/page0zip.c
      storage/innodb_plugin/rem/rem0cmp.c
      storage/innodb_plugin/row/row0merge.c
=== modified file 'mysql-test/suite/sys_vars/r/tx_isolation_func.result'
--- a/mysql-test/suite/sys_vars/r/tx_isolation_func.result	2008-12-19 15:12:15 +0000
+++ b/mysql-test/suite/sys_vars/r/tx_isolation_func.result	2010-05-11 16:58:45 +0000
@@ -95,10 +95,7 @@ a	b
 22	10
 24	10
 INSERT INTO t1 VALUES(23, 23);
-ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 INSERT INTO t1 VALUES(25, 25);
-ERROR HY000: Lock wait timeout exceeded; try restarting transaction
-Bug: Only even rows are being locked, error 1205 should'nt have occured
 SELECT * FROM t1;
 a	b
 2	10
@@ -109,7 +106,9 @@ a	b
 18	10
 20	10
 22	10
+23	23
 24	10
+25	25
 COMMIT;
 ** Connection con0 **
 COMMIT;
@@ -144,7 +143,9 @@ a	b
 18	10
 20	10
 22	10
+23	23
 24	10
+25	25
 INSERT INTO t1 VALUES(5, 5);
 INSERT INTO t1 VALUES(7, 7);
 SELECT * FROM t1;
@@ -159,7 +160,9 @@ a	b
 18	10
 20	10
 22	10
+23	23
 24	10
+25	25
 COMMIT;
 ** Connection con0 **
 COMMIT;
@@ -196,7 +199,9 @@ a	b
 18	11
 20	11
 22	11
+23	23
 24	11
+25	25
 INSERT INTO t1 VALUES(9, 9);
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 INSERT INTO t1 VALUES(13, 13);
@@ -214,7 +219,9 @@ a	b
 18	11
 20	11
 22	11
+23	23
 24	11
+25	25
 COMMIT;
 ** Connection con0 **
 COMMIT;
@@ -225,6 +232,8 @@ SELECT * FROM t1 WHERE a IN (2,4,6,8,10,
 a	b
 5	5
 7	7
+23	23
+25	25
 UPDATE t1 SET b = 13 WHERE a IN (2,4,6,8,10,12,14,16,18,20,22,24,26) = 0;
 ** Connection con1 **
 START TRANSACTION;
@@ -240,7 +249,9 @@ a	b
 18	12
 20	12
 22	12
+23	23
 24	12
+25	25
 INSERT INTO t1 VALUES(9, 9);
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 INSERT INTO t1 VALUES(13, 13);
@@ -258,7 +269,9 @@ a	b
 18	12
 20	12
 22	12
+23	23
 24	12
+25	25
 COMMIT;
 ** Connection con0 **
 COMMIT;
@@ -273,7 +286,9 @@ a	b
 18	12
 20	12
 22	12
+23	13
 24	12
+25	13
 UPDATE t1 SET b = 14 WHERE a IN (2,4,6,8) = 0;
 ** Connection con1 **
 START TRANSACTION;
@@ -289,7 +304,9 @@ a	b
 18	12
 20	12
 22	12
+23	13
 24	12
+25	13
 INSERT INTO t1 VALUES(9, 9);
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 INSERT INTO t1 VALUES(13, 13);
@@ -307,7 +324,9 @@ a	b
 18	12
 20	12
 22	12
+23	13
 24	12
+25	13
 COMMIT;
 ** Connection con0 **
 COMMIT;

=== modified file 'mysql-test/suite/sys_vars/t/tx_isolation_func.test'
--- a/mysql-test/suite/sys_vars/t/tx_isolation_func.test	2008-12-19 15:12:15 +0000
+++ b/mysql-test/suite/sys_vars/t/tx_isolation_func.test	2010-05-11 16:58:45 +0000
@@ -134,12 +134,9 @@ START TRANSACTION;
 
 SELECT * FROM t1;
 
---error ER_LOCK_WAIT_TIMEOUT
 INSERT INTO t1 VALUES(23, 23);
 
---error ER_LOCK_WAIT_TIMEOUT
 INSERT INTO t1 VALUES(25, 25);
---echo Bug: Only even rows are being locked, error 1205 should'nt have occured
 
 SELECT * FROM t1;
 

Attachment: [text/bzr-bundle] bzr/[e-mail]