Merge skozlov@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl

into  mysql.com:/home/ksm/commits/mysql-5.1-new-rpl

mysql-test/r/ctype_big5.result

@@ -193,11 +193,13 @@ select hex(convert(_big5 0xC84041 using ucs2));
 hex(convert(_big5 0xC84041 using ucs2))
 003F0041
 End of 4.1 tests
+set names big5;
 create table t1 (a blob);
 insert into t1 values (0xEE00);
+select * into outfile 'test/t1.txt' from t1;
 delete from t1;
-select hex(load_file('test/t1.txt'));
-hex(load_file('test/t1.txt'))
+select hex(load_file('MYSQLTEST_VARDIR/master-data/test/t1.txt'));;
+hex(load_file('MYSQLTEST_VARDIR/master-data/test/t1.txt'))
 5CEE5C300A
 load data infile 't1.txt' into table t1;
 select hex(a) from t1;

mysql-test/r/ctype_latin1.result

@@ -405,3 +405,7 @@ i
 1
 2
 DROP TABLE `abc˙def`;
+select hex(cast(_ascii 0x7f as char(1) character set latin1));
+hex(cast(_ascii 0x7f as char(1) character set latin1))
+7F
+End of 5.0 tests

mysql-test/r/ctype_ucs.result

@@ -886,4 +886,14 @@ collation(group_concat(a separator ','))
 latin1_swedish_ci
 drop table t1;
 set names latin1;
+create table t1 (s1 char(1) character set ascii, s2 char(1) character set ucs2);
+insert into t1 (s1) values (0x7f);
+update t1 set s2 = s1;
+select hex(s2) from t1;
+hex(s2)
+007F
+select hex(convert(s1 using latin1)) from t1;
+hex(convert(s1 using latin1))
+7F
+drop table t1;
 End of 5.0 tests

mysql-test/t/ctype_big5.test

@@ -68,15 +68,16 @@ select hex(convert(_big5 0xC84041 using ucs2));
 #
 # Bug#26711 "binary content 0x00 sometimes becomes 0x5C 0x00 after dump/load"
 #
+set names big5;
 create table t1 (a blob);
 insert into t1 values (0xEE00);
---exec $MYSQL_DUMP --default-character-set=big5 -T $MYSQLTEST_VARDIR/master-data/test test t1
+select * into outfile 'test/t1.txt' from t1;
 delete from t1;
-select hex(load_file('test/t1.txt'));
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--eval select hex(load_file('$MYSQLTEST_VARDIR/master-data/test/t1.txt'));
 load data infile 't1.txt' into table t1;
 select hex(a) from t1;
 --exec rm $MYSQLTEST_VARDIR/master-data/test/t1.txt
---exec rm $MYSQLTEST_VARDIR/master-data/test/t1.sql
 drop table t1;
 
 --echo End of 5.0 tests

mysql-test/t/ctype_latin1.test

@@ -121,3 +121,9 @@ INSERT INTO abc
 SELECT * FROM `abc˙def`;
 SELECT * FROM abc˙def;
 DROP TABLE `abc˙def`;
+#
+# Bug#29499 Converting 'del' from ascii to Unicode results in 'question mark'
+#
+select hex(cast(_ascii 0x7f as char(1) character set latin1));
+
+--echo End of 5.0 tests

mysql-test/t/ctype_ucs.test

@@ -612,4 +612,14 @@ select collation(group_concat(a separator ',')) from t1;
 drop table t1;
 set names latin1;
 
+#
+# Bug#29499 Converting 'del' from ascii to Unicode results in 'question mark'
+#
+create table t1 (s1 char(1) character set ascii, s2 char(1) character set ucs2);
+insert into t1 (s1) values (0x7f);
+update t1 set s2 = s1;
+select hex(s2) from t1;
+select hex(convert(s1 using latin1)) from t1;
+drop table t1;
+
 --echo End of 5.0 tests

mysql-test/t/disabled.def

@@ -38,7 +38,6 @@ rpl_ndb_mix_innodb       : BUG#28123 rpl_ndb_mix_innodb.test casue slave to core
 rpl_ndb_ctype_ucs2_def   : BUG#27404 util thd mysql_parse sig11 when mysqld default multibyte charset
 
 rpl_invoked_features     : BUG#29020 2007-06-21 Lars Non-deterministic test case
-ctype_big5               : BUG#26711 2007-06-21 Lars Test has never worked on Double Whopper
 
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
 #ndb_binlog_ddl_multi     : BUG#18976 2006-04-10 kent    CRBR: multiple binlog, second binlog may miss schema log events

scripts/make_binary_distribution.sh

@@ -312,6 +312,7 @@ MCP mysql-test/t/*.def $BASE/mysql-test/t
 MCP mysql-test/std_data/*.dat mysql-test/std_data/*.frm \
     mysql-test/std_data/*.MYD mysql-test/std_data/*.MYI \
     mysql-test/std_data/*.pem mysql-test/std_data/Moscow_leap \
+    mysql-test/std_data/Index.xml \
     mysql-test/std_data/des_key_file mysql-test/std_data/*.*001 \
     mysql-test/std_data/*.cnf mysql-test/std_data/*.MY* \
     $BASE/mysql-test/std_data

sql/share/charsets/ascii.xml

@@ -97,7 +97,7 @@
 0040 0041 0042 0043 0044 0045 0046 0047 0048 0049 004A 004B 004C 004D 004E 004F
 0050 0051 0052 0053 0054 0055 0056 0057 0058 0059 005A 005B 005C 005D 005E 005F
 0060 0061 0062 0063 0064 0065 0066 0067 0068 0069 006A 006B 006C 006D 006E 006F
-0070 0071 0072 0073 0074 0075 0076 0077 0078 0079 007A 007B 007C 007D 007E 0000
+0070 0071 0072 0073 0074 0075 0076 0077 0078 0079 007A 007B 007C 007D 007E 007F
 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000

strings/ctype-extra.c

@@ -908,7 +908,7 @@ uint16 to_uni_ascii_general_ci[] = {
 0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
 0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
 0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x0000,
+0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
@@ -4589,7 +4589,7 @@ uint16 to_uni_ascii_bin[] = {
 0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
 0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
 0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x0000,
+0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,