#At file:///home/hakan/work/mysql/mysql-6.0-falcon-team/
2808 Hakan Kuecuekyilmaz 2008-09-03
Refactored test for 28095 to use a "soft" server restart
using --shutdown_server command.
removed:
mysql-test/suite/falcon/t/falcon_bug_28095_II-master.opt
modified:
mysql-test/suite/falcon/r/falcon_bug_28095_I.result
mysql-test/suite/falcon/r/falcon_bug_28095_II.result
mysql-test/suite/falcon/t/disabled.def
mysql-test/suite/falcon/t/falcon_bug_28095_I.test
mysql-test/suite/falcon/t/falcon_bug_28095_II.test
per-file messages:
mysql-test/suite/falcon/r/falcon_bug_28095_I.result
Adjusted result file.
mysql-test/suite/falcon/r/falcon_bug_28095_II.result
Adjusted result file.
mysql-test/suite/falcon/t/disabled.def
Removed working test cases.
mysql-test/suite/falcon/t/falcon_bug_28095_I.test
Refactored test case to use --shutdow_server,
also applied our Falcon test case coding standards.
mysql-test/suite/falcon/t/falcon_bug_28095_II.test
Refactored test case to reflect our Falcon test
case coding standards.
=== modified file 'mysql-test/suite/falcon/r/falcon_bug_28095_I.result'
--- a/mysql-test/suite/falcon/r/falcon_bug_28095_I.result 2007-09-20 15:44:25 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_28095_I.result 2008-09-03 05:07:43 +0000
@@ -1,13 +1,12 @@
-SET STORAGE_ENGINE = Falcon;
-*** Bug #126: First phase ***
-*** Also covering bug #113 ***
+*** Bug #28095: First phase ***
+SET @@storage_engine = 'Falcon';
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t2;
CREATE TABLE t1 (a int);
INSERT INTO t1 VALUES (1);
INSERT INTO t1 VALUES (2);
INSERT INTO t1 VALUES (3);
-SELECT * FROM t1;
+SELECT * FROM t1 ORDER BY a;
a
1
2
=== modified file 'mysql-test/suite/falcon/r/falcon_bug_28095_II.result'
--- a/mysql-test/suite/falcon/r/falcon_bug_28095_II.result 2008-03-28 17:13:51 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_28095_II.result 2008-09-03 05:07:43 +0000
@@ -1,9 +1,12 @@
-*** Bug #126: Second phase ***
-*** Also test for bug #123 ***
-SET @@storage_engine = Falcon;
-SELECT * FROM t1;
+*** Bug #28095: Second phase ***
+SET @@storage_engine = 'Falcon';
+SELECT * FROM t1 ORDER BY a;
a
1
2
3
-DROP TABLE t1, t2;
+SELECT count(*) FROM t1;
+count(*)
+3
+DROP TABLE t1;
+DROP TABLE t2;
=== modified file 'mysql-test/suite/falcon/t/disabled.def'
--- a/mysql-test/suite/falcon/t/disabled.def 2008-08-11 13:22:53 +0000
+++ b/mysql-test/suite/falcon/t/disabled.def 2008-09-03 05:07:43 +0000
@@ -9,6 +9,3 @@
# Do not use any TAB characters for whitespace.
#
##############################################################################
-
-falcon_bug_28095_I : Bug#xxxxx 2008-04-22 hakank Disabled until soft restart is in main tree
-falcon_bug_28095_II : Bug#xxxxx 2008-03-22 hakank Disabled until soft restart is in main tree
=== modified file 'mysql-test/suite/falcon/t/falcon_bug_28095_I.test'
--- a/mysql-test/suite/falcon/t/falcon_bug_28095_I.test 2007-09-29 04:30:42 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_28095_I.test 2008-09-03 05:07:43 +0000
@@ -1,20 +1,32 @@
--source include/have_falcon.inc
-SET STORAGE_ENGINE = Falcon;
+
+#
+# Bug #28095: Falcon Drop table causes crash/Phase I
#
-# Mantis bug #126 first phase: Drop table causes crash
-# Mantis bug #113: JStar is crashing on shutdown
+# Note: This test consists of two test file and
+# needs a "soft" server restart.
#
---echo *** Bug #126: First phase ***
---echo *** Also covering bug #113 ***
+--echo *** Bug #28095: First phase ***
+
+# ----------------------------------------------------- #
+# --- Initialisation --- #
+# ----------------------------------------------------- #
+let $engine = 'Falcon';
+eval SET @@storage_engine = $engine;
+
--disable_warnings
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t2;
--enable_warnings
+# ----------------------------------------------------- #
+# --- Test --- #
+# ----------------------------------------------------- #
CREATE TABLE t1 (a int);
INSERT INTO t1 VALUES (1);
INSERT INTO t1 VALUES (2);
INSERT INTO t1 VALUES (3);
-SELECT * FROM t1;
+SELECT * FROM t1 ORDER BY a;
CREATE TABLE t2 (b int);
+--shutdown_server
=== removed file 'mysql-test/suite/falcon/t/falcon_bug_28095_II-master.opt'
--- a/mysql-test/suite/falcon/t/falcon_bug_28095_II-master.opt 2008-03-28 17:13:51 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_28095_II-master.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---sql_mode=''
=== modified file 'mysql-test/suite/falcon/t/falcon_bug_28095_II.test'
--- a/mysql-test/suite/falcon/t/falcon_bug_28095_II.test 2008-03-28 17:13:51 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_28095_II.test 2008-09-03 05:07:43 +0000
@@ -1,11 +1,31 @@
--source include/have_falcon.inc
+
+#
+# Bug #28095: Falcon Drop table causes crash/Phase II
#
-# Mantis bug #126 second phase: Drop table causes crash
-# Mantis bug #123: Table cannot be read after restarting mysqld
+# Note: This test consists of two test file and
+# needs a "soft" server restart.
#
---echo *** Bug #126: Second phase ***
---echo *** Also test for bug #123 ***
-SET @@storage_engine = Falcon;
+--echo *** Bug #28095: Second phase ***
+
+# ----------------------------------------------------- #
+# --- Initialisation --- #
+# ----------------------------------------------------- #
+let $engine = 'Falcon';
+eval SET @@storage_engine = $engine;
+
+# ----------------------------------------------------- #
+# --- Test --- #
+# ----------------------------------------------------- #
+SELECT * FROM t1 ORDER BY a;
+
+# ----------------------------------------------------- #
+# --- Check --- #
+# ----------------------------------------------------- #
+SELECT count(*) FROM t1;
-SELECT * FROM t1;
-DROP TABLE t1, t2;
+# ----------------------------------------------------- #
+# --- Final cleanup --- #
+# ----------------------------------------------------- #
+DROP TABLE t1;
+DROP TABLE t2;
| Thread |
|---|
| • bzr commit into mysql-6.0-falcon branch (hky:2808) | Hakan Kuecuekyilmaz | 3 Sep |
