bk commit into 6.0 tree (hakank:1.2620)

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
6.0 repository of hakank.  When hakank does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-03-30 11:07:00+02:00, hakank@lu0011.(none) +2 -0
  Refactored test case to match our coding conventions.

  mysql-test/suite/falcon/r/falcon_bug_22168.result@stripped, 2008-03-30 11:06:56+02:00,
hakank@lu0011.(none) +4 -1
    Adjusted result file.

  mysql-test/suite/falcon/t/falcon_bug_22168.test@stripped, 2008-03-30 11:06:56+02:00,
hakank@lu0011.(none) +18 -2
    Refactored test case to match our coding conventions.

diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_22168.result
b/mysql-test/suite/falcon/r/falcon_bug_22168.result
--- a/mysql-test/suite/falcon/r/falcon_bug_22168.result	2007-09-20 17:42:57 +02:00
+++ b/mysql-test/suite/falcon/r/falcon_bug_22168.result	2008-03-30 11:06:56 +02:00
@@ -1,5 +1,5 @@
-SET STORAGE_ENGINE = Falcon;
 *** Bug #22168 ***
+SET @@storage_engine = 'Falcon';
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (
 a date,
@@ -13,4 +13,7 @@ INSERT INTO t1 (b) VALUES ('0001-01-01 0
 SELECT count(*) FROM t1 WHERE b = '0001-01-01 00:00:00';
 count(*)
 1
+SELECT count(*) FROM t1;
+count(*)
+2
 DROP TABLE t1;
diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_22168.test
b/mysql-test/suite/falcon/t/falcon_bug_22168.test
--- a/mysql-test/suite/falcon/t/falcon_bug_22168.test	2007-09-29 06:30:36 +02:00
+++ b/mysql-test/suite/falcon/t/falcon_bug_22168.test	2008-03-30 11:06:56 +02:00
@@ -1,9 +1,15 @@
 --source include/have_falcon.inc
-SET STORAGE_ENGINE = Falcon;
 #
 # Bug #22168: Inserting bad early dates
 #
 --echo *** Bug #22168 ***
+
+# ----------------------------------------------------- #
+# --- Initialisation                                --- #
+# ----------------------------------------------------- #
+let $engine = 'Falcon';
+eval SET @@storage_engine = $engine;
+
 --disable_warnings
 DROP TABLE IF EXISTS t1;
 --enable_warnings
@@ -13,11 +19,21 @@ CREATE TABLE t1 (
   b datetime
 );
 
+# ----------------------------------------------------- #
+# --- Test                                          --- #
+# ----------------------------------------------------- #
 INSERT INTO t1 (a) VALUES ('0999-01-01');
 SELECT count(*) FROM t1 WHERE a = '0999-01-01';
 
 INSERT INTO t1 (b) VALUES ('0001-01-01 00:00:00');
 SELECT count(*) FROM t1 WHERE b = '0001-01-01 00:00:00';
 
-# Final cleanup.
+# ----------------------------------------------------- #
+# --- Check                                         --- #
+# ----------------------------------------------------- #
+SELECT count(*) FROM t1;
+
+# ----------------------------------------------------- #
+# --- Final cleanup                                 --- #
+# ----------------------------------------------------- #
 DROP TABLE t1;