bzr push into mysql-6.0-bugteam branch (davi:2963 to 2964)

[Davi Arnaut]

 2964 Davi Arnaut	2009-01-13 [merge]
      Auto-merge from 5.1-bugteam
modified:
  mysql-test/t/innodb_bug38231.test

 2963 Georgi Kodinov	2009-01-13
      Disable tests affected by bug #42079
modified:
  mysql-test/suite/falcon/t/disabled.def
  mysql-test/suite/parts/t/disabled.def

=== modified file 'mysql-test/t/innodb_bug38231.test'
--- a/mysql-test/t/innodb_bug38231.test	2008-12-14 21:26:31 +0000
+++ b/mysql-test/t/innodb_bug38231.test	2009-01-08 12:31:34 +0000
@@ -16,7 +16,6 @@ CREATE TABLE bug38231 (a INT);
 
 -- connect (con1,localhost,root,,)
 -- connect (con2,localhost,root,,)
--- connect (con3,localhost,root,,)
 
 -- connection con1
 SET autocommit=0;
@@ -27,11 +26,6 @@ SET autocommit=0;
 -- send
 LOCK TABLE bug38231 WRITE;
 
--- connection con3
-SET autocommit=0;
--- send
-LOCK TABLE bug38231 WRITE;
-
 -- connection default
 -- send
 TRUNCATE TABLE bug38231;
@@ -39,6 +33,7 @@ TRUNCATE TABLE bug38231;
 -- connection con1
 # give time to TRUNCATE and others to be executed; without sleep, sometimes
 # UNLOCK executes before TRUNCATE
+# TODO: Replace with wait_condition once possible under embedded server.
 -- sleep 0.2
 # this crashes the server if the bug is present
 UNLOCK TABLES;
@@ -46,16 +41,13 @@ UNLOCK TABLES;
 # clean up
 
 -- connection con2
-UNLOCK TABLES;
-
--- connection con3
+-- reap
 UNLOCK TABLES;
 
 -- connection default
-
+-- reap
 -- disconnect con1
 -- disconnect con2
--- disconnect con3
 
 # test that TRUNCATE works with with row-level locks