bzr commit into mysql-6.0-falcon branch (hakan:2755)

[Hakan Kuecuekyilmaz]

#At file:///home/hakan/work/mysql/mysql-6.0-falcon-to-merge/

 2755 Hakan Kuecuekyilmaz	2008-07-16
            Rescued another test from falcon_team graveyard.
      
                   Project code name: make Vlad happy.
renamed:
  mysql-test/suite/falcon_team/r/falcon_bug_37080.result => mysql-test/suite/falcon/r/falcon_bug_37080.result
  mysql-test/suite/falcon_team/t/falcon_bug_37080.test => mysql-test/suite/falcon/t/falcon_bug_37080.test
modified:
  mysql-test/suite/falcon/r/falcon_bug_37080.result
  mysql-test/suite/falcon/t/falcon_bug_37080.test

per-file messages:
  mysql-test/suite/falcon/r/falcon_bug_37080.result
    mv
  mysql-test/suite/falcon/t/falcon_bug_37080.test
    mv
=== renamed file 'mysql-test/suite/falcon_team/r/falcon_bug_37080.result' => 'mysql-test/suite/falcon/r/falcon_bug_37080.result'
--- a/mysql-test/suite/falcon_team/r/falcon_bug_37080.result	2008-07-03 08:46:37 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_37080.result	2008-07-16 17:52:19 +0000
@@ -1,5 +1,5 @@
 *** Bug #37080 ***
 SET @@storage_engine = 'Falcon';
-DROP TABLE IF EXISTS t;
-CREATE TABLE t(i int);
-DROP TABLE t;
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1(a int);
+DROP TABLE t1;

=== renamed file 'mysql-test/suite/falcon_team/t/falcon_bug_37080.test' => 'mysql-test/suite/falcon/t/falcon_bug_37080.test'
--- a/mysql-test/suite/falcon_team/t/falcon_bug_37080.test	2008-07-03 08:46:37 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_37080.test	2008-07-16 17:52:19 +0000
@@ -1,7 +1,8 @@
 --source include/have_falcon.inc
+
 #
 # Bug#37080: Falcon deadlock on parallel TRUNCATE  and INSERT
-# 
+#
 --echo *** Bug #37080 ***
 
 # ----------------------------------------------------- #
@@ -11,25 +12,24 @@ let $engine = 'Falcon';
 eval SET @@storage_engine = $engine;
 
 --disable_warnings
-DROP TABLE IF EXISTS t;
+DROP TABLE IF EXISTS t1;
 --enable_warnings
 
-
-CREATE TABLE t(i int);
+CREATE TABLE t1(a int);
 connect (conn1,localhost,root,,);
+
 # ----------------------------------------------------- #
 # --- Test                                          --- #
 # ----------------------------------------------------- #
 
-
 let $num=10000;
 --disable_query_log
 while ($num)
 {
    connection conn1;
-   --send insert into t values(1);
+   --send insert into t1 values(1), (3), (5), (7) , (11);
    connection default;
-   --send truncate table t;
+   --send truncate table t1;
    connection conn1;
    --reap
    connection default;
@@ -45,4 +45,4 @@ while ($num)
 # ----------------------------------------------------- #
 # --- Final cleanup                                 --- #
 # ----------------------------------------------------- #
-DROP TABLE t;
+DROP TABLE t1;