bzr commit into mysql-5.5 branch (luis.soares:3326) Bug#45621 Bug#11754075 WL#4284

[Luis Soares]

#At file:///home/lsoares/Workspace/bzr/work/bugfixing/11754075/mysql-5.5/ based on revid:joerg@stripped

 3326 Luis Soares	2011-02-15
      BUG#11754075: BUG#45621: A FEW TEST FILES ARE DISABLED DUE TO WL#4284
      
      Backporting the patch from BUG#11753489 into mysql-5.5 
      as it is already in mysql-trunk but not in mysql-5.5.

    removed:
      mysql-test/suite/rpl/t/rpl_failed_optimize-master.opt
    modified:
      mysql-test/extra/rpl_tests/rpl_failed_optimize.test
      mysql-test/suite/rpl/r/rpl_failed_optimize.result
      mysql-test/suite/rpl/t/disabled.def
=== modified file 'mysql-test/extra/rpl_tests/rpl_failed_optimize.test'
--- a/mysql-test/extra/rpl_tests/rpl_failed_optimize.test	2010-12-19 17:07:28 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_failed_optimize.test	2011-02-15 11:59:12 +0000
@@ -2,22 +2,24 @@
 
 #
 # BUG#5551 "Failed OPTIMIZE TABLE is logged to binary log"
-# Replication should work when OPTIMIZE TABLE timeouts, and 
-# when OPTIMIZE TABLE is executed on a non-existing table
+# Replication should work when when OPTIMIZE TABLE is 
+# executed on a non-existing table.
 #
+# Due to patch for BUG#989, checking that an OPTIMIZE
+# that fails due to a lock wait timeout on an InnoDB table
+# is not valid anymore, as an mdl lock is hit before,
+# thence no timeout occurs, but instead a deadlock.
+#
+
 
 eval CREATE TABLE t1 ( a int ) ENGINE=$engine_type;
 BEGIN;
 INSERT INTO t1 VALUES (1);
 
 connection master1;
-OPTIMIZE TABLE t1;
-
 OPTIMIZE TABLE non_existing;  
 sync_slave_with_master;
 
-# End of 4.1 tests
-
 connection master;
 select * from t1;
 commit;

=== modified file 'mysql-test/suite/rpl/r/rpl_failed_optimize.result'
--- a/mysql-test/suite/rpl/r/rpl_failed_optimize.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_failed_optimize.result	2011-02-15 11:59:12 +0000
@@ -3,13 +3,6 @@ include/master-slave.inc
 CREATE TABLE t1 ( a int ) ENGINE=InnoDB;
 BEGIN;
 INSERT INTO t1 VALUES (1);
-OPTIMIZE TABLE t1;
-Table	Op	Msg_type	Msg_text
-test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
-test.t1	optimize	error	Lock wait timeout exceeded; try restarting transaction
-test.t1	optimize	status	Operation failed
-Warnings:
-Error	1205	Lock wait timeout exceeded; try restarting transaction
 OPTIMIZE TABLE non_existing;
 Table	Op	Msg_type	Msg_text
 test.non_existing	optimize	Error	Table 'test.non_existing' doesn't exist

=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def	2011-01-31 13:11:05 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def	2011-02-15 11:59:12 +0000
@@ -10,7 +10,6 @@
 #
 ##############################################################################
 
-rpl_failed_optimize       : WL#4284: Can't optimize table used by a pending transaction (there is metadata lock on the table).
 rpl_read_only             : WL#4284: Setting Read only won't succeed until all metadata locks are released.
 rpl_row_create_table      : Bug#51574 2010-02-27 andrei failed different way than earlier with bug#45576
 rpl_spec_variables        : BUG#47661 2009-10-27 jasonh rpl_spec_variables fails on PB2 hpux

=== removed file 'mysql-test/suite/rpl/t/rpl_failed_optimize-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_failed_optimize-master.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_failed_optimize-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---loose-innodb-lock-wait-timeout=1


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