List:Commits« Previous MessageNext Message »
From:John H. Embretsen Date:September 15 2008 12:07pm
Subject:bzr commit into mysql-6.0-falcon branch (john.embretsen:2824)
View as plain text  
#At file:///export/home/tmp/je159969/mysql/bzr-repos/mysql-6.0-falcon-testreviews/

 2824 John H. Embretsen	2008-09-15
      Moved test case falcon_bug_23189 from falcon_team to falcon test suite and adjusted result file.
      
      Removed extra warning in result file due to difference between online/offline 
      CREATE INDEX. Online is now the default, taking a different code path in the 
      server (according to comments in Worklog #4048).
      Also brushed up test file to accomodate the falcon standard (falcon_bug.template).
renamed:
  mysql-test/suite/falcon_team/r/falcon_bug_23189.result => mysql-test/suite/falcon/r/falcon_bug_23189.result
  mysql-test/suite/falcon_team/t/falcon_bug_23189.test => mysql-test/suite/falcon/t/falcon_bug_23189.test
modified:
  mysql-test/suite/falcon/r/falcon_bug_23189.result
  mysql-test/suite/falcon/t/falcon_bug_23189.test

per-file messages:
  mysql-test/suite/falcon/r/falcon_bug_23189.result
    Removed extra warning in result file due to difference between online/offline 
    CREATE INDEX. Online is now the default, taking a different code path in the 
    server (according to comments in Worklog #4048).
    Moved test from falcon_team to falcon suite, as related bugs (37804, 35072) seem to be fixed.
  mysql-test/suite/falcon/t/falcon_bug_23189.test
    Adjusted test file to accomodate the falcon standard (falcon_bug.template).
    No functional changes apart from an extra check (COUNT(*)) at the end of the test.
    Moved test from falcon_team to falcon suite, as related bugs (37804, 35072) seem to be fixed.
=== renamed file 'mysql-test/suite/falcon_team/r/falcon_bug_23189.result' => 'mysql-test/suite/falcon/r/falcon_bug_23189.result'
--- a/mysql-test/suite/falcon_team/r/falcon_bug_23189.result	2008-07-02 11:20:15 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_23189.result	2008-09-15 12:07:42 +0000
@@ -1,5 +1,5 @@
-SET STORAGE_ENGINE = Falcon;
 *** Bug #23189 ***
+SET @@storage_engine = 'Falcon';
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 CREATE TABLE t1 (a varchar(1100));
@@ -11,6 +11,11 @@ CREATE INDEX i ON t2 (a);
 Warnings:
 Warning	1071	Specified key was too long; max key length is 1100 bytes
 Warning	1071	Specified key was too long; max key length is 1100 bytes
-Warning	1071	Specified key was too long; max key length is 1100 bytes
+SELECT count(*) FROM t1;
+count(*)
+1
+SELECT count(*) FROM t2;
+count(*)
+1
 DROP TABLE t1;
 DROP TABLE t2;

=== renamed file 'mysql-test/suite/falcon_team/t/falcon_bug_23189.test' => 'mysql-test/suite/falcon/t/falcon_bug_23189.test'
--- a/mysql-test/suite/falcon_team/t/falcon_bug_23189.test	2008-07-02 11:20:15 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_23189.test	2008-09-15 12:07:42 +0000
@@ -1,14 +1,25 @@
 --source include/have_falcon.inc
-SET STORAGE_ENGINE = Falcon;
+
 #
 # Bug #23189 Falcon: crash if create index for long varchar
 #
 --echo *** Bug #23189 ***
+
+# ----------------------------------------------------- #
+# --- 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 varchar(1100));
 INSERT INTO t1 VALUES (repeat('r',1100));
 CREATE INDEX i ON t1 (a);
@@ -17,6 +28,14 @@ CREATE TABLE t2 (a varchar(20000));
 INSERT INTO t2 VALUES (repeat('r',20000));
 CREATE INDEX i ON t2 (a);
 
-# Final cleanup.
+# ----------------------------------------------------- #
+# --- Check                                         --- #
+# ----------------------------------------------------- #
+SELECT count(*) FROM t1;
+SELECT count(*) FROM t2;
+
+# ----------------------------------------------------- #
+# --- Final cleanup                                 --- #
+# ----------------------------------------------------- #
 DROP TABLE t1;
 DROP TABLE t2;

Thread
bzr commit into mysql-6.0-falcon branch (john.embretsen:2824) John H. Embretsen15 Sep
  • Re: bzr commit into mysql-6.0-falcon branch (john.embretsen:2824)Hakan Kuecuekyilmaz15 Sep