Merge abarkov@bk-internal:/home/bk/mysql-5.0

into  mysql.com:/usr/home/bar/mysql-5.0.char1


sql/sql_yacc.yy:
  Auto merged

1 files changed, 22 insertions, 12 deletions

diff --git a/mysql-test/t/ctype_utf8.test b/mysql-test/t/ctype_utf8.test
index d186ca8a1f6..8f695ef315c 100644
--- a/mysql-test/t/ctype_utf8.test
+++ b/mysql-test/t/ctype_utf8.test
@@ -871,22 +871,32 @@ DROP TABLE t1;
 #
 set names utf8;
 # correct value
-select hex(char(1));
-select char(0xd1,0x8f);
-select char(0xd18f);
-select char(53647);
+select hex(char(1 using utf8));
+select char(0xd1,0x8f using utf8);
+select char(0xd18f using utf8);
+select char(53647 using utf8);
 # incorrect value: return with warning
-select char(0xff,0x8f);
+select char(0xff,0x8f using utf8);
 # incorrect value in strict mode: return NULL with "Error" level warning
 set sql_mode=traditional;
-select char(0xff,0x8f);
-select convert(char(0xff,0x8f) using utf8);
-select char(195);
-select convert(char(195) using utf8);
-select char(196);
-select convert(char(196) using utf8);
+select char(0xff,0x8f using utf8);
+select char(195 using utf8);
+select char(196 using utf8);
+select char(2557 using utf8);
+
+#
+# Check convert + char + using
+#
+select hex(convert(char(2557 using latin1) using utf8));
+
+#
+# char() without USING returns "binary" by default, any argument is ok
+#
+select hex(char(195));
+select hex(char(196));
 select hex(char(2557));
-select hex(convert(char(2557) using utf8));
+
+
 
 #
 # Bug#12891: UNION doesn't return DISTINCT result for multi-byte characters