bzr push into mysql-5.5 branch (marko.makela:3603 to 3604)

[marko.makela]

 3604 Marko Mäkelä	2011-11-10 [merge]
      Merge mysql-5.1 to mysql-5.5.

    modified:
      mysql-test/suite/innodb/r/innodb-lock.result
      mysql-test/suite/innodb/t/innodb-lock.test
 3603 Sneha Modi	2011-11-10
      Bug#11748731 - 37248: SOME 'BIG' TESTS FAILING ON 6.0:
      
      alter_treable-big.test was failing due to the use of RAND() function which is no more 
      replication safe.
      This has been modified using static values.
      
      Also, 'sleep' has been replaced using 'debug_sync' and the execution time of the 
      test has been reduced significantly.
      
      This test is now taken out of the disabled.def file and is being enabled.

    modified:
      mysql-test/r/alter_table-big.result
      mysql-test/t/alter_table-big.test
      mysql-test/t/disabled.def
=== modified file 'mysql-test/suite/innodb/r/innodb-lock.result'
--- a/mysql-test/suite/innodb/r/innodb-lock.result	revid:sneha.modi@stripped139d5rnk9iq500
+++ b/mysql-test/suite/innodb/r/innodb-lock.result	revid:marko.makela@stripped74ankhtqztl49
@@ -89,3 +89,20 @@ commit;
 # Connection 'con1'.
 commit;
 drop table t1;
+#
+#Bug#12842206 INNODB LOCKING REGRESSION FOR INSERT IGNORE
+#fixed by re-fixing Bug#7975
+#aka Bug#11759688 52020: InnoDB can still deadlock on just INSERT...
+#
+CREATE TABLE t1 (a INT PRIMARY KEY, b INT NOT NULL) ENGINE=InnoDB;
+INSERT INTO t1 VALUES(3,1);
+BEGIN;
+INSERT IGNORE INTO t1 VALUES(3,14);
+BEGIN;
+INSERT IGNORE INTO t1 VALUES(3,23);
+SELECT * FROM t1 FOR UPDATE;
+COMMIT;
+a	b
+3	1
+COMMIT;
+DROP TABLE t1;

=== modified file 'mysql-test/suite/innodb/t/innodb-lock.test'
--- a/mysql-test/suite/innodb/t/innodb-lock.test	revid:sneha.modi@stripped00
+++ b/mysql-test/suite/innodb/t/innodb-lock.test	revid:marko.makela@stripped
@@ -127,3 +127,44 @@ commit;
 drop table t1;
 
 # End of 4.1 tests
+
+--echo #
+--echo #Bug#12842206 INNODB LOCKING REGRESSION FOR INSERT IGNORE
+--echo #fixed by re-fixing Bug#7975
+--echo #aka Bug#11759688 52020: InnoDB can still deadlock on just INSERT...
+--echo #
+
+connection default;
+CREATE TABLE t1 (a INT PRIMARY KEY, b INT NOT NULL) ENGINE=InnoDB;
+
+INSERT INTO t1 VALUES(3,1);
+
+BEGIN;
+# this used to wrongly acquire an X lock; now it takes an S lock
+INSERT IGNORE INTO t1 VALUES(3,14);
+
+connection con1;
+BEGIN;
+# this used to wrongly acquire an X lock; now it takes an S lock
+INSERT IGNORE INTO t1 VALUES(3,23);
+--send
+SELECT * FROM t1 FOR UPDATE;
+
+connection con2;
+# Check that the above SELECT is blocked
+let $wait_condition=
+  select count(*) = 1 from information_schema.processlist
+  where state = 'Sending data' and
+        info = 'SELECT * FROM t1 FOR UPDATE';
+--source include/wait_condition.inc
+
+connection default;
+COMMIT;
+connection con1;
+reap;
+COMMIT;
+disconnect con1;
+disconnect con2;
+
+connection default;
+DROP TABLE t1;

No bundle (reason: useless for push emails).