#At file:///home/hakan/work/mysql/mysql-6.0-falcon-local-master/
2750 Hakan Kuecuekyilmaz 2008-07-17 [merge]
Merge.
renamed:
mysql-test/suite/falcon_team/r/falcon_bug_23962.result => mysql-test/suite/falcon/r/falcon_bug_23962.result
mysql-test/suite/falcon_team/r/falcon_bug_27997.result => mysql-test/suite/falcon/r/falcon_bug_27997.result
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_23962.test => mysql-test/suite/falcon/t/falcon_bug_23962.test
mysql-test/suite/falcon_team/t/falcon_bug_27997.test => mysql-test/suite/falcon/t/falcon_bug_27997.test
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_23962.result
mysql-test/suite/falcon/r/falcon_bug_37080.result
mysql-test/suite/falcon/t/falcon_bug_23962.test
mysql-test/suite/falcon/t/falcon_bug_37080.test
=== renamed file 'mysql-test/suite/falcon_team/r/falcon_bug_23962.result' => 'mysql-test/suite/falcon/r/falcon_bug_23962.result'
--- a/mysql-test/suite/falcon_team/r/falcon_bug_23962.result 2008-04-20 00:05:17 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_23962.result 2008-07-16 16:00:34 +0000
@@ -1,5 +1,5 @@
-SET STORAGE_ENGINE = Falcon;
*** Bug #23962 ***
+SET @@storage_engine = 'Falcon';
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a char(5), KEY (a));
INSERT INTO t1 VALUES ('a'), ('aa'), ('aaa'), ('abc'), ('bbb');
@@ -14,4 +14,7 @@ a
aaa
abc
bbb
+SELECT count(*) FROM t1;
+count(*)
+5
DROP TABLE t1;
=== renamed file 'mysql-test/suite/falcon_team/r/falcon_bug_27997.result' => 'mysql-test/suite/falcon/r/falcon_bug_27997.result'
=== 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_23962.test' => 'mysql-test/suite/falcon/t/falcon_bug_23962.test'
--- a/mysql-test/suite/falcon_team/t/falcon_bug_23962.test 2008-04-20 00:05:17 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_23962.test 2008-07-16 16:00:34 +0000
@@ -1,9 +1,16 @@
--source include/have_falcon.inc
-SET STORAGE_ENGINE = Falcon;
+
#
# Bug #23962: Wrong results with > search
#
--echo *** Bug #23962 ***
+
+# ----------------------------------------------------- #
+# --- Initialisation --- #
+# ----------------------------------------------------- #
+let $engine = 'Falcon';
+eval SET @@storage_engine = $engine;
+
--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings
@@ -11,8 +18,18 @@ DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a char(5), KEY (a));
INSERT INTO t1 VALUES ('a'), ('aa'), ('aaa'), ('abc'), ('bbb');
+# ----------------------------------------------------- #
+# --- Test --- #
+# ----------------------------------------------------- #
SELECT * FROM t1 WHERE a > 'a' ORDER BY a;
SELECT * FROM t1 WHERE a > 'aa' ORDER BY a;
-# Final cleanup.
+# ----------------------------------------------------- #
+# --- Check --- #
+# ----------------------------------------------------- #
+SELECT count(*) FROM t1;
+
+# ----------------------------------------------------- #
+# --- Final cleanup --- #
+# ----------------------------------------------------- #
DROP TABLE t1;
=== renamed file 'mysql-test/suite/falcon_team/t/falcon_bug_27997.test' => 'mysql-test/suite/falcon/t/falcon_bug_27997.test'
=== 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;
