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

[Hakan Kuecuekyilmaz]

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

 2752 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_23962.result => mysql-test/suite/falcon/r/falcon_bug_23962.result
  mysql-test/suite/falcon_team/t/falcon_bug_23962.test => mysql-test/suite/falcon/t/falcon_bug_23962.test
modified:
  mysql-test/suite/falcon/r/falcon_bug_23962.result
  mysql-test/suite/falcon/t/falcon_bug_23962.test

per-file messages:
  mysql-test/suite/falcon/r/falcon_bug_23962.result
    mv
  mysql-test/suite/falcon/t/falcon_bug_23962.test
    mv
=== 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/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;