copy from test-extra-5.1 to main tree

BitKeeper/etc/ignore:
  Added mysql-test/suite/funcs_1/r/innodb_views.warnings mysql-test/suite/funcs_1/r/memory_trig_03e.warnings mysql-test/suite/funcs_1/r/memory_views.warnings mysql-test/suite/funcs_1/r/myisam_trig_03e.warnings mysql-test/suite/funcs_1/r/myisam_views.warnings mysql-test/suite/funcs_1/r/ndb_trig_03e.warnings mysql-test/suite/funcs_1/r/ndb_views.warnings mysql-test/suite/partitions/r/diff mysql-test/suite/partitions/r/partition_bit_ndb.warnings mysql-test/suite/partitions/r/partition_special_innodb.warnings mysql-test/suite/partitions/r/partition_special_myisam.warnings storage/archive/archive_reader mysql-test/suite/funcs_1/r/innodb_trig_03e.warnings to the ignore list
mysql-test/suite/funcs_2/include/check_charset.inc:
  inserted newline at the end of file.
mysql-test/suite/objects/include/drop_all.inc:
  inserted newline at the end of file.
mysql-test/suite/partitions/include/partition_key_32col.inc:
  inserted newline at the end of file.
mysql-test/suite/rpl/data/rpl_mixed.dat:
  inserted newline at the end of file.
mysql-test/suite/rpl/include/rpl_mixed_check_event.inc:
  inserted newline at the end of file.
mysql-test/suite/rpl/include/rpl_mixed_check_select.inc:
  inserted newline at the end of file.
mysql-test/suite/rpl/include/rpl_mixed_check_user.inc:
  inserted newline at the end of file.
mysql-test/suite/rpl/include/rpl_mixed_check_view.inc:
  inserted newline at the end of file.

mysql-test/suite/funcs_2/charset/charset_master.test

@@ -0,0 +1,606 @@
+#################################################################################
+# Author:  Serge Kozlov								#
+# Date:    09/21/2005								#
+# Purpose: used by ../t/*_charset.test						#
+# Require: set $engine_type= [NDB,MyISAM,InnoDB,etc] before calling		#
+#################################################################################
+
+#
+#
+#
+
+let $check_std_csets= 1;
+let $check_ucs2_csets= 1;
+let $check_utf8_csets= 1;
+
+#
+# Check all charsets/collation combinations
+#
+
+if ($check_std_csets)
+{
+
+# armscii8
+
+let $cset= armscii8;
+let $coll= armscii8_bin;
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= armscii8;
+let $coll= armscii8_general_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+# ascii
+
+let $cset= ascii;
+let $coll= ascii_bin;
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= ascii;
+let $coll= ascii_general_ci;
+--source suite/funcs_2/include/check_charset.inc
+ 
+# big5
+
+let $cset= big5;
+let $coll= big5_bin;
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= big5;
+let $coll= big5_chinese_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+# binary
+
+let $cset= binary;
+let $coll= ;
+let $bin_cset= 1;
+--source suite/funcs_2/include/check_charset.inc
+
+# cp1250
+
+let $cset= cp1250;
+let $coll= cp1250_bin;
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= cp1250;
+let $coll= cp1250_croatian_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+
+let $cset= cp1250;
+let $coll= cp1250_czech_cs;
+--source suite/funcs_2/include/check_charset.inc
+
+
+let $cset= cp1250;
+let $coll= cp1250_general_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+# cp1251
+
+let $cset= cp1251;
+let $coll= cp1251_bin;
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= cp1251;
+let $coll= cp1251_bulgarian_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= cp1251;
+let $coll= cp1251_general_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= cp1251;
+let $coll= cp1251_general_cs;
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= cp1251;
+let $coll= cp1251_ukrainian_ci; 
+--source suite/funcs_2/include/check_charset.inc
+
+# cp1256
+
+let $cset= cp1256;
+let $coll= cp1256_bin; 
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= cp1256;
+let $coll= cp1256_general_ci; 
+--source suite/funcs_2/include/check_charset.inc
+
+# cp1257
+
+let $cset= cp1257;
+let $coll= cp1257_bin; 
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= cp1257;
+let $coll= cp1257_general_ci; 
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= cp1257;
+let $coll= cp1257_lithuanian_ci; 
+--source suite/funcs_2/include/check_charset.inc
+
+# cp850
+
+let $cset= cp850;
+let $coll= cp850_bin; 
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= cp850;
+let $coll= cp850_general_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+# cp852
+
+let $cset= cp852;
+let $coll= cp852_bin; 
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= cp852;
+let $coll= cp852_general_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+# cp866
+
+let $cset= cp866;
+let $coll= cp866_bin; 
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= cp866;
+let $coll= cp866_general_ci;
+--source suite/funcs_2/include/check_charset.inc
+ 
+# cp932
+
+let $cset= cp932;
+let $coll= cp932_bin; 
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= cp932;
+let $coll= cp932_japanese_ci;
+--source suite/funcs_2/include/check_charset.inc
+ 
+# dec8
+
+let $cset= dec8;
+let $coll= dec8_bin; 
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= dec8;
+let $coll= dec8_swedish_ci; 
+--source suite/funcs_2/include/check_charset.inc
+
+# eucjpms
+
+let $cset= eucjpms;
+let $coll= eucjpms_bin; 
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= eucjpms;
+let $coll= eucjpms_japanese_ci; 
+--source suite/funcs_2/include/check_charset.inc
+
+# euckr
+
+let $cset= euckr;
+let $coll= euckr_bin; 
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= euckr;
+let $coll= euckr_korean_ci; 
+--source suite/funcs_2/include/check_charset.inc
+ 
+# gb2312
+
+let $cset= gb2312;
+let $coll= gb2312_bin;
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= gb2312;
+let $coll= gb2312_chinese_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+# gbk
+
+let $cset= gbk;
+let $coll= gbk_bin;
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= gbk;
+let $coll= gbk_chinese_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+# geostd8
+
+let $cset= geostd8;
+let $coll= geostd8_bin; 
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= geostd8;
+let $coll= geostd8_general_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+# greek
+
+let $cset= greek;
+let $coll= greek_bin; 
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= greek;
+let $coll= greek_general_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+# hebrew
+
+let $cset= hebrew;
+let $coll= hebrew_bin; 
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= hebrew;
+let $coll= hebrew_general_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+# hp8
+
+let $cset= hp8;
+let $coll= hp8_bin; 
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= hp8;
+let $coll= hp8_english_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+# keybcs2
+
+let $cset= keybcs2;
+let $coll= keybcs2_bin; 
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= keybcs2;
+let $coll= keybcs2_general_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+# koi8r
+
+let $cset= koi8r;
+let $coll= koi8r_bin; 
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= koi8r;
+let $coll= koi8r_general_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+# koi8u
+
+let $cset= koi8u;
+let $coll= koi8u_bin; 
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= koi8u;
+let $coll= koi8u_general_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+# latin1
+
+let $cset= latin1;
+let $coll= latin1_bin; 
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= latin1;
+let $coll= latin1_danish_ci; 
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= latin1;
+let $coll= latin1_general_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= latin1;
+let $coll= latin1_general_cs;
+--source suite/funcs_2/include/check_charset.inc
+
+
+let $cset= latin1;
+let $coll= latin1_german1_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= latin1;
+let $coll= latin1_german2_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= latin1;
+let $coll= latin1_spanish_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= latin1;
+let $coll= latin1_swedish_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+# latin2
+
+let $cset= latin2;
+let $coll= latin2_bin;
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= latin2;
+let $coll= latin2_croatian_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= latin2;
+let $coll= latin2_czech_cs; 
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= latin2;
+let $coll= latin2_general_ci; 
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= latin2;
+let $coll= latin2_hungarian_ci; 
+--source suite/funcs_2/include/check_charset.inc
+
+# latin5
+
+let $cset= latin5;
+let $coll= latin5_bin;
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= latin5;
+let $coll= latin5_turkish_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+# latin7
+
+let $cset= latin7;
+let $coll= latin7_bin;
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= latin7;
+let $coll= latin7_estonian_cs;
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= latin7;
+let $coll= latin7_general_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= latin7;
+let $coll= latin7_general_cs;
+--source suite/funcs_2/include/check_charset.inc
+
+# macce
+
+let $cset= macce;
+let $coll= macce_bin; 
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= macce;
+let $coll= macce_general_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+# macroman
+
+let $cset= macroman;
+let $coll= macroman_bin; 
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= macroman;
+let $coll= macroman_general_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+# sjis
+
+let $cset= sjis;
+let $coll= sjis_bin; 
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= sjis;
+let $coll= sjis_japanese_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+# swe7
+
+let $cset= swe7;
+let $coll= swe7_bin; 
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= swe7;
+let $coll= swe7_swedish_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+# tis620
+
+let $cset= tis620;
+let $coll= tis620_bin; 
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= tis620;
+let $coll= tis620_thai_ci;
+--source suite/funcs_2/include/check_charset.inc
+
+# ujis
+
+let $cset= ujis;
+let $coll= ujis_bin; 
+--source suite/funcs_2/include/check_charset.inc
+
+let $cset= ujis;
+let $coll= ujis_japanese_ci; 
+--source suite/funcs_2/include/check_charset.inc
+
+}
+
+if ($check_ucs2_csets)
+{
+
+# ucs2
+
+let $cset= ucs2;
+let $coll= ucs2_bin;
+--source suite/funcs_2/include/check_charset_ucs2.inc
+
+let $cset= ucs2;
+let $coll= ucs2_czech_ci;
+--source suite/funcs_2/include/check_charset_ucs2.inc
+
+let $cset= ucs2;
+let $coll= ucs2_danish_ci;
+--source suite/funcs_2/include/check_charset_ucs2.inc
+
+let $cset= ucs2;
+let $coll= ucs2_estonian_ci;
+--source suite/funcs_2/include/check_charset_ucs2.inc
+
+let $cset= ucs2;
+let $coll= ucs2_general_ci; 
+--source suite/funcs_2/include/check_charset_ucs2.inc
+
+let $cset= ucs2;
+let $coll= ucs2_hungarian_ci; 
+--source suite/funcs_2/include/check_charset_ucs2.inc
+
+let $cset= ucs2;
+let $coll= ucs2_icelandic_ci; 
+--source suite/funcs_2/include/check_charset_ucs2.inc
+
+let $cset= ucs2;
+let $coll= ucs2_latvian_ci; 
+--source suite/funcs_2/include/check_charset_ucs2.inc
+
+let $cset= ucs2;
+let $coll= ucs2_lithuanian_ci; 
+--source suite/funcs_2/include/check_charset_ucs2.inc
+
+let $cset= ucs2;
+let $coll= ucs2_persian_ci; 
+--source suite/funcs_2/include/check_charset_ucs2.inc
+
+let $cset= ucs2;
+let $coll= ucs2_polish_ci; 
+--source suite/funcs_2/include/check_charset_ucs2.inc
+
+let $cset= ucs2;
+let $coll= ucs2_roman_ci; 
+--source suite/funcs_2/include/check_charset_ucs2.inc
+
+let $cset= ucs2;
+let $coll= ucs2_romanian_ci; 
+--source suite/funcs_2/include/check_charset_ucs2.inc
+
+let $cset= ucs2;
+let $coll= ucs2_slovak_ci; 
+--source suite/funcs_2/include/check_charset_ucs2.inc
+
+let $cset= ucs2;
+let $coll= ucs2_slovenian_ci; 
+--source suite/funcs_2/include/check_charset_ucs2.inc
+
+let $cset= ucs2;
+let $coll= ucs2_spanish2_ci; 
+--source suite/funcs_2/include/check_charset_ucs2.inc
+
+let $cset= ucs2;
+let $coll= ucs2_spanish_ci; 
+--source suite/funcs_2/include/check_charset_ucs2.inc
+
+let $cset= ucs2;
+let $coll= ucs2_swedish_ci; 
+--source suite/funcs_2/include/check_charset_ucs2.inc
+
+let $cset= ucs2;
+let $coll= ucs2_turkish_ci; 
+--source suite/funcs_2/include/check_charset_ucs2.inc
+
+let $cset= ucs2;
+let $coll= ucs2_unicode_ci; 
+--source suite/funcs_2/include/check_charset_ucs2.inc
+
+}
+
+if ($check_utf8_csets)
+{
+
+# utf8
+
+let $cset= utf8;
+let $coll= utf8_bin; 
+--source suite/funcs_2/include/check_charset_utf8.inc
+
+let $cset= utf8;
+let $coll= utf8_czech_ci; 
+--source suite/funcs_2/include/check_charset_utf8.inc
+
+let $cset= utf8;
+let $coll= utf8_danish_ci; 
+--source suite/funcs_2/include/check_charset_utf8.inc
+
+let $cset= utf8;
+let $coll= utf8_estonian_ci; 
+--source suite/funcs_2/include/check_charset_utf8.inc
+
+let $cset= utf8;
+let $coll= utf8_general_ci; 
+--source suite/funcs_2/include/check_charset_utf8.inc
+
+let $cset= utf8;
+let $coll= utf8_hungarian_ci; 
+--source suite/funcs_2/include/check_charset_utf8.inc
+
+let $cset= utf8;
+let $coll= utf8_icelandic_ci; 
+--source suite/funcs_2/include/check_charset_utf8.inc
+
+let $cset= utf8;
+let $coll= utf8_latvian_ci; 
+--source suite/funcs_2/include/check_charset_utf8.inc
+
+let $cset= utf8;
+let $coll= utf8_lithuanian_ci; 
+--source suite/funcs_2/include/check_charset_utf8.inc
+
+let $cset= utf8;
+let $coll= utf8_persian_ci; 
+--source suite/funcs_2/include/check_charset_utf8.inc
+
+let $cset= utf8;
+let $coll= utf8_polish_ci; 
+--source suite/funcs_2/include/check_charset_utf8.inc
+
+let $cset= utf8;
+let $coll= utf8_roman_ci; 
+--source suite/funcs_2/include/check_charset_utf8.inc
+
+let $cset= utf8;
+let $coll= utf8_romanian_ci; 
+--source suite/funcs_2/include/check_charset_utf8.inc
+
+let $cset= utf8;
+let $coll= utf8_slovak_ci; 
+--source suite/funcs_2/include/check_charset_utf8.inc
+
+let $cset= utf8;
+let $coll= utf8_slovenian_ci; 
+--source suite/funcs_2/include/check_charset_utf8.inc
+
+let $cset= utf8;
+let $coll= utf8_spanish2_ci; 
+--source suite/funcs_2/include/check_charset_utf8.inc
+
+let $cset= utf8;
+let $coll= utf8_spanish_ci; 
+--source suite/funcs_2/include/check_charset_utf8.inc
+
+let $cset= utf8;
+let $coll= utf8_swedish_ci; 
+--source suite/funcs_2/include/check_charset_utf8.inc
+
+let $cset= utf8;
+let $coll= utf8_turkish_ci; 
+--source suite/funcs_2/include/check_charset_utf8.inc
+
+let $cset= utf8;
+let $coll= utf8_unicode_ci; 
+--source suite/funcs_2/include/check_charset_utf8.inc
+
+}
+

mysql-test/suite/funcs_2/include/check_charset.inc

@@ -0,0 +1,40 @@
+--disable_warnings
+DROP TABLE IF EXISTS test.t1;
+--enable_warnings
+
+eval SET NAMES $cset;
+
+let $std_cset= 1;
+
+if ($bin_cset)
+{
+ eval CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET $cset) ENGINE=$engine_type CHARACTER SET $cset;
+ let $bin_cset= 0;
+ let $std_cset= 0;
+}
+if ($std_cset)
+{
+ eval CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET $cset COLLATE $coll) ENGINE=$engine_type CHARACTER SET $cset COLLATE $coll;
+}
+
+--replace_column 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 11 # 12 # 13 # 14 # 16 # 17 # 18 #
+SHOW TABLE STATUS LIKE 't1';
+
+--disable_warnings
+--disable_query_log
+let $1= 221;
+while ($1)
+{
+ eval INSERT INTO test.t1 VALUES(CHAR(254-$1));
+ dec $1;
+}
+DELETE FROM test.t1 WHERE CHAR_LENGTH(a) <> 1;
+--enable_query_log
+--enable_warnings
+
+SELECT HEX(ASCII(a)) AS a_ascii, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
+
+--disable_warnings
+DROP TABLE IF EXISTS test.t1;
+--enable_warnings
+

mysql-test/suite/funcs_2/include/check_charset_ucs2.inc

@@ -0,0 +1,22 @@
+--disable_warnings
+DROP TABLE IF EXISTS test.t1;
+DROP DATABASE test;
+eval CREATE DATABASE test CHARACTER SET utf8;
+USE test;
+--enable_warnings
+SET NAMES utf8;
+eval CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=$engine_type CHARACTER SET utf8;
+--replace_column 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 11 # 12 # 13 # 14 # 16 # 17 # 18 #
+SHOW TABLE STATUS LIKE 't1';
+
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+eval LOAD DATA INFILE 
+'$MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
+eval ALTER TABLE test.t1 CHANGE a a CHAR(4) CHARACTER SET $cset COLLATE $coll;
+DELETE FROM test.t1 WHERE CHAR_LENGTH(a) <> 1;
+
+SELECT HEX(ORD(a)) AS a_ord, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
+
+--disable_warnings
+DROP TABLE IF EXISTS test.t1;
+--enable_warnings

mysql-test/suite/funcs_2/include/check_charset_utf8.inc

@@ -0,0 +1,21 @@
+--disable_warnings
+DROP TABLE IF EXISTS test.t1;
+DROP DATABASE test;
+eval CREATE DATABASE test CHARACTER SET $cset;
+USE test;
+--enable_warnings
+#eval SET NAMES $cset;
+eval CREATE TABLE test.t1 (a CHAR(4) CHARACTER SET $cset COLLATE $coll) ENGINE=$engine_type CHARACTER SET $cset COLLATE $coll;
+--replace_column 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 11 # 12 # 13 # 14 # 16 # 17 # 18 #
+SHOW TABLE STATUS LIKE 't1';
+
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+eval LOAD DATA INFILE 
+'$MYSQL_TEST_DIR/suite/funcs_2/data/charset_utf8.txt' INTO TABLE test.t1;
+DELETE FROM test.t1 WHERE CHAR_LENGTH(a) <> 1;
+
+SELECT HEX(ORD(a)) AS a_ord, CHAR_LENGTH(a) AS a_len FROM test.t1 ORDER BY a, ORD(a);
+
+--disable_warnings
+DROP TABLE IF EXISTS test.t1;
+--enable_warnings

mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl

@@ -0,0 +1,60 @@
+#!/usr/bin/perl
+
+#################################################################################
+# Author:  Serge Kozlov								#	
+# Date:    09/21/2005								#
+# Purpose: The script produces a text file ../data/charset_utf8.txt		#
+#	   in UTF8 format. Each line contains one UTF8 character 		#
+#	   between 20 and 07FF							#
+#################################################################################
+
+genfile("../data/charset_utf8.txt", 33, 2047, "utf8");
+genfile(">../data/charset_utf8.txt", 19968, 20479,"utf8");
+
+
+#genfile("../data/charset_utf8.txt", 33, 2047, "utf8");
+
+sub genfile ($$$$)
+{
+    my $fn = shift;
+    my $i_from = shift;
+    my $i_to = shift;
+    my $typ = shift;
+    open F, ">$fn";
+    for ($i = $i_from; $i <= $i_to; $i++)
+    {	
+	if (($i > 32) && ($i < 65533) && ($i != 65279))
+	{
+	    if ($typ eq "utf8")
+	    {
+		if ($i < 128) 
+		{
+		    print F pack("C", $i), "\n";    
+		}
+		elsif (($i > 127) && ($i < 2048))
+		{
+		    $b1 = (($i & 1984) >> 6) + 192;
+		    $b2 = ($i & 63) + 128;	
+		    print F pack("C", $b1);    
+		    print F pack("C", $b2), "\n";    
+		}
+		else
+		{
+		    $b1 = (($i & 61440) >> 12) + 224;
+		    $b2 = (($i & 4032) >> 6) + 128;
+		    $b3 = ($i & 63) + 128;
+		    print F pack("C", $b1);    
+		    print F pack("C", $b2);    
+		    print F pack("C", $b3), "\n";    
+	        }
+	    }
+	    elsif ($typ eq "ucs2") 
+	    {
+		print F pack("C", 0);    
+		print F pack("C", $i);    
+		print F pack("C", 0), "\n";    
+	    }
+	}
+    }
+    close F;
+}

mysql-test/suite/funcs_2/readme.txt

@@ -0,0 +1,22 @@
+funcs_2 suite
+=============
+
+Serge Kozlov 11/17/05
+---------------------
+
+Currently the suite covers testing all combination of charsets/collations
+for MySQL 5.0 only. All cases separated by 4 test scenarios (by engines): 
+ - innodb_charset.test;
+ - memory_charset.test;
+ - myisam_charset.test;
+ - ndb_charset.test;
+Note: if you use standard binary distributions or compile from source tree
+without cluster support then ndb_charset.test will be skipped. Use 
+BUILD/compile-*****-max shellscript for compilation with ndb support or
+download MAX package.
+
+Before running the suite under Windows/cygwin make sure that all files
+inside it converted to unix text format.
+
+Whole suite can be running by following command line:
+./mysql-test-run.pl --suite=funcs_2

mysql-test/suite/funcs_2/t/innodb_charset.test

@@ -0,0 +1,11 @@
+#################################################################################
+# Author:  Serge Kozlov								#
+# Date:    09/21/2005								#
+# Purpose: Testing the charsets for InnoDB engine				#
+#################################################################################
+
+--source include/have_innodb.inc
+
+let $engine_type= InnoDB;
+--source suite/funcs_2/charset/charset_master.test
+

mysql-test/suite/funcs_2/t/memory_charset.test

@@ -0,0 +1,9 @@
+#################################################################################
+# Author:  Serge Kozlov								#
+# Date:    09/21/2005								#
+# Purpose: Testing the charsets for Memory engine				#
+#################################################################################
+
+let $engine_type= Memory;
+--source suite/funcs_2/charset/charset_master.test
+

mysql-test/suite/funcs_2/t/myisam_charset.test

@@ -0,0 +1,9 @@
+#################################################################################
+# Author:  Serge Kozlov								#
+# Date:    09/21/2005								#
+# Purpose: Testing the charsets for MyISAM engine				#
+#################################################################################
+
+let $engine_type= MyISAM;
+--source suite/funcs_2/charset/charset_master.test
+

mysql-test/suite/funcs_2/t/ndb_charset.test

@@ -0,0 +1,12 @@
+#################################################################################
+# Author:  Serge Kozlov								#
+# Date:    09/21/2005								#
+# Purpose: Testing the charsets for NDB engine					#
+#################################################################################
+
+--source include/have_ndb.inc
+--source include/not_embedded.inc
+
+let $engine_type= NDB;
+--source suite/funcs_2/charset/charset_master.test
+