bzr commit into mysql-6.0-falcon branch (hky:2821)

[Hakan Kuecuekyilmaz]

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

 2821 Hakan Kuecuekyilmaz	2008-09-13
      Rescued another test from falcon_team suite.
renamed:
  mysql-test/suite/falcon_team/r/falcon_bug_30480_B.result => mysql-test/suite/falcon/r/falcon_bug_30480_B.result
  mysql-test/suite/falcon_team/t/falcon_bug_30480_B.test => mysql-test/suite/falcon/t/falcon_bug_30480_B.test
modified:
  mysql-test/suite/falcon/r/falcon_bug_30480_B.result
  mysql-test/suite/falcon/t/falcon_bug_30480_B.test

per-file messages:
  mysql-test/suite/falcon/r/falcon_bug_30480_B.result
    Adjusted result file.
  mysql-test/suite/falcon/t/falcon_bug_30480_B.test
    Reworked test to apply to our
    test case coding standards.
    
    No functional changes were made.
=== renamed file 'mysql-test/suite/falcon_team/r/falcon_bug_30480_B.result' => 'mysql-test/suite/falcon/r/falcon_bug_30480_B.result'
--- a/mysql-test/suite/falcon_team/r/falcon_bug_30480_B.result	2008-04-20 00:05:17 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_30480_B.result	2008-09-12 23:44:47 +0000
@@ -1,11 +1,12 @@
-SET storage_engine = Falcon;
 *** Bug #30480 ***
+SET @@storage_engine = 'Falcon';
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
-CREATE TABLE t1 (s1 varchar(5) CHARACTER SET ucs2);
-CREATE INDEX i1 on t1 (s1);
-INSERT INTO t1 VALUES ('c'),('c'),(0x00c3);
 SET NAMES utf8;
+CREATE TABLE t1 (s1 varchar(5) CHARACTER SET ucs2, INDEX i1 (s1));
+CREATE TABLE t2 (s1 varchar(5) CHARACTER SET ucs2, INDEX i1 (s1)) partition by key(s1);
+INSERT INTO t1 VALUES ('c'),('c'),(0x00c3);
+INSERT INTO t2 VALUES ('c'),('c'),(0x00c3);
 SELECT s1, HEX(s1) FROM t1;
 s1	HEX(s1)
 c	0063
@@ -17,10 +18,6 @@ s1	HEX(s1)
 SELECT s1, HEX(s1) FROM t1 WHERE s1 = 'Ã';
 s1	HEX(s1)
 Ã	00C3
-CREATE TABLE t2 (s1 varchar(5) CHARACTER SET ucs2) partition by key(s1);
-CREATE INDEX i1 on t2 (s1);
-INSERT INTO t2 VALUES ('c'),('c'),(0x00c3);
-SET NAMES utf8;
 SELECT s1, HEX(s1) FROM t2;
 s1	HEX(s1)
 c	0063
@@ -32,5 +29,11 @@ s1	HEX(s1)
 SELECT s1, HEX(s1) FROM t2 WHERE s1 = 'Ã';
 s1	HEX(s1)
 Ã	00C3
+SELECT count(*) FROM t1;
+count(*)
+3
+SELECT count(*) FROM t2;
+count(*)
+3
 DROP TABLE t1;
 DROP TABLE t2;

=== renamed file 'mysql-test/suite/falcon_team/t/falcon_bug_30480_B.test' => 'mysql-test/suite/falcon/t/falcon_bug_30480_B.test'
--- a/mysql-test/suite/falcon_team/t/falcon_bug_30480_B.test	2008-04-20 00:05:17 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_30480_B.test	2008-09-12 23:44:47 +0000
@@ -1,36 +1,46 @@
 --source include/have_falcon.inc
---disable_abort_on_error
-SET storage_engine = Falcon;
+
 #
 # Bug #30480: Falcon: searches fail if LIKE and key partition
 #
 --echo *** Bug #30480 ***
+
+# ----------------------------------------------------- #
+# --- Initialisation                                --- #
+# ----------------------------------------------------- #
+let $engine = 'Falcon';
+eval SET @@storage_engine = $engine;
+
 --disable_warnings
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 --enable_warnings
 
-###########################################################################
-# Here is another test case, this time with a ucs2 column.
-# The character 'A with tilde', '�, is U+00C3.
-# Both selects should return 0x00c3.
-
-CREATE TABLE t1 (s1 varchar(5) CHARACTER SET ucs2);
-CREATE INDEX i1 on t1 (s1);
-INSERT INTO t1 VALUES ('c'),('c'),(0x00c3);
 SET NAMES utf8;
+CREATE TABLE t1 (s1 varchar(5) CHARACTER SET ucs2, INDEX i1 (s1));
+CREATE TABLE t2 (s1 varchar(5) CHARACTER SET ucs2, INDEX i1 (s1)) partition by key(s1);
+INSERT INTO t1 VALUES ('c'),('c'),(0x00c3);
+INSERT INTO t2 VALUES ('c'),('c'),(0x00c3);
+
+# ----------------------------------------------------- #
+# --- Test                                          --- #
+# ----------------------------------------------------- #
 SELECT s1, HEX(s1) FROM t1;
 SELECT s1, HEX(s1) FROM t1 WHERE s1 like 'Ã%';
 SELECT s1, HEX(s1) FROM t1 WHERE s1 = 'Ã';
 
-CREATE TABLE t2 (s1 varchar(5) CHARACTER SET ucs2) partition by key(s1);
-CREATE INDEX i1 on t2 (s1);
-INSERT INTO t2 VALUES ('c'),('c'),(0x00c3);
-SET NAMES utf8;
 SELECT s1, HEX(s1) FROM t2;
 SELECT s1, HEX(s1) FROM t2 WHERE s1 like 'Ã%';
 SELECT s1, HEX(s1) FROM t2 WHERE s1 = 'Ã';
 
-# Final cleanup.
+# ----------------------------------------------------- #
+# --- Check                                         --- #
+# ----------------------------------------------------- #
+SELECT count(*) FROM t1;
+SELECT count(*) FROM t2;
+
+# ----------------------------------------------------- #
+# --- Final cleanup                                 --- #
+# ----------------------------------------------------- #
 DROP TABLE t1;
 DROP TABLE t2;