Re: bzr commit into mysql-6.0-falcon-team branch (john.embretsen:2958) Bug#41916

[Lars-Erik Bjørk]

Nicely caught!

OK, to push from me!

On Wed, 2009-01-07 at 11:41 +0100, John H. Embretsen wrote:
> #At file:///export/home/tmp/je159969/mysql/bzr-repos/mysql-6.0-falcon-testreviews/
> based on revid:klewis@stripped
> 
>  2958 John H. Embretsen	2009-01-07
>       Fix for Bug#41916 - Some falcon tests do not check that required character sets
> are supported.
>       
>       This patch adds --source commands in order to run a check for character sets
> ucs2, utf8, utf16 or utf32 if any of those character sets are used in the test.
>       If the tested binary does not support the given character set, the test will be
> skipped.
> modified:
>   mysql-test/suite/falcon/r/falcon_bug_32833.result
>   mysql-test/suite/falcon/t/falcon_bug_22180.test
>   mysql-test/suite/falcon/t/falcon_bug_23689.test
>   mysql-test/suite/falcon/t/falcon_bug_24511.test
>   mysql-test/suite/falcon/t/falcon_bug_24858.test
>   mysql-test/suite/falcon/t/falcon_bug_24921.test
>   mysql-test/suite/falcon/t/falcon_bug_25555.test
>   mysql-test/suite/falcon/t/falcon_bug_26057.test
>   mysql-test/suite/falcon/t/falcon_bug_27697.test
>   mysql-test/suite/falcon/t/falcon_bug_30480_A.test
>   mysql-test/suite/falcon/t/falcon_bug_30480_B.test
>   mysql-test/suite/falcon/t/falcon_bug_32833.test
>   mysql-test/suite/falcon/t/falcon_bug_38304.test
>   mysql-test/suite/falcon/t/falcon_bug_39708.test
>   mysql-test/suite/falcon/t/falcon_bugs2.test
>   mysql-test/suite/falcon/t/falcon_select.test
>   mysql-test/suite/falcon/t/falcon_unicode-big.test
> 
> per-file messages:
>   mysql-test/suite/falcon/r/falcon_bug_32833.result
>     Added falcon_bug.template cruft so that the test is more in line with Falcon
> standards.
>   mysql-test/suite/falcon/t/falcon_bug_22180.test
>     Added check for utf8 support.
>   mysql-test/suite/falcon/t/falcon_bug_23689.test
>     Added check for utf8 support.
>   mysql-test/suite/falcon/t/falcon_bug_24511.test
>     Added check for utf8 support.
>   mysql-test/suite/falcon/t/falcon_bug_24858.test
>     Added check for utf8 support.
>   mysql-test/suite/falcon/t/falcon_bug_24921.test
>     Added check for utf8 support.
>   mysql-test/suite/falcon/t/falcon_bug_25555.test
>     Added check for utf8 support.
>   mysql-test/suite/falcon/t/falcon_bug_26057.test
>     Added check for utf8 support.
>   mysql-test/suite/falcon/t/falcon_bug_27697.test
>     Added check for utf8 support.
>   mysql-test/suite/falcon/t/falcon_bug_30480_A.test
>     Added check for utf8 support.
>   mysql-test/suite/falcon/t/falcon_bug_30480_B.test
>     Added check for ucs2 support.
>   mysql-test/suite/falcon/t/falcon_bug_32833.test
>     Added checks for utf8 and utf32 (bug 41916).
>     Also refactored the test to be more in line with Falcon test standards
> (falcon_bug.template).
>   mysql-test/suite/falcon/t/falcon_bug_38304.test
>     Added check for utf8 support.
>   mysql-test/suite/falcon/t/falcon_bug_39708.test
>     Added check for utf8 support.
>   mysql-test/suite/falcon/t/falcon_bugs2.test
>     Added check for utf8 support.
>   mysql-test/suite/falcon/t/falcon_select.test
>     Added check for utf8 support.
>   mysql-test/suite/falcon/t/falcon_unicode-big.test
>     Added check for utf8 support.
> === modified file 'mysql-test/suite/falcon/r/falcon_bug_32833.result'
> --- a/mysql-test/suite/falcon/r/falcon_bug_32833.result	2008-07-15 10:59:07 +0000
> +++ b/mysql-test/suite/falcon/r/falcon_bug_32833.result	2009-01-07 10:41:07 +0000
> @@ -1,11 +1,11 @@
> -SET STORAGE_ENGINE = Falcon;
>  *** Bug #32833 ***
> +SET @@storage_engine = 'Falcon';
>  DROP TABLE IF EXISTS t1;
>  DROP PROCEDURE IF EXISTS p1;
>  # Create table
>  CREATE TABLE t1 (int_column INT, char_column CHAR(5) CHARACTER SET UTF32) 
>  PARTITION BY KEY(char_column);
> -# Create and call procedure
> +# Create and call procedure for populating table
>  SET @@autocommit=0;
>  CREATE PROCEDURE p1 ()
>  BEGIN
> @@ -96,6 +96,9 @@ count(*)
>  ALTER TABLE t1 MODIFY COLUMN char_column CHAR(5) CHARACTER SET utf8;
>  # Add index to UTF8 column
>  CREATE INDEX i ON t1 (char_column);
> +SELECT count(*) FROM t1;
> +count(*)
> +2802
>  # Final cleanup
>  DROP TABLE t1;
>  DROP PROCEDURE p1;
> 
> === modified file 'mysql-test/suite/falcon/t/falcon_bug_22180.test'
> --- a/mysql-test/suite/falcon/t/falcon_bug_22180.test	2007-09-29 04:30:42 +0000
> +++ b/mysql-test/suite/falcon/t/falcon_bug_22180.test	2009-01-07 10:41:07 +0000
> @@ -1,4 +1,6 @@
>  --source include/have_falcon.inc
> +--source include/have_utf8.inc
> +
>  SET STORAGE_ENGINE = Falcon;
>  
>  #
> 
> === modified file 'mysql-test/suite/falcon/t/falcon_bug_23689.test'
> --- a/mysql-test/suite/falcon/t/falcon_bug_23689.test	2007-09-29 04:30:42 +0000
> +++ b/mysql-test/suite/falcon/t/falcon_bug_23689.test	2009-01-07 10:41:07 +0000
> @@ -1,4 +1,6 @@
>  --source include/have_falcon.inc
> +--source include/have_utf8.inc
> +
>  #
>  # Bug #23689: Falcon: searches fail if exotic collation and index exists
>  #
> 
> === modified file 'mysql-test/suite/falcon/t/falcon_bug_24511.test'
> --- a/mysql-test/suite/falcon/t/falcon_bug_24511.test	2007-09-29 04:30:42 +0000
> +++ b/mysql-test/suite/falcon/t/falcon_bug_24511.test	2009-01-07 10:41:07 +0000
> @@ -1,4 +1,6 @@
>  --source include/have_falcon.inc
> +--source include/have_utf8.inc
> +
>  SET @@storage_engine = Falcon;
>  #
>  # Bug #24511: Falcon: BETWEEN fails with unicode field
> 
> === modified file 'mysql-test/suite/falcon/t/falcon_bug_24858.test'
> --- a/mysql-test/suite/falcon/t/falcon_bug_24858.test	2008-08-12 08:46:11 +0000
> +++ b/mysql-test/suite/falcon/t/falcon_bug_24858.test	2009-01-07 10:41:07 +0000
> @@ -1,5 +1,7 @@
>  --source include/have_falcon.inc
>  --source include/have_ucs2.inc
> +--source include/have_utf8.inc
> +
>  SET storage_engine = Falcon;
>  #
>  # Bug #24858: Falcon: searches fail if partial index on utf8 column
> 
> === modified file 'mysql-test/suite/falcon/t/falcon_bug_24921.test'
> --- a/mysql-test/suite/falcon/t/falcon_bug_24921.test	2007-09-29 04:30:42 +0000
> +++ b/mysql-test/suite/falcon/t/falcon_bug_24921.test	2009-01-07 10:41:07 +0000
> @@ -1,4 +1,6 @@
>  --source include/have_falcon.inc
> +--source include/have_utf8.inc
> +
>  SET @@storage_engine = Falcon;
>  #
>  # Bug #24921: LIKE searches fail if index on utf8 column
> 
> === modified file 'mysql-test/suite/falcon/t/falcon_bug_25555.test'
> --- a/mysql-test/suite/falcon/t/falcon_bug_25555.test	2007-09-29 04:30:42 +0000
> +++ b/mysql-test/suite/falcon/t/falcon_bug_25555.test	2009-01-07 10:41:07 +0000
> @@ -1,4 +1,6 @@
>  --source include/have_falcon.inc
> +--source include/have_utf8.inc
> +
>  SET @@storage_engine = Falcon;
>  #
>  # Bug #25555 Falcon: crash if create index on nullable utf8 column
> 
> === modified file 'mysql-test/suite/falcon/t/falcon_bug_26057.test'
> --- a/mysql-test/suite/falcon/t/falcon_bug_26057.test	2007-09-29 04:30:42 +0000
> +++ b/mysql-test/suite/falcon/t/falcon_bug_26057.test	2009-01-07 10:41:07 +0000
> @@ -1,4 +1,6 @@
>  --source include/have_falcon.inc
> +--source include/have_utf8.inc
> +
>  SET STORAGE_ENGINE = Falcon;
>  #
>  # Bug #26057: Falcon: UTF8 searches for accented character fail if index exists
> 
> === modified file 'mysql-test/suite/falcon/t/falcon_bug_27697.test'
> --- a/mysql-test/suite/falcon/t/falcon_bug_27697.test	2007-09-29 04:30:42 +0000
> +++ b/mysql-test/suite/falcon/t/falcon_bug_27697.test	2009-01-07 10:41:07 +0000
> @@ -1,4 +1,6 @@
>  --source include/have_falcon.inc
> +--source include/have_utf8.inc
> +
>  #
>  # Bug #27697: Non-western-collation searches fail if index exists
>  #
> 
> === modified file 'mysql-test/suite/falcon/t/falcon_bug_30480_A.test'
> --- a/mysql-test/suite/falcon/t/falcon_bug_30480_A.test	2008-09-15 01:36:19 +0000
> +++ b/mysql-test/suite/falcon/t/falcon_bug_30480_A.test	2009-01-07 10:41:07 +0000
> @@ -1,5 +1,6 @@
>  --source include/have_falcon.inc
>  --source include/have_partition.inc
> +--source include/have_utf8.inc
>  
>  #
>  # Bug #30480: Falcon: searches fail if LIKE and key partition
> 
> === modified file 'mysql-test/suite/falcon/t/falcon_bug_30480_B.test'
> --- a/mysql-test/suite/falcon/t/falcon_bug_30480_B.test	2008-09-15 01:36:19 +0000
> +++ b/mysql-test/suite/falcon/t/falcon_bug_30480_B.test	2009-01-07 10:41:07 +0000
> @@ -1,5 +1,6 @@
>  --source include/have_falcon.inc
>  --source include/have_partition.inc
> +--source include/have_ucs2.inc
>  
>  #
>  # Bug #30480: Falcon: searches fail if LIKE and key partition
> 
> === modified file 'mysql-test/suite/falcon/t/falcon_bug_32833.test'
> --- a/mysql-test/suite/falcon/t/falcon_bug_32833.test	2007-12-19 18:55:35 +0000
> +++ b/mysql-test/suite/falcon/t/falcon_bug_32833.test	2009-01-07 10:41:07 +0000
> @@ -1,12 +1,19 @@
>  --source include/have_falcon.inc
>  --source include/have_partition.inc
> +--source include/have_utf32.inc
> +--source include/have_utf8.inc
>  
> -SET STORAGE_ENGINE = Falcon;
>  #
>  # Bug #32833: : Falcon: crash creating utf8 index
>  #
>  --echo *** Bug #32833 ***
>  
> +# ----------------------------------------------------- #
> +# --- Initialisation                                --- #
> +# ----------------------------------------------------- #
> +let $engine = 'Falcon';
> +eval SET @@storage_engine = $engine;
> +
>  --disable_warnings
>  DROP TABLE IF EXISTS t1;
>  DROP PROCEDURE IF EXISTS p1;
> @@ -16,7 +23,7 @@ DROP PROCEDURE IF EXISTS p1;
>  CREATE TABLE t1 (int_column INT, char_column CHAR(5) CHARACTER SET UTF32) 
>    PARTITION BY KEY(char_column);
>  
> ---echo # Create and call procedure
> +--echo # Create and call procedure for populating table
>  SET @@autocommit=0;
>  delimiter //;
>  CREATE PROCEDURE p1 ()
> @@ -49,10 +56,24 @@ ALTER TABLE t1 MODIFY COLUMN char_column
>  # SELECT int_column, hex(char_column) FROM t1;
>  --enable_warnings
>  
> +
> +# ----------------------------------------------------- #
> +# --- Test                                          --- #
> +# ----------------------------------------------------- #
> +
>  --echo # Add index to UTF8 column
>  CREATE INDEX i ON t1 (char_column);
>  # SELECT int_column, hex(char_column) FROM t1;
>  
> +# ----------------------------------------------------- #
> +# --- Check                                         --- #
> +# ----------------------------------------------------- #
> +SELECT count(*) FROM t1;
> +
> +# ----------------------------------------------------- #
> +# --- Final cleanup                                 --- #
> +# ----------------------------------------------------- #
> +
>  --echo # Final cleanup
>  DROP TABLE t1;
>  DROP PROCEDURE p1;
> 
> === modified file 'mysql-test/suite/falcon/t/falcon_bug_38304.test'
> --- a/mysql-test/suite/falcon/t/falcon_bug_38304.test	2008-09-08 11:51:19 +0000
> +++ b/mysql-test/suite/falcon/t/falcon_bug_38304.test	2009-01-07 10:41:07 +0000
> @@ -1,4 +1,5 @@
>  --source include/have_falcon.inc
> +--source include/have_utf8.inc
>  
>  #
>  # Bug #<38304>: <Data contents becomes NULL if column name in Falcon table
> uses accented letters>
> @@ -537,4 +538,4 @@ SELECT count(*) FROM t1;
>  # ----------------------------------------------------- #
>  # --- Final cleanup                                 --- #
>  # ----------------------------------------------------- #
> -DROP TABLE t1;
> \ No newline at end of file
> +DROP TABLE t1;
> 
> === modified file 'mysql-test/suite/falcon/t/falcon_bug_39708.test'
> --- a/mysql-test/suite/falcon/t/falcon_bug_39708.test	2008-11-27 08:45:16 +0000
> +++ b/mysql-test/suite/falcon/t/falcon_bug_39708.test	2009-01-07 10:41:07 +0000
> @@ -1,4 +1,5 @@
>  --source include/have_falcon.inc
> +--source include/have_utf8.inc
>  
>  #
>  # Bug #39708: Falcon: non-descriptive error message when creating a big key
> 
> === modified file 'mysql-test/suite/falcon/t/falcon_bugs2.test'
> --- a/mysql-test/suite/falcon/t/falcon_bugs2.test	2008-10-16 11:24:33 +0000
> +++ b/mysql-test/suite/falcon/t/falcon_bugs2.test	2009-01-07 10:41:07 +0000
> @@ -5,6 +5,8 @@ DROP TABLE IF EXISTS t2;
>  
>  --source include/have_falcon.inc
>  --source include/have_ucs2.inc
> +--source include/have_utf8.inc
> +
>  SET storage_engine=falcon;
>  
>  # Verify that setting storage engine worked
> 
> === modified file 'mysql-test/suite/falcon/t/falcon_select.test'
> --- a/mysql-test/suite/falcon/t/falcon_select.test	2008-05-08 22:38:06 +0000
> +++ b/mysql-test/suite/falcon/t/falcon_select.test	2009-01-07 10:41:07 +0000
> @@ -3,6 +3,7 @@
>  #
>  
>  --source include/have_falcon.inc
> +--source include/have_utf8.inc
>  
>  #
>  # Simple select test
> 
> === modified file 'mysql-test/suite/falcon/t/falcon_unicode-big.test'
> --- a/mysql-test/suite/falcon/t/falcon_unicode-big.test	2008-12-10 22:10:18 +0000
> +++ b/mysql-test/suite/falcon/t/falcon_unicode-big.test	2009-01-07 10:41:07 +0000
> @@ -1,5 +1,6 @@
>  --source include/have_falcon.inc
>  --source include/big_test.inc
> +--source include/have_utf8.inc
>  
>  #
>  # Unicode related tests for Falcon
> 
> 
> -- 
> MySQL Code Commits Mailing List
> For list archives: http://lists.mysql.com/commits
> To unsubscribe:    http://lists.mysql.com/commits?unsub=1
>