List:Commits« Previous MessageNext Message »
From:marko.makela Date:April 18 2012 11:29am
Subject:bzr push into mysql-trunk branch (marko.makela:3897 to 3899)
View as plain text  
 3899 Marko Mäkelä	2012-04-18
      Remove nondeterminism in innodb-index-online.test again.

    modified:
      mysql-test/suite/innodb/r/innodb-index-online.result
      mysql-test/suite/innodb/t/innodb-index-online.test
 3898 Marko Mäkelä	2012-04-18
      Disable innodb.innodb-alter-discard on --embedded.
      It does not support restart.

    modified:
      mysql-test/suite/innodb/t/innodb-alter-discard.test
 3897 Tor Didriksen	2012-04-18 [merge]
      empty merge 5.5 => trunk

=== modified file 'mysql-test/suite/innodb/r/innodb-index-online.result'
--- a/mysql-test/suite/innodb/r/innodb-index-online.result	revid:tor.didriksen@stripped3i9k
+++ b/mysql-test/suite/innodb/r/innodb-index-online.result	revid:marko.makela@strippeda5qo6jjglix
@@ -266,10 +266,6 @@ ALTER TABLE t1 DROP INDEX c2f, ADD INDEX
 SET DEBUG_SYNC='now WAIT_FOR c2g_created';
 SET lock_wait_timeout=10;
 ALTER TABLE t1 DISCARD TABLESPACE;
-SELECT state FROM information_schema.processlist
-WHERE info='ALTER TABLE t1 DISCARD TABLESPACE';
-state
-Waiting for table level lock
 SET DEBUG_SYNC='now SIGNAL dml4_done';
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 SHOW CREATE TABLE t1;

=== modified file 'mysql-test/suite/innodb/t/innodb-alter-discard.test'
--- a/mysql-test/suite/innodb/t/innodb-alter-discard.test	revid:tor.didriksen@stripped9zig4tk4ky83i9k
+++ b/mysql-test/suite/innodb/t/innodb-alter-discard.test	revid:marko.makela@stripped2902-mym8ma5qo6jjglix
@@ -1,5 +1,6 @@
 #Bug#13955083 ALLOW IN-PLACE DDL OPERATIONS ON MISSING OR DISCARDED TABLESPACES
 
+--source include/not_embedded.inc
 --source include/have_innodb.inc
 
 let $MYSQLD_DATADIR=`select @@datadir`;

=== modified file 'mysql-test/suite/innodb/t/innodb-index-online.test'
--- a/mysql-test/suite/innodb/t/innodb-index-online.test	revid:tor.didriksen@stripped18111716-19zig4tk4ky83i9k
+++ b/mysql-test/suite/innodb/t/innodb-index-online.test	revid:marko.makela@stripped0120418112902-mym8ma5qo6jjglix
@@ -282,18 +282,20 @@ SET lock_wait_timeout=10;
 ALTER TABLE t1 DISCARD TABLESPACE;
 
 connection con1;
-SELECT state FROM information_schema.processlist
-WHERE info='ALTER TABLE t1 DISCARD TABLESPACE';
+let $wait_condition=
+  SELECT COUNT(*) = 1 FROM information_schema.processlist
+  WHERE state = 'Waiting for table level lock' and
+        info = 'ALTER TABLE t1 DISCARD TABLESPACE';
+--source include/wait_condition.inc
 
 SET DEBUG_SYNC='now SIGNAL dml4_done';
 disconnect con1;
-connection default;
---error ER_LOCK_WAIT_TIMEOUT
-reap;
 connection con2;
 reap;
 disconnect con2;
 connection default;
+--error ER_LOCK_WAIT_TIMEOUT
+reap;
 
 SHOW CREATE TABLE t1;
 # The ER_NO_SUCH_TABLE is being thrown by ha_innobase::open().

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (marko.makela:3897 to 3899) marko.makela20 Apr