summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/include/innodb_encrypt_log.combinations7
-rw-r--r--mysql-test/include/innodb_encrypt_log.inc4
-rw-r--r--mysql-test/r/ctype_big5.result130
-rw-r--r--mysql-test/r/ctype_cp1251.result2
-rw-r--r--mysql-test/r/ctype_cp932_binlog_stm.result128
-rw-r--r--mysql-test/r/ctype_eucjpms.result132
-rw-r--r--mysql-test/r/ctype_euckr.result128
-rw-r--r--mysql-test/r/ctype_gb2312.result128
-rw-r--r--mysql-test/r/ctype_gbk.result130
-rw-r--r--mysql-test/r/ctype_sjis.result128
-rw-r--r--mysql-test/r/ctype_ujis.result132
-rw-r--r--mysql-test/r/ctype_utf32.result2
-rw-r--r--mysql-test/r/ctype_utf8.result33
-rw-r--r--mysql-test/r/ctype_utf8mb4.result8
-rw-r--r--mysql-test/r/ctype_utf8mb4_heap.result8
-rw-r--r--mysql-test/r/ctype_utf8mb4_innodb.result8
-rw-r--r--mysql-test/r/ctype_utf8mb4_myisam.result8
-rw-r--r--mysql-test/r/gis.result4
-rw-r--r--mysql-test/suite/innodb/r/innodb-index-online,crypt.rdiff20
-rw-r--r--mysql-test/suite/innodb/r/innodb-index-online.result111
-rw-r--r--mysql-test/suite/innodb/r/innodb-table-online,crypt.rdiff20
-rw-r--r--mysql-test/suite/innodb/r/innodb-table-online.result105
-rw-r--r--mysql-test/suite/innodb/t/innodb-index-online.opt2
-rw-r--r--mysql-test/suite/innodb/t/innodb-index-online.test77
-rw-r--r--mysql-test/suite/innodb/t/innodb-table-online-master.opt2
-rw-r--r--mysql-test/suite/innodb/t/innodb-table-online.test80
-rw-r--r--mysql-test/suite/jp/r/jp_convert_ucs2.result42
-rw-r--r--mysql-test/suite/jp/r/jp_convert_ujis.result202
-rw-r--r--mysql-test/suite/jp/r/jp_convert_utf8.result256
-rw-r--r--mysql-test/suite/mariabackup/apply-log-only-incr.result29
-rw-r--r--mysql-test/suite/mariabackup/apply-log-only-incr.test63
-rw-r--r--mysql-test/suite/mariabackup/apply-log-only.result10
-rw-r--r--mysql-test/suite/mariabackup/apply-log-only.test25
-rw-r--r--mysql-test/t/ctype_utf8.test12
34 files changed, 1342 insertions, 834 deletions
diff --git a/mysql-test/include/innodb_encrypt_log.combinations b/mysql-test/include/innodb_encrypt_log.combinations
new file mode 100644
index 00000000000..fd21a57c3c2
--- /dev/null
+++ b/mysql-test/include/innodb_encrypt_log.combinations
@@ -0,0 +1,7 @@
+[crypt]
+innodb_encrypt_log=ON
+innodb_encryption_rotate_key_age=1
+plugin_load_add=$DEBUG_KEY_MANAGEMENT_SO
+
+[clear]
+skip_innodb_encrypt_log
diff --git a/mysql-test/include/innodb_encrypt_log.inc b/mysql-test/include/innodb_encrypt_log.inc
new file mode 100644
index 00000000000..5beebeae81f
--- /dev/null
+++ b/mysql-test/include/innodb_encrypt_log.inc
@@ -0,0 +1,4 @@
+# The goal of including this file is to enable innodb_encrypt_log combinations
+# (see include/innodb_encrypt_log.combinations)
+
+--source include/have_innodb.inc
diff --git a/mysql-test/r/ctype_big5.result b/mysql-test/r/ctype_big5.result
index 3c184c8aec9..2db4da51667 100644
--- a/mysql-test/r/ctype_big5.result
+++ b/mysql-test/r/ctype_big5.result
@@ -516,7 +516,7 @@ E5ABBA
drop table t1;
select hex(convert(_big5 0xC84041 using ucs2));
hex(convert(_big5 0xC84041 using ucs2))
-NULL
+003F0041
Warnings:
Warning 1977 Cannot convert 'big5' character 0xC840 to 'ucs2'
End of 4.1 tests
@@ -796,69 +796,69 @@ A2C1
A2C2
Warnings:
Warning 1977 Cannot convert 'big5' character 0xA3C0 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3C0 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3C1 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3C1 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3C2 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3C2 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3C3 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3C3 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3C4 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3C4 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3C5 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3C5 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3C6 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3C6 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3C7 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3C7 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3C8 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3C8 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3C9 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3C9 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3CA to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3CA to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3CB to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3CB to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3CC to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3CC to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3CD to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3CD to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3CE to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3CE to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3CF to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3CF to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3D0 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3D0 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3D1 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3D1 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3D2 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3D2 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3D3 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3D3 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3D4 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3D4 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3D5 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3D5 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3D6 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3D6 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3D7 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3D7 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3D8 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3D8 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3D9 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3D9 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3DA to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3DA to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3DB to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3DB to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3DC to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3DC to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3DD to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3DD to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3DE to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3DE to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3DF to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3DF to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3E0 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3E1 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3E2 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3E3 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3E4 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3E5 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3E6 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3E7 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3E8 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3E9 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3EA to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3EB to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3EC to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3ED to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3EE to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3EF to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3F0 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3F1 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3F2 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3F3 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3F4 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3F5 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3F6 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3F7 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3F8 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3F9 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3FA to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3FB to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3FC to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3FD to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3FE to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xC7FD to 'utf8'
SELECT * FROM t1
WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <>
HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
@@ -875,69 +875,69 @@ C7DA
C7DB
Warnings:
Warning 1977 Cannot convert 'big5' character 0xA3C0 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3C0 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3C1 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3C1 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3C2 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3C2 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3C3 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3C3 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3C4 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3C4 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3C5 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3C5 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3C6 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3C6 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3C7 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3C7 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3C8 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3C8 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3C9 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3C9 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3CA to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3CA to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3CB to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3CB to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3CC to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3CC to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3CD to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3CD to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3CE to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3CE to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3CF to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3CF to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3D0 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3D0 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3D1 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3D1 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3D2 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3D2 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3D3 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3D3 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3D4 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3D4 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3D5 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3D5 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3D6 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3D6 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3D7 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3D7 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3D8 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3D8 to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3D9 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3D9 to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3DA to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3DA to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3DB to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3DB to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3DC to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3DC to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3DD to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3DD to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3DE to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3DE to 'utf8'
+Warning 1977 Cannot convert 'big5' character 0xA3DF to 'utf8'
Warning 1977 Cannot convert 'big5' character 0xA3DF to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3E0 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3E1 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3E2 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3E3 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3E4 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3E5 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3E6 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3E7 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3E8 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3E9 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3EA to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3EB to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3EC to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3ED to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3EE to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3EF to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3F0 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3F1 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3F2 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3F3 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3F4 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3F5 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3F6 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3F7 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3F8 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3F9 to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3FA to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3FB to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3FC to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3FD to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xA3FE to 'utf8'
-Warning 1977 Cannot convert 'big5' character 0xC7FD to 'utf8'
DROP TABLE t1;
#
# End of 5.5 tests
diff --git a/mysql-test/r/ctype_cp1251.result b/mysql-test/r/ctype_cp1251.result
index 037f3cb07e3..e0e6a5cfd95 100644
--- a/mysql-test/r/ctype_cp1251.result
+++ b/mysql-test/r/ctype_cp1251.result
@@ -281,7 +281,7 @@ chr upper lower utf8 roundtrip issafe
95 95 95 E280A2 95
96 96 96 E28093 96
97 97 97 E28094 97
-98 98 98 NULL NULL Round trip unsafe
+98 98 98 3F 3F Round trip unsafe
99 99 99 E284A2 99
9A 9A 9A D199 9A
9B 9B 9B E280BA 9B
diff --git a/mysql-test/r/ctype_cp932_binlog_stm.result b/mysql-test/r/ctype_cp932_binlog_stm.result
index b958933cd12..f49400b63ff 100644
--- a/mysql-test/r/ctype_cp932_binlog_stm.result
+++ b/mysql-test/r/ctype_cp932_binlog_stm.result
@@ -388,138 +388,138 @@ code a
81F0
Warnings:
Warning 1977 Cannot convert 'cp932' character 0x81AD to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81AD to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81AE to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81AE to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81AF to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81AF to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81B0 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81B0 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81B1 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81B1 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81B2 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81B2 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81B3 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81B3 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81B4 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81B4 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81B5 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81B5 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81B6 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81B6 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81B7 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81B7 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81C0 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81C0 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81C1 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81C1 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81C2 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81C2 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81C3 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81C3 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81C4 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81C4 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81C5 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81C5 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81C6 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81C6 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81C7 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81C7 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81CF to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81CF to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81D0 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81D0 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81D1 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81D1 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81D2 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81D2 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81D3 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81D3 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81D4 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81D4 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81D5 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81D5 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81D6 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81D6 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81D7 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81D7 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81D8 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81D8 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81D9 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81D9 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81E9 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81E9 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81EA to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81EA to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x81EB to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x81EC to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x81ED to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x81EE to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x81EF to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x81F8 to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x81F9 to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x81FA to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x81FB to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x8240 to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x8241 to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x8242 to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x8243 to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x8244 to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x8245 to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x8246 to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x8247 to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x8248 to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x8249 to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x824A to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x824B to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x824C to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x824D to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x824E to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x8259 to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x825A to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x825B to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x825C to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x825D to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x825E to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x825F to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x827A to 'utf8'
SELECT * FROM t1
WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <>
HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
code a
Warnings:
Warning 1977 Cannot convert 'cp932' character 0x81AD to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81AD to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81AE to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81AE to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81AF to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81AF to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81B0 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81B0 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81B1 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81B1 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81B2 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81B2 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81B3 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81B3 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81B4 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81B4 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81B5 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81B5 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81B6 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81B6 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81B7 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81B7 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81C0 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81C0 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81C1 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81C1 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81C2 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81C2 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81C3 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81C3 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81C4 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81C4 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81C5 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81C5 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81C6 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81C6 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81C7 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81C7 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81CF to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81CF to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81D0 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81D0 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81D1 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81D1 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81D2 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81D2 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81D3 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81D3 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81D4 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81D4 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81D5 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81D5 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81D6 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81D6 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81D7 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81D7 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81D8 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81D8 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81D9 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81D9 to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81E9 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81E9 to 'utf8'
+Warning 1977 Cannot convert 'cp932' character 0x81EA to 'utf8'
Warning 1977 Cannot convert 'cp932' character 0x81EA to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x81EB to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x81EC to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x81ED to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x81EE to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x81EF to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x81F8 to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x81F9 to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x81FA to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x81FB to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x8240 to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x8241 to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x8242 to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x8243 to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x8244 to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x8245 to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x8246 to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x8247 to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x8248 to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x8249 to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x824A to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x824B to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x824C to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x824D to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x824E to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x8259 to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x825A to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x825B to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x825C to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x825D to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x825E to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x825F to 'utf8'
-Warning 1977 Cannot convert 'cp932' character 0x827A to 'utf8'
#
# WL#3090 Japanese Character Set adjustments
# Test cp932->Unicode conversion
diff --git a/mysql-test/r/ctype_eucjpms.result b/mysql-test/r/ctype_eucjpms.result
index afca918abc1..bc7b4b9ef9d 100644
--- a/mysql-test/r/ctype_eucjpms.result
+++ b/mysql-test/r/ctype_eucjpms.result
@@ -9991,12 +9991,12 @@ a hex(b) c
DROP TABLE t1;
select hex(convert(_eucjpms 0xA5FE41 using ucs2));
hex(convert(_eucjpms 0xA5FE41 using ucs2))
-NULL
+003F0041
Warnings:
Warning 1977 Cannot convert 'eucjpms' character 0xA5FE to 'ucs2'
select hex(convert(_eucjpms 0x8FABF841 using ucs2));
hex(convert(_eucjpms 0x8FABF841 using ucs2))
-NULL
+003F0041
Warnings:
Warning 1977 Cannot convert 'eucjpms' character 0x8FABF8 to 'ucs2'
set global LC_TIME_NAMES=convert((convert((0x63) using eucjpms)) using utf8);
@@ -10566,69 +10566,69 @@ code a
8FAABC 帳
Warnings:
Warning 1977 Cannot convert 'eucjpms' character 0xA2AF to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2AF to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2B0 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2B0 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2B1 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2B1 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2B2 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2B2 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2B3 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2B3 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2B4 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2B4 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2B5 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2B5 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2B6 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2B6 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2B7 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2B7 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2B8 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2B8 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2B9 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2B9 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2C2 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2C2 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2C3 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2C3 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2C4 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2C4 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2C5 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2C5 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2C6 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2C6 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2C7 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2C7 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2C8 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2C8 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2C9 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2C9 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2D1 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2D1 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2D2 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2D2 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2D3 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2D3 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2D4 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2D4 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2D5 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2D5 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2D6 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2D6 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2D7 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2D7 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2D8 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2D8 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2D9 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2D9 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2DA to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2DA to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2DB to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2DB to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2EB to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2EB to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2EC to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2EC to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA2ED to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA2EE to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA2EF to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA2F0 to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA2F1 to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA2FA to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA2FB to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA2FC to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA2FD to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3A1 to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3A2 to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3A3 to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3A4 to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3A5 to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3A6 to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3A7 to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3A8 to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3A9 to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3AA to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3AB to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3AC to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3AD to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3AE to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3AF to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3BA to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3BB to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3BC to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3BD to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3BE to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3BF to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3C0 to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3DB to 'utf8'
SELECT * FROM t1
WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <>
HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
@@ -10637,69 +10637,69 @@ code a
8FABB9 乃
Warnings:
Warning 1977 Cannot convert 'eucjpms' character 0xA2AF to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2AF to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2B0 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2B0 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2B1 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2B1 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2B2 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2B2 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2B3 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2B3 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2B4 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2B4 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2B5 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2B5 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2B6 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2B6 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2B7 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2B7 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2B8 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2B8 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2B9 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2B9 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2C2 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2C2 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2C3 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2C3 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2C4 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2C4 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2C5 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2C5 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2C6 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2C6 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2C7 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2C7 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2C8 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2C8 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2C9 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2C9 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2D1 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2D1 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2D2 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2D2 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2D3 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2D3 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2D4 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2D4 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2D5 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2D5 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2D6 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2D6 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2D7 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2D7 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2D8 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2D8 to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2D9 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2D9 to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2DA to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2DA to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2DB to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2DB to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2EB to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2EB to 'utf8'
+Warning 1977 Cannot convert 'eucjpms' character 0xA2EC to 'utf8'
Warning 1977 Cannot convert 'eucjpms' character 0xA2EC to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA2ED to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA2EE to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA2EF to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA2F0 to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA2F1 to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA2FA to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA2FB to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA2FC to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA2FD to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3A1 to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3A2 to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3A3 to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3A4 to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3A5 to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3A6 to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3A7 to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3A8 to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3A9 to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3AA to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3AB to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3AC to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3AD to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3AE to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3AF to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3BA to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3BB to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3BC to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3BD to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3BE to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3BF to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3C0 to 'utf8'
-Warning 1977 Cannot convert 'eucjpms' character 0xA3DB to 'utf8'
#
# WL#3090 Japanese Character Set adjustments
# Test sjis->Unicode conversion
diff --git a/mysql-test/r/ctype_euckr.result b/mysql-test/r/ctype_euckr.result
index 8069ef54bb1..3fb6f98b2eb 100644
--- a/mysql-test/r/ctype_euckr.result
+++ b/mysql-test/r/ctype_euckr.result
@@ -24714,69 +24714,69 @@ code a
A1CA
Warnings:
Warning 1977 Cannot convert 'euckr' character 0xA2E8 to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2E8 to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2E9 to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2E9 to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2EA to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2EA to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2EB to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2EB to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2EC to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2EC to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2ED to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2ED to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2EE to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2EE to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2EF to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2EF to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2F0 to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2F0 to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2F1 to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2F1 to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2F2 to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2F2 to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2F3 to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2F3 to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2F4 to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2F4 to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2F5 to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2F5 to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2F6 to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2F6 to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2F7 to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2F7 to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2F8 to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2F8 to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2F9 to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2F9 to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2FA to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2FA to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2FB to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2FB to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2FC to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2FC to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2FD to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2FD to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2FE to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2FE to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA5AB to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA5AB to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA5AC to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA5AC to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA5AD to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA5AD to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA5AE to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA5AE to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA5AF to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA5AF to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA5BA to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA5BA to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA5BB to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA5BB to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA5BC to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA5BC to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA5BD to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA5BD to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5BE to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5BF to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5C0 to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5D9 to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5DA to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5DB to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5DC to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5DD to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5DE to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5DF to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5E0 to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5F9 to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5FA to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5FB to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5FC to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5FD to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5FE to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6E5 to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6E6 to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6E7 to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6E8 to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6E9 to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6EA to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6EB to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6EC to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6ED to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6EE to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6EF to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6F0 to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6F1 to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6F2 to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6F3 to 'utf8'
SELECT * FROM t1
WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <>
HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
@@ -24810,69 +24810,69 @@ A8E6
A9A2
Warnings:
Warning 1977 Cannot convert 'euckr' character 0xA2E8 to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2E8 to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2E9 to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2E9 to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2EA to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2EA to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2EB to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2EB to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2EC to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2EC to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2ED to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2ED to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2EE to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2EE to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2EF to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2EF to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2F0 to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2F0 to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2F1 to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2F1 to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2F2 to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2F2 to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2F3 to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2F3 to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2F4 to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2F4 to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2F5 to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2F5 to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2F6 to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2F6 to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2F7 to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2F7 to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2F8 to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2F8 to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2F9 to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2F9 to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2FA to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2FA to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2FB to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2FB to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2FC to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2FC to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2FD to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2FD to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA2FE to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA2FE to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA5AB to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA5AB to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA5AC to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA5AC to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA5AD to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA5AD to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA5AE to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA5AE to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA5AF to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA5AF to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA5BA to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA5BA to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA5BB to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA5BB to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA5BC to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA5BC to 'utf8'
+Warning 1977 Cannot convert 'euckr' character 0xA5BD to 'utf8'
Warning 1977 Cannot convert 'euckr' character 0xA5BD to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5BE to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5BF to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5C0 to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5D9 to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5DA to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5DB to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5DC to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5DD to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5DE to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5DF to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5E0 to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5F9 to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5FA to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5FB to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5FC to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5FD to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA5FE to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6E5 to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6E6 to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6E7 to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6E8 to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6E9 to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6EA to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6EB to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6EC to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6ED to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6EE to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6EF to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6F0 to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6F1 to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6F2 to 'utf8'
-Warning 1977 Cannot convert 'euckr' character 0xA6F3 to 'utf8'
DROP TABLE t1;
#
# End of 5.5 tests
diff --git a/mysql-test/r/ctype_gb2312.result b/mysql-test/r/ctype_gb2312.result
index cef286b0aab..c3c2eee9b1c 100644
--- a/mysql-test/r/ctype_gb2312.result
+++ b/mysql-test/r/ctype_gb2312.result
@@ -742,69 +742,69 @@ A2FB
A2FC
Warnings:
Warning 1977 Cannot convert 'gb2312' character 0xA2A1 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2A1 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2A2 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2A2 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2A3 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2A3 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2A4 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2A4 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2A5 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2A5 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2A6 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2A6 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2A7 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2A7 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2A8 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2A8 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2A9 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2A9 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2AA to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2AA to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2AB to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2AB to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2AC to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2AC to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2AD to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2AD to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2AE to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2AE to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2AF to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2AF to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2B0 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2B0 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2E3 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2E3 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2E4 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2E4 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2EF to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2EF to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2F0 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2F0 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2FD to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2FD to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2FE to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2FE to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA4F4 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA4F4 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA4F5 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA4F5 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA4F6 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA4F6 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA4F7 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA4F7 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA4F8 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA4F8 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA4F9 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA4F9 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA4FA to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA4FA to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA4FB to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA4FB to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA4FC to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA4FC to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA4FD to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA4FD to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA4FE to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA5F7 to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA5F8 to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA5F9 to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA5FA to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA5FB to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA5FC to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA5FD to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA5FE to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6B9 to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6BA to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6BB to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6BC to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6BD to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6BE to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6BF to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6C0 to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6D9 to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6DA to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6DB to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6DC to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6DD to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6DE to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6DF to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6E0 to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6E1 to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6E2 to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6E3 to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6E4 to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6E5 to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6E6 to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6E7 to 'utf8'
SELECT * FROM t1
WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <>
HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
@@ -837,69 +837,69 @@ A8B9 端
A8BA 棚
Warnings:
Warning 1977 Cannot convert 'gb2312' character 0xA2A1 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2A1 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2A2 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2A2 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2A3 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2A3 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2A4 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2A4 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2A5 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2A5 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2A6 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2A6 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2A7 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2A7 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2A8 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2A8 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2A9 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2A9 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2AA to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2AA to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2AB to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2AB to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2AC to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2AC to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2AD to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2AD to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2AE to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2AE to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2AF to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2AF to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2B0 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2B0 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2E3 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2E3 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2E4 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2E4 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2EF to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2EF to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2F0 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2F0 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2FD to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2FD to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA2FE to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA2FE to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA4F4 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA4F4 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA4F5 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA4F5 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA4F6 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA4F6 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA4F7 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA4F7 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA4F8 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA4F8 to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA4F9 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA4F9 to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA4FA to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA4FA to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA4FB to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA4FB to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA4FC to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA4FC to 'utf8'
+Warning 1977 Cannot convert 'gb2312' character 0xA4FD to 'utf8'
Warning 1977 Cannot convert 'gb2312' character 0xA4FD to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA4FE to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA5F7 to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA5F8 to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA5F9 to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA5FA to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA5FB to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA5FC to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA5FD to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA5FE to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6B9 to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6BA to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6BB to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6BC to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6BD to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6BE to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6BF to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6C0 to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6D9 to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6DA to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6DB to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6DC to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6DD to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6DE to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6DF to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6E0 to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6E1 to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6E2 to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6E3 to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6E4 to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6E5 to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6E6 to 'utf8'
-Warning 1977 Cannot convert 'gb2312' character 0xA6E7 to 'utf8'
DROP TABLE t1;
#
# End of 5.5 tests
diff --git a/mysql-test/r/ctype_gbk.result b/mysql-test/r/ctype_gbk.result
index 8e16320b9df..a6cea80fef5 100644
--- a/mysql-test/r/ctype_gbk.result
+++ b/mysql-test/r/ctype_gbk.result
@@ -463,7 +463,7 @@ A3A0
DROP TABLE t1;
select hex(convert(_gbk 0xA14041 using ucs2));
hex(convert(_gbk 0xA14041 using ucs2))
-NULL
+003F0041
Warnings:
Warning 1977 Cannot convert 'gbk' character 0xA140 to 'ucs2'
create table t1 (c1 text not null, c2 text not null) character set gbk;
@@ -774,69 +774,69 @@ A2FB
A2FC
Warnings:
Warning 1977 Cannot convert 'gbk' character 0xA140 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA140 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA141 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA141 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA142 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA142 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA143 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA143 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA144 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA144 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA145 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA145 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA146 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA146 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA147 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA147 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA148 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA148 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA149 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA149 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA14A to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA14A to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA14B to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA14B to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA14C to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA14C to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA14D to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA14D to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA14E to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA14E to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA14F to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA14F to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA150 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA150 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA151 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA151 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA152 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA152 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA153 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA153 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA154 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA154 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA155 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA155 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA156 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA156 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA157 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA157 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA158 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA158 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA159 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA159 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA15A to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA15A to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA15B to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA15B to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA15C to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA15C to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA15D to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA15D to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA15E to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA15E to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA15F to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA15F to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA160 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA161 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA162 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA163 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA164 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA165 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA166 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA167 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA168 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA169 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA16A to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA16B to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA16C to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA16D to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA16E to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA16F to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA170 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA171 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA172 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA173 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA174 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA175 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA176 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA177 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA178 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA179 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA17A to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA17B to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA17C to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA17D to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA17E to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA180 to 'utf8'
SELECT * FROM t1
WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <>
HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
@@ -871,69 +871,69 @@ A8BD
A8BE
Warnings:
Warning 1977 Cannot convert 'gbk' character 0xA140 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA140 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA141 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA141 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA142 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA142 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA143 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA143 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA144 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA144 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA145 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA145 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA146 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA146 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA147 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA147 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA148 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA148 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA149 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA149 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA14A to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA14A to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA14B to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA14B to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA14C to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA14C to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA14D to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA14D to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA14E to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA14E to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA14F to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA14F to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA150 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA150 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA151 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA151 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA152 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA152 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA153 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA153 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA154 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA154 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA155 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA155 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA156 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA156 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA157 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA157 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA158 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA158 to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA159 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA159 to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA15A to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA15A to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA15B to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA15B to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA15C to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA15C to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA15D to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA15D to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA15E to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA15E to 'utf8'
+Warning 1977 Cannot convert 'gbk' character 0xA15F to 'utf8'
Warning 1977 Cannot convert 'gbk' character 0xA15F to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA160 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA161 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA162 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA163 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA164 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA165 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA166 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA167 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA168 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA169 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA16A to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA16B to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA16C to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA16D to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA16E to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA16F to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA170 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA171 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA172 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA173 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA174 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA175 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA176 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA177 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA178 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA179 to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA17A to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA17B to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA17C to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA17D to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA17E to 'utf8'
-Warning 1977 Cannot convert 'gbk' character 0xA180 to 'utf8'
DROP TABLE t1;
#
# End of 5.5 tests
diff --git a/mysql-test/r/ctype_sjis.result b/mysql-test/r/ctype_sjis.result
index 756e7a11d93..c19a0008e11 100644
--- a/mysql-test/r/ctype_sjis.result
+++ b/mysql-test/r/ctype_sjis.result
@@ -663,138 +663,138 @@ code a
81F0
Warnings:
Warning 1977 Cannot convert 'sjis' character 0x81AD to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81AD to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81AE to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81AE to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81AF to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81AF to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81B0 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81B0 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81B1 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81B1 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81B2 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81B2 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81B3 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81B3 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81B4 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81B4 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81B5 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81B5 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81B6 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81B6 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81B7 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81B7 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81C0 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81C0 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81C1 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81C1 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81C2 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81C2 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81C3 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81C3 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81C4 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81C4 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81C5 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81C5 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81C6 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81C6 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81C7 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81C7 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81CF to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81CF to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81D0 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81D0 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81D1 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81D1 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81D2 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81D2 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81D3 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81D3 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81D4 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81D4 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81D5 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81D5 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81D6 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81D6 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81D7 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81D7 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81D8 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81D8 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81D9 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81D9 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81E9 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81E9 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81EA to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81EA to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x81EB to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x81EC to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x81ED to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x81EE to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x81EF to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x81F8 to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x81F9 to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x81FA to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x81FB to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x8240 to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x8241 to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x8242 to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x8243 to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x8244 to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x8245 to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x8246 to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x8247 to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x8248 to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x8249 to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x824A to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x824B to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x824C to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x824D to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x824E to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x8259 to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x825A to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x825B to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x825C to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x825D to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x825E to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x825F to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x827A to 'utf8'
SELECT * FROM t1
WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <>
HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
code a
Warnings:
Warning 1977 Cannot convert 'sjis' character 0x81AD to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81AD to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81AE to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81AE to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81AF to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81AF to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81B0 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81B0 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81B1 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81B1 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81B2 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81B2 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81B3 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81B3 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81B4 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81B4 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81B5 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81B5 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81B6 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81B6 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81B7 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81B7 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81C0 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81C0 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81C1 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81C1 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81C2 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81C2 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81C3 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81C3 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81C4 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81C4 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81C5 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81C5 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81C6 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81C6 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81C7 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81C7 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81CF to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81CF to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81D0 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81D0 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81D1 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81D1 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81D2 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81D2 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81D3 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81D3 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81D4 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81D4 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81D5 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81D5 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81D6 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81D6 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81D7 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81D7 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81D8 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81D8 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81D9 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81D9 to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81E9 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81E9 to 'utf8'
+Warning 1977 Cannot convert 'sjis' character 0x81EA to 'utf8'
Warning 1977 Cannot convert 'sjis' character 0x81EA to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x81EB to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x81EC to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x81ED to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x81EE to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x81EF to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x81F8 to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x81F9 to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x81FA to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x81FB to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x8240 to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x8241 to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x8242 to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x8243 to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x8244 to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x8245 to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x8246 to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x8247 to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x8248 to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x8249 to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x824A to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x824B to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x824C to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x824D to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x824E to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x8259 to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x825A to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x825B to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x825C to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x825D to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x825E to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x825F to 'utf8'
-Warning 1977 Cannot convert 'sjis' character 0x827A to 'utf8'
#
# WL#3090 Japanese Character Set adjustments
# Test sjis->Unicode conversion
diff --git a/mysql-test/r/ctype_ujis.result b/mysql-test/r/ctype_ujis.result
index 93a31a2818c..cb9de83fedc 100644
--- a/mysql-test/r/ctype_ujis.result
+++ b/mysql-test/r/ctype_ujis.result
@@ -2481,12 +2481,12 @@ a hex(b) c
DROP TABLE t1;
select hex(convert(_ujis 0xA5FE41 using ucs2));
hex(convert(_ujis 0xA5FE41 using ucs2))
-NULL
+003F0041
Warnings:
Warning 1977 Cannot convert 'ujis' character 0xA5FE to 'ucs2'
select hex(convert(_ujis 0x8FABF841 using ucs2));
hex(convert(_ujis 0x8FABF841 using ucs2))
-NULL
+003F0041
Warnings:
Warning 1977 Cannot convert 'ujis' character 0x8FABF8 to 'ucs2'
DROP TABLE IF EXISTS t1, t2;
@@ -3060,69 +3060,69 @@ code a
8FAABC 帳
Warnings:
Warning 1977 Cannot convert 'ujis' character 0xA2AF to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2AF to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2B0 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2B0 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2B1 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2B1 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2B2 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2B2 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2B3 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2B3 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2B4 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2B4 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2B5 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2B5 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2B6 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2B6 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2B7 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2B7 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2B8 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2B8 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2B9 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2B9 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2C2 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2C2 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2C3 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2C3 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2C4 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2C4 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2C5 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2C5 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2C6 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2C6 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2C7 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2C7 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2C8 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2C8 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2C9 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2C9 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2D1 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2D1 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2D2 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2D2 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2D3 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2D3 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2D4 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2D4 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2D5 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2D5 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2D6 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2D6 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2D7 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2D7 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2D8 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2D8 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2D9 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2D9 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2DA to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2DA to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2DB to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2DB to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2EB to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2EB to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2EC to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2EC to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA2ED to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA2EE to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA2EF to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA2F0 to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA2F1 to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA2FA to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA2FB to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA2FC to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA2FD to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3A1 to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3A2 to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3A3 to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3A4 to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3A5 to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3A6 to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3A7 to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3A8 to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3A9 to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3AA to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3AB to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3AC to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3AD to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3AE to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3AF to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3BA to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3BB to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3BC to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3BD to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3BE to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3BF to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3C0 to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3DB to 'utf8'
SELECT * FROM t1
WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <>
HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
@@ -3131,69 +3131,69 @@ code a
8FABB9 乃
Warnings:
Warning 1977 Cannot convert 'ujis' character 0xA2AF to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2AF to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2B0 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2B0 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2B1 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2B1 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2B2 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2B2 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2B3 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2B3 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2B4 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2B4 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2B5 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2B5 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2B6 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2B6 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2B7 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2B7 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2B8 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2B8 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2B9 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2B9 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2C2 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2C2 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2C3 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2C3 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2C4 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2C4 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2C5 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2C5 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2C6 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2C6 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2C7 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2C7 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2C8 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2C8 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2C9 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2C9 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2D1 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2D1 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2D2 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2D2 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2D3 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2D3 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2D4 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2D4 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2D5 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2D5 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2D6 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2D6 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2D7 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2D7 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2D8 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2D8 to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2D9 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2D9 to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2DA to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2DA to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2DB to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2DB to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2EB to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2EB to 'utf8'
+Warning 1977 Cannot convert 'ujis' character 0xA2EC to 'utf8'
Warning 1977 Cannot convert 'ujis' character 0xA2EC to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA2ED to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA2EE to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA2EF to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA2F0 to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA2F1 to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA2FA to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA2FB to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA2FC to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA2FD to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3A1 to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3A2 to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3A3 to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3A4 to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3A5 to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3A6 to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3A7 to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3A8 to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3A9 to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3AA to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3AB to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3AC to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3AD to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3AE to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3AF to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3BA to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3BB to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3BC to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3BD to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3BE to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3BF to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3C0 to 'utf8'
-Warning 1977 Cannot convert 'ujis' character 0xA3DB to 'utf8'
#
# WL#3090 Japanese Character Set adjustments
# Test sjis->Unicode conversion
diff --git a/mysql-test/r/ctype_utf32.result b/mysql-test/r/ctype_utf32.result
index 37cda220db0..0a4a49dd39e 100644
--- a/mysql-test/r/ctype_utf32.result
+++ b/mysql-test/r/ctype_utf32.result
@@ -1666,7 +1666,7 @@ CHAR_LENGTH(TRIM(BOTH 0x00 FROM _utf32 0x00000061))
1
select hex(lower(cast(0xffff0000 as char character set utf32))) as c;
c
-NULL
+0000003F0000003F0000003F0000003F
Warnings:
Warning 1300 Invalid utf32 character string: '\xFF\xFF\x00\x00'
#
diff --git a/mysql-test/r/ctype_utf8.result b/mysql-test/r/ctype_utf8.result
index 0a4898ff0b9..c7e20a4180d 100644
--- a/mysql-test/r/ctype_utf8.result
+++ b/mysql-test/r/ctype_utf8.result
@@ -1925,7 +1925,7 @@ Warnings:
Warning 1300 Invalid utf8 character string: 'FF8F'
select convert(char(0xff,0x8f) using utf8);
convert(char(0xff,0x8f) using utf8)
-NULL
+??
Warnings:
Warning 1300 Invalid utf8 character string: '\xFF\x8F'
set sql_mode=traditional;
@@ -1951,7 +1951,7 @@ Warnings:
Warning 1300 Invalid utf8 character string: 'FD'
select convert(char(0xff,0x8f) using utf8);
convert(char(0xff,0x8f) using utf8)
-NULL
+??
Warnings:
Warning 1300 Invalid utf8 character string: '\xFF\x8F'
select hex(convert(char(2557 using latin1) using utf8));
@@ -2120,7 +2120,7 @@ Warnings:
Warning 1300 Invalid utf8 character string: 'FF'
select hex(convert(0xFF using utf8));
hex(convert(0xFF using utf8))
-NULL
+3F
Warnings:
Warning 1300 Invalid utf8 character string: '\xFF'
select hex(_utf8 0x616263FF);
@@ -2139,7 +2139,7 @@ Warnings:
Warning 1300 Invalid utf8 character string: 'FF'
select hex(convert(0xFF using utf8));
hex(convert(0xFF using utf8))
-NULL
+3F
Warnings:
Warning 1300 Invalid utf8 character string: '\xFF'
select hex(_utf8 0x616263FF);
@@ -10479,6 +10479,31 @@ END
DROP PROCEDURE p1;
SET @@SQL_MODE=default;
#
+# MDEV-10191 non convertible chars convert() resulted in Null instead "?" on Windows
+#
+SET sql_mode='STRICT_TRANS_TABLES';
+SELECT CONVERT(_utf8 0xC499 USING latin1);
+CONVERT(_utf8 0xC499 USING latin1)
+?
+Warnings:
+Warning 1977 Cannot convert 'utf8' character 0xC499 to 'latin1'
+SELECT CAST(_utf8 0xC499 AS CHAR CHARACTER SET latin1);
+CAST(_utf8 0xC499 AS CHAR CHARACTER SET latin1)
+?
+Warnings:
+Warning 1977 Cannot convert 'utf8' character 0xC499 to 'latin1'
+SET sql_mode=default;
+SELECT CONVERT(_utf8 0xC499 USING latin1);
+CONVERT(_utf8 0xC499 USING latin1)
+?
+Warnings:
+Warning 1977 Cannot convert 'utf8' character 0xC499 to 'latin1'
+SELECT CAST(_utf8 0xC499 AS CHAR CHARACTER SET latin1);
+CAST(_utf8 0xC499 AS CHAR CHARACTER SET latin1)
+?
+Warnings:
+Warning 1977 Cannot convert 'utf8' character 0xC499 to 'latin1'
+#
# End of 10.1 tests
#
#
diff --git a/mysql-test/r/ctype_utf8mb4.result b/mysql-test/r/ctype_utf8mb4.result
index d74cfd4dd3f..cf3000baf6a 100644
--- a/mysql-test/r/ctype_utf8mb4.result
+++ b/mysql-test/r/ctype_utf8mb4.result
@@ -1950,7 +1950,7 @@ Warnings:
Warning 1300 Invalid utf8mb4 character string: 'FF8F'
select convert(char(0xff,0x8f) using utf8mb4);
convert(char(0xff,0x8f) using utf8mb4)
-NULL
+??
Warnings:
Warning 1300 Invalid utf8mb4 character string: '\xFF\x8F'
set sql_mode=traditional;
@@ -1976,7 +1976,7 @@ Warnings:
Warning 1300 Invalid utf8mb4 character string: 'FD'
select convert(char(0xff,0x8f) using utf8mb4);
convert(char(0xff,0x8f) using utf8mb4)
-NULL
+??
Warnings:
Warning 1300 Invalid utf8mb4 character string: '\xFF\x8F'
select hex(convert(char(2557 using latin1) using utf8mb4));
@@ -2145,7 +2145,7 @@ Warnings:
Warning 1300 Invalid utf8mb4 character string: 'FF'
select hex(convert(0xFF using utf8mb4));
hex(convert(0xFF using utf8mb4))
-NULL
+3F
Warnings:
Warning 1300 Invalid utf8mb4 character string: '\xFF'
select hex(_utf8mb4 0x616263FF);
@@ -2164,7 +2164,7 @@ Warnings:
Warning 1300 Invalid utf8mb4 character string: 'FF'
select hex(convert(0xFF using utf8mb4));
hex(convert(0xFF using utf8mb4))
-NULL
+3F
Warnings:
Warning 1300 Invalid utf8mb4 character string: '\xFF'
select hex(_utf8mb4 0x616263FF);
diff --git a/mysql-test/r/ctype_utf8mb4_heap.result b/mysql-test/r/ctype_utf8mb4_heap.result
index 859ceff864e..d82ed89be9c 100644
--- a/mysql-test/r/ctype_utf8mb4_heap.result
+++ b/mysql-test/r/ctype_utf8mb4_heap.result
@@ -1782,7 +1782,7 @@ Warnings:
Warning 1300 Invalid utf8mb4 character string: 'FF8F'
select convert(char(0xff,0x8f) using utf8mb4);
convert(char(0xff,0x8f) using utf8mb4)
-NULL
+??
Warnings:
Warning 1300 Invalid utf8mb4 character string: '\xFF\x8F'
set sql_mode=traditional;
@@ -1808,7 +1808,7 @@ Warnings:
Warning 1300 Invalid utf8mb4 character string: 'FD'
select convert(char(0xff,0x8f) using utf8mb4);
convert(char(0xff,0x8f) using utf8mb4)
-NULL
+??
Warnings:
Warning 1300 Invalid utf8mb4 character string: '\xFF\x8F'
select hex(convert(char(2557 using latin1) using utf8mb4));
@@ -1977,7 +1977,7 @@ Warnings:
Warning 1300 Invalid utf8mb4 character string: 'FF'
select hex(convert(0xFF using utf8mb4));
hex(convert(0xFF using utf8mb4))
-NULL
+3F
Warnings:
Warning 1300 Invalid utf8mb4 character string: '\xFF'
select hex(_utf8mb4 0x616263FF);
@@ -1996,7 +1996,7 @@ Warnings:
Warning 1300 Invalid utf8mb4 character string: 'FF'
select hex(convert(0xFF using utf8mb4));
hex(convert(0xFF using utf8mb4))
-NULL
+3F
Warnings:
Warning 1300 Invalid utf8mb4 character string: '\xFF'
select hex(_utf8mb4 0x616263FF);
diff --git a/mysql-test/r/ctype_utf8mb4_innodb.result b/mysql-test/r/ctype_utf8mb4_innodb.result
index 11d89154269..c444e872f98 100644
--- a/mysql-test/r/ctype_utf8mb4_innodb.result
+++ b/mysql-test/r/ctype_utf8mb4_innodb.result
@@ -1910,7 +1910,7 @@ Warnings:
Warning 1300 Invalid utf8mb4 character string: 'FF8F'
select convert(char(0xff,0x8f) using utf8mb4);
convert(char(0xff,0x8f) using utf8mb4)
-NULL
+??
Warnings:
Warning 1300 Invalid utf8mb4 character string: '\xFF\x8F'
set sql_mode=traditional;
@@ -1936,7 +1936,7 @@ Warnings:
Warning 1300 Invalid utf8mb4 character string: 'FD'
select convert(char(0xff,0x8f) using utf8mb4);
convert(char(0xff,0x8f) using utf8mb4)
-NULL
+??
Warnings:
Warning 1300 Invalid utf8mb4 character string: '\xFF\x8F'
select hex(convert(char(2557 using latin1) using utf8mb4));
@@ -2105,7 +2105,7 @@ Warnings:
Warning 1300 Invalid utf8mb4 character string: 'FF'
select hex(convert(0xFF using utf8mb4));
hex(convert(0xFF using utf8mb4))
-NULL
+3F
Warnings:
Warning 1300 Invalid utf8mb4 character string: '\xFF'
select hex(_utf8mb4 0x616263FF);
@@ -2124,7 +2124,7 @@ Warnings:
Warning 1300 Invalid utf8mb4 character string: 'FF'
select hex(convert(0xFF using utf8mb4));
hex(convert(0xFF using utf8mb4))
-NULL
+3F
Warnings:
Warning 1300 Invalid utf8mb4 character string: '\xFF'
select hex(_utf8mb4 0x616263FF);
diff --git a/mysql-test/r/ctype_utf8mb4_myisam.result b/mysql-test/r/ctype_utf8mb4_myisam.result
index ef7bda0a79b..5176f92dc0f 100644
--- a/mysql-test/r/ctype_utf8mb4_myisam.result
+++ b/mysql-test/r/ctype_utf8mb4_myisam.result
@@ -1910,7 +1910,7 @@ Warnings:
Warning 1300 Invalid utf8mb4 character string: 'FF8F'
select convert(char(0xff,0x8f) using utf8mb4);
convert(char(0xff,0x8f) using utf8mb4)
-NULL
+??
Warnings:
Warning 1300 Invalid utf8mb4 character string: '\xFF\x8F'
set sql_mode=traditional;
@@ -1936,7 +1936,7 @@ Warnings:
Warning 1300 Invalid utf8mb4 character string: 'FD'
select convert(char(0xff,0x8f) using utf8mb4);
convert(char(0xff,0x8f) using utf8mb4)
-NULL
+??
Warnings:
Warning 1300 Invalid utf8mb4 character string: '\xFF\x8F'
select hex(convert(char(2557 using latin1) using utf8mb4));
@@ -2105,7 +2105,7 @@ Warnings:
Warning 1300 Invalid utf8mb4 character string: 'FF'
select hex(convert(0xFF using utf8mb4));
hex(convert(0xFF using utf8mb4))
-NULL
+3F
Warnings:
Warning 1300 Invalid utf8mb4 character string: '\xFF'
select hex(_utf8mb4 0x616263FF);
@@ -2124,7 +2124,7 @@ Warnings:
Warning 1300 Invalid utf8mb4 character string: 'FF'
select hex(convert(0xFF using utf8mb4));
hex(convert(0xFF using utf8mb4))
-NULL
+3F
Warnings:
Warning 1300 Invalid utf8mb4 character string: '\xFF'
select hex(_utf8mb4 0x616263FF);
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result
index 8456a6b483b..93e980efa2b 100644
--- a/mysql-test/r/gis.result
+++ b/mysql-test/r/gis.result
@@ -1616,8 +1616,8 @@ insert into t1 values(geomfromtext("POINT(0 9.2233720368548e18)"));
select equals(`a`,convert(`a` using utf8)) from `t1`;
equals(`a`,convert(`a` using utf8))
1
-NULL
-NULL
+0
+0
Warnings:
Warning 1300 Invalid utf8 character string: '\xE0C'
Warning 1300 Invalid utf8 character string: '\xE0C'
diff --git a/mysql-test/suite/innodb/r/innodb-index-online,crypt.rdiff b/mysql-test/suite/innodb/r/innodb-index-online,crypt.rdiff
new file mode 100644
index 00000000000..166cdf7a8b6
--- /dev/null
+++ b/mysql-test/suite/innodb/r/innodb-index-online,crypt.rdiff
@@ -0,0 +1,20 @@
+--- innodb-index-online.result
++++ innodb-index-online,crypt.reject
+@@ -301,7 +301,7 @@
+ @merge_encrypt_1>@merge_encrypt_0, @merge_decrypt_1>@merge_decrypt_0,
+ @rowlog_encrypt_1>@rowlog_encrypt_0;
+ sort_balance @merge_encrypt_1>@merge_encrypt_0 @merge_decrypt_1>@merge_decrypt_0 @rowlog_encrypt_1>@rowlog_encrypt_0
+-0 0 0 0
++0 0 0 1
+ SET DEBUG_SYNC = 'now SIGNAL dml2_done';
+ connection con1;
+ ERROR HY000: Creating index 'c2e' required more than 'innodb_online_alter_log_max_size' bytes of modification log. Please try again
+@@ -423,7 +423,7 @@
+ @rowlog_encrypt_2-@rowlog_encrypt_1>0 as log_encrypted,
+ @rowlog_decrypt_2-@rowlog_decrypt_1>0 as log_decrypted;
+ sort_encrypted sort_decrypted log_encrypted log_decrypted
+-0 0 0 0
++0 0 1 1
+ connection con1;
+ SELECT COUNT(c22f) FROM t1;
+ COUNT(c22f)
diff --git a/mysql-test/suite/innodb/r/innodb-index-online.result b/mysql-test/suite/innodb/r/innodb-index-online.result
index 6ebe52bb8fc..5427f13043d 100644
--- a/mysql-test/suite/innodb/r/innodb-index-online.result
+++ b/mysql-test/suite/innodb/r/innodb-index-online.result
@@ -214,6 +214,17 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`c1`),
KEY `c2d` (`c2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 STATS_PERSISTENT=1
+connection default;
+SET @merge_encrypt_0=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted');
+SET @merge_decrypt_0=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted');
+SET @rowlog_encrypt_0=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted');
+connection con1;
SET DEBUG_SYNC = 'row_log_apply_before SIGNAL c2e_created WAIT_FOR dml2_done';
SET lock_wait_timeout = 10;
ALTER TABLE t1 DROP INDEX c2d, ADD INDEX c2e(c2),
@@ -246,6 +257,22 @@ BEGIN;
UPDATE t1 SET c2 = c2 + 1;
DELETE FROM t1;
ROLLBACK;
+BEGIN;
+DELETE FROM t1;
+ROLLBACK;
+UPDATE t1 SET c2 = c2 + 1;
+BEGIN;
+UPDATE t1 SET c2 = c2 + 1;
+DELETE FROM t1;
+ROLLBACK;
+BEGIN;
+DELETE FROM t1;
+ROLLBACK;
+UPDATE t1 SET c2 = c2 + 1;
+BEGIN;
+UPDATE t1 SET c2 = c2 + 1;
+DELETE FROM t1;
+ROLLBACK;
SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE subsystem = 'ddl';
name count
ddl_background_drop_indexes 0
@@ -253,12 +280,28 @@ ddl_background_drop_tables 0
ddl_online_create_index 1
ddl_pending_alter_table 1
ddl_sort_file_alter_table 0
-ddl_log_file_alter_table 0
+ddl_log_file_alter_table 1
SELECT sf.name, sf.pos FROM INFORMATION_SCHEMA.INNODB_SYS_INDEXES si
INNER JOIN INFORMATION_SCHEMA.INNODB_SYS_FIELDS sf
ON si.index_id = sf.index_id WHERE si.name = '?c2e';
name pos
c2 0
+SET @merge_encrypt_1=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted');
+SET @merge_decrypt_1=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted');
+SET @rowlog_encrypt_1=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted');
+SELECT
+(@merge_encrypt_1-@merge_encrypt_0)-
+(@merge_decrypt_1-@merge_decrypt_0) as sort_balance,
+@merge_encrypt_1>@merge_encrypt_0, @merge_decrypt_1>@merge_decrypt_0,
+@rowlog_encrypt_1>@rowlog_encrypt_0;
+sort_balance @merge_encrypt_1>@merge_encrypt_0 @merge_decrypt_1>@merge_decrypt_0 @rowlog_encrypt_1>@rowlog_encrypt_0
+0 0 0 0
SET DEBUG_SYNC = 'now SIGNAL dml2_done';
connection con1;
ERROR HY000: Creating index 'c2e' required more than 'innodb_online_alter_log_max_size' bytes of modification log. Please try again
@@ -269,7 +312,7 @@ ddl_background_drop_tables 0
ddl_online_create_index 0
ddl_pending_alter_table 0
ddl_sort_file_alter_table 0
-ddl_log_file_alter_table 0
+ddl_log_file_alter_table 1
SELECT sf.name, sf.pos FROM INFORMATION_SCHEMA.INNODB_SYS_INDEXES si
INNER JOIN INFORMATION_SCHEMA.INNODB_SYS_FIELDS sf
ON si.index_id = sf.index_id WHERE si.name = 'c2e';
@@ -281,7 +324,7 @@ ddl_background_drop_tables 0
ddl_online_create_index 0
ddl_pending_alter_table 0
ddl_sort_file_alter_table 0
-ddl_log_file_alter_table 0
+ddl_log_file_alter_table 1
connection default;
ALTER TABLE t1 COMMENT 'testing if c2e will be dropped';
SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE subsystem = 'ddl';
@@ -291,7 +334,19 @@ ddl_background_drop_tables 0
ddl_online_create_index 0
ddl_pending_alter_table 0
ddl_sort_file_alter_table 0
-ddl_log_file_alter_table 0
+ddl_log_file_alter_table 1
+SET @merge_encrypt_1=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted');
+SET @merge_decrypt_1=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted');
+SET @rowlog_encrypt_1=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted');
+SET @rowlog_decrypt_1=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_decrypted');
connection con1;
SET DEBUG_SYNC = 'row_log_apply_before SIGNAL c2f_created WAIT_FOR dml3_done';
ALTER TABLE t1 ADD INDEX c2f(c2);
@@ -304,7 +359,15 @@ ddl_background_drop_tables 0
ddl_online_create_index 1
ddl_pending_alter_table 1
ddl_sort_file_alter_table 0
-ddl_log_file_alter_table 0
+ddl_log_file_alter_table 1
+BEGIN;
+INSERT INTO t1 SELECT 320 + c1, c2, c3 FROM t1 WHERE c1 > 160;
+DELETE FROM t1 WHERE c1 > 320;
+ROLLBACK;
+BEGIN;
+UPDATE t1 SET c2 = c2 + 1;
+DELETE FROM t1;
+ROLLBACK;
BEGIN;
INSERT INTO t1 SELECT 320 + c1, c2, c3 FROM t1 WHERE c1 > 160;
DELETE FROM t1 WHERE c1 > 320;
@@ -320,7 +383,7 @@ ddl_background_drop_tables 0
ddl_online_create_index 1
ddl_pending_alter_table 1
ddl_sort_file_alter_table 0
-ddl_log_file_alter_table 0
+ddl_log_file_alter_table 2
SET DEBUG_SYNC = 'now SIGNAL dml3_done';
connection con1;
Warnings:
@@ -333,7 +396,35 @@ ddl_background_drop_tables 0
ddl_online_create_index 0
ddl_pending_alter_table 0
ddl_sort_file_alter_table 0
-ddl_log_file_alter_table 0
+ddl_log_file_alter_table 2
+connection default;
+SET @merge_encrypt_2=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted');
+SET @merge_decrypt_2=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted');
+SET @rowlog_encrypt_2=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted');
+SET @rowlog_decrypt_2=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_decrypted');
+SELECT
+(@merge_encrypt_2-@merge_encrypt_1)-
+(@merge_decrypt_2-@merge_decrypt_1) as sort_balance,
+(@rowlog_encrypt_2-@rowlog_encrypt_1)-
+(@rowlog_decrypt_2-@rowlog_decrypt_1) as log_balance;
+sort_balance log_balance
+0 0
+SELECT
+@merge_encrypt_2-@merge_encrypt_1>0 as sort_encrypted,
+@merge_decrypt_2-@merge_decrypt_1>0 as sort_decrypted,
+@rowlog_encrypt_2-@rowlog_encrypt_1>0 as log_encrypted,
+@rowlog_decrypt_2-@rowlog_decrypt_1>0 as log_decrypted;
+sort_encrypted sort_decrypted log_encrypted log_decrypted
+0 0 0 0
+connection con1;
SELECT COUNT(c22f) FROM t1;
COUNT(c22f)
320
@@ -369,7 +460,7 @@ ddl_background_drop_tables 0
ddl_online_create_index 0
ddl_pending_alter_table 0
ddl_sort_file_alter_table 0
-ddl_log_file_alter_table 0
+ddl_log_file_alter_table 2
connection default;
SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE subsystem = 'ddl';
name count
@@ -378,7 +469,7 @@ ddl_background_drop_tables 0
ddl_online_create_index 0
ddl_pending_alter_table 0
ddl_sort_file_alter_table 0
-ddl_log_file_alter_table 0
+ddl_log_file_alter_table 2
connection con1;
disconnect con1;
connection default;
@@ -400,7 +491,7 @@ ddl_background_drop_tables 0
ddl_online_create_index 0
ddl_pending_alter_table 0
ddl_sort_file_alter_table 0
-ddl_log_file_alter_table 0
+ddl_log_file_alter_table 2
ALTER TABLE t1 ADD INDEX c2h(c22f), ALGORITHM = INPLACE;
ALTER TABLE t1 ADD INDEX c2h(c22f), ALGORITHM = COPY;
ERROR 42000: Duplicate key name 'c2h'
diff --git a/mysql-test/suite/innodb/r/innodb-table-online,crypt.rdiff b/mysql-test/suite/innodb/r/innodb-table-online,crypt.rdiff
new file mode 100644
index 00000000000..cd0904367f9
--- /dev/null
+++ b/mysql-test/suite/innodb/r/innodb-table-online,crypt.rdiff
@@ -0,0 +1,20 @@
+--- innodb-table-online.result
++++ innodb-table-online,crypt.reject
+@@ -291,7 +291,7 @@
+ @merge_encrypt_1>@merge_encrypt_0, @merge_decrypt_1>@merge_decrypt_0,
+ @rowlog_encrypt_1>@rowlog_encrypt_0;
+ sort_balance @merge_encrypt_1>@merge_encrypt_0 @merge_decrypt_1>@merge_decrypt_0 @rowlog_encrypt_1>@rowlog_encrypt_0
+-0 0 0 0
++0 0 0 1
+ SET DEBUG_SYNC = 'now SIGNAL dml2_done';
+ # session con1
+ connection con1;
+@@ -393,7 +393,7 @@
+ @rowlog_encrypt_2-@rowlog_encrypt_1>0 as log_encrypted,
+ @rowlog_decrypt_2-@rowlog_decrypt_1>0 as log_decrypted;
+ sort_encrypted sort_decrypted log_encrypted log_decrypted
+-0 0 0 0
++0 0 1 1
+ ALTER TABLE t1 DROP PRIMARY KEY, ADD PRIMARY KEY c3p5(c3(5));
+ ERROR 23000: Duplicate entry '' for key 'PRIMARY'
+ UPDATE t1 SET c3 = NULL WHERE c3 = '';
diff --git a/mysql-test/suite/innodb/r/innodb-table-online.result b/mysql-test/suite/innodb/r/innodb-table-online.result
index a162bcef420..49f44c0f655 100644
--- a/mysql-test/suite/innodb/r/innodb-table-online.result
+++ b/mysql-test/suite/innodb/r/innodb-table-online.result
@@ -3,7 +3,7 @@ call mtr.add_suppression("InnoDB: Error: table 'test/t1'");
call mtr.add_suppression("MySQL is trying to open a table handle but the .ibd file for");
SET @global_innodb_file_per_table_orig = @@global.innodb_file_per_table;
SET GLOBAL innodb_file_per_table = on;
-CREATE TABLE t1 (c1 INT PRIMARY KEY, c2 INT NOT NULL, c3 TEXT NOT NULL)
+CREATE TABLE t1 (c1 INT PRIMARY KEY, c2 INT NOT NULL, c3 CHAR(255) NOT NULL)
ENGINE = InnoDB;
INSERT INTO t1 VALUES (1,1,''), (2,2,''), (3,3,''), (4,4,''), (5,5,'');
SET GLOBAL innodb_monitor_enable = module_ddl;
@@ -62,7 +62,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL,
`c2` int(11) NOT NULL,
- `c3` text NOT NULL,
+ `c3` char(255) NOT NULL,
PRIMARY KEY (`c1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT
BEGIN;
@@ -95,7 +95,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL,
`c2` int(11) NOT NULL,
- `c3` text NOT NULL,
+ `c3` char(255) NOT NULL,
UNIQUE KEY `c2` (`c2`),
UNIQUE KEY `c2_2` (`c2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
@@ -106,7 +106,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL,
`c2` int(11) NOT NULL,
- `c3` text NOT NULL,
+ `c3` char(255) NOT NULL,
UNIQUE KEY `c2` (`c2`),
UNIQUE KEY `c2_2` (`c2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
@@ -138,7 +138,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL,
`c2` int(11) NOT NULL,
- `c3` text NOT NULL,
+ `c3` char(255) NOT NULL,
UNIQUE KEY `c2` (`c2`),
UNIQUE KEY `c2_2` (`c2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
@@ -204,10 +204,19 @@ INSERT INTO t1 SELECT 20 + c1, c2, c3 FROM t1;
INSERT INTO t1 SELECT 40 + c1, c2, c3 FROM t1;
EXPLAIN SELECT COUNT(*) FROM t1 WHERE c2 > 3;
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t1 ALL NULL NULL NULL NULL 80 Using where
+1 SIMPLE t1 ALL NULL NULL NULL NULL ROWS Using where
ANALYZE TABLE t1;
Table Op Msg_type Msg_text
test.t1 analyze status OK
+SET @merge_encrypt_0=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted');
+SET @merge_decrypt_0=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted');
+SET @rowlog_encrypt_0=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted');
# session con1
connection con1;
SHOW CREATE TABLE t1;
@@ -215,7 +224,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL,
`c2` int(11) NOT NULL,
- `c3` text NOT NULL,
+ `c3` char(255) NOT NULL,
PRIMARY KEY (`c1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt2 WAIT_FOR dml2_done';
@@ -234,7 +243,7 @@ ddl_background_drop_tables 0
ddl_online_create_index 1
ddl_pending_alter_table 1
ddl_sort_file_alter_table 0
-ddl_log_file_alter_table 0
+ddl_log_file_alter_table 1
BEGIN;
DELETE FROM t1;
ROLLBACK;
@@ -266,7 +275,23 @@ ddl_background_drop_tables 0
ddl_online_create_index 1
ddl_pending_alter_table 1
ddl_sort_file_alter_table 0
-ddl_log_file_alter_table 0
+ddl_log_file_alter_table 1
+SET @merge_encrypt_1=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted');
+SET @merge_decrypt_1=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted');
+SET @rowlog_encrypt_1=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted');
+SELECT
+(@merge_encrypt_1-@merge_encrypt_0)-
+(@merge_decrypt_1-@merge_decrypt_0) as sort_balance,
+@merge_encrypt_1>@merge_encrypt_0, @merge_decrypt_1>@merge_decrypt_0,
+@rowlog_encrypt_1>@rowlog_encrypt_0;
+sort_balance @merge_encrypt_1>@merge_encrypt_0 @merge_decrypt_1>@merge_decrypt_0 @rowlog_encrypt_1>@rowlog_encrypt_0
+0 0 0 0
SET DEBUG_SYNC = 'now SIGNAL dml2_done';
# session con1
connection con1;
@@ -278,15 +303,27 @@ ddl_background_drop_tables 0
ddl_online_create_index 0
ddl_pending_alter_table 0
ddl_sort_file_alter_table 0
-ddl_log_file_alter_table 0
+ddl_log_file_alter_table 1
+SET @merge_encrypt_1=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted');
+SET @merge_decrypt_1=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted');
+SET @rowlog_encrypt_1=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted');
+SET @rowlog_decrypt_1=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_decrypted');
SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt3 WAIT_FOR dml3_done';
ALTER TABLE t1 ADD PRIMARY KEY(c22f), CHANGE c2 c22f INT;
ERROR 42000: Multiple primary key defined
ALTER TABLE t1 DROP PRIMARY KEY, ADD PRIMARY KEY(c22f), CHANGE c2 c22f INT;
ERROR 23000: Duplicate entry '5' for key 'PRIMARY'
ALTER TABLE t1 DROP PRIMARY KEY, ADD PRIMARY KEY(c1,c22f,c4(5)),
-CHANGE c2 c22f INT, CHANGE c3 c3 TEXT NULL, CHANGE c1 c1 INT AFTER c22f,
-ADD COLUMN c4 VARCHAR(6) DEFAULT 'Online';
+CHANGE c2 c22f INT, CHANGE c3 c3 CHAR(255) NULL, CHANGE c1 c1 INT AFTER c22f,
+ADD COLUMN c4 VARCHAR(6) DEFAULT 'Online', LOCK=NONE;
# session default
connection default;
SET DEBUG_SYNC = 'now WAIT_FOR rebuilt3';
@@ -297,7 +334,7 @@ ddl_background_drop_tables 0
ddl_online_create_index 1
ddl_pending_alter_table 1
ddl_sort_file_alter_table 0
-ddl_log_file_alter_table 0
+ddl_log_file_alter_table 1
BEGIN;
INSERT INTO t1 SELECT 320 + c1, c2, c3 FROM t1 WHERE c1 > 240;
DELETE FROM t1 WHERE c1 > 320;
@@ -313,7 +350,7 @@ ddl_background_drop_tables 0
ddl_online_create_index 1
ddl_pending_alter_table 1
ddl_sort_file_alter_table 0
-ddl_log_file_alter_table 0
+ddl_log_file_alter_table 2
SET DEBUG_SYNC = 'now SIGNAL dml3_done';
# session con1
connection con1;
@@ -324,13 +361,39 @@ ddl_background_drop_tables 0
ddl_online_create_index 0
ddl_pending_alter_table 0
ddl_sort_file_alter_table 0
-ddl_log_file_alter_table 0
+ddl_log_file_alter_table 2
SELECT COUNT(c22f) FROM t1;
COUNT(c22f)
320
CHECK TABLE t1;
Table Op Msg_type Msg_text
test.t1 check status OK
+SET @merge_encrypt_2=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted');
+SET @merge_decrypt_2=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted');
+SET @rowlog_encrypt_2=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted');
+SET @rowlog_decrypt_2=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_decrypted');
+SELECT
+(@merge_encrypt_2-@merge_encrypt_1)-
+(@merge_decrypt_2-@merge_decrypt_1) as sort_balance,
+(@rowlog_encrypt_2-@rowlog_encrypt_1)-
+(@rowlog_decrypt_2-@rowlog_decrypt_1) as log_balance;
+sort_balance log_balance
+0 0
+SELECT
+@merge_encrypt_2-@merge_encrypt_1>0 as sort_encrypted,
+@merge_decrypt_2-@merge_decrypt_1>0 as sort_decrypted,
+@rowlog_encrypt_2-@rowlog_encrypt_1>0 as log_encrypted,
+@rowlog_decrypt_2-@rowlog_decrypt_1>0 as log_decrypted;
+sort_encrypted sort_decrypted log_encrypted log_decrypted
+0 0 0 0
ALTER TABLE t1 DROP PRIMARY KEY, ADD PRIMARY KEY c3p5(c3(5));
ERROR 23000: Duplicate entry '' for key 'PRIMARY'
UPDATE t1 SET c3 = NULL WHERE c3 = '';
@@ -342,13 +405,13 @@ SET @@sql_mode = 'STRICT_TRANS_TABLES';
ALTER TABLE t1 DROP COLUMN c22f, DROP PRIMARY KEY, ADD PRIMARY KEY c3p5(c3(5)),
ALGORITHM = INPLACE;
ERROR 22004: Invalid use of NULL value
-ALTER TABLE t1 MODIFY c3 TEXT NOT NULL;
+ALTER TABLE t1 MODIFY c3 CHAR(255) NOT NULL;
ERROR 22004: Invalid use of NULL value
SET @@sql_mode = @old_sql_mode;
-UPDATE t1 SET c3=CONCAT(c1,REPEAT('foo',c1)) WHERE c3 IS NULL;
+UPDATE t1 SET c3=LEFT(CONCAT(c1,REPEAT('foo',c1)),255) WHERE c3 IS NULL;
SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL c3p5_created0 WAIT_FOR ins_done0';
SET @@sql_mode = 'STRICT_TRANS_TABLES';
-ALTER TABLE t1 MODIFY c3 TEXT NOT NULL, DROP COLUMN c22f,
+ALTER TABLE t1 MODIFY c3 CHAR(255) NOT NULL, DROP COLUMN c22f,
DROP PRIMARY KEY, ADD PRIMARY KEY(c1,c4(5)),
ADD COLUMN c5 CHAR(5) DEFAULT 'tired' FIRST;
# session default
@@ -367,7 +430,7 @@ connection default;
ROLLBACK;
# session con1
connection con1;
-ALTER TABLE t1 MODIFY c3 TEXT NOT NULL;
+ALTER TABLE t1 MODIFY c3 CHAR(255) NOT NULL;
SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL c3p5_created WAIT_FOR ins_done';
ALTER TABLE t1 DROP PRIMARY KEY, DROP COLUMN c22f,
ADD COLUMN c6 VARCHAR(1000) DEFAULT
@@ -391,7 +454,7 @@ ddl_background_drop_tables 0
ddl_online_create_index 0
ddl_pending_alter_table 0
ddl_sort_file_alter_table 4
-ddl_log_file_alter_table 0
+ddl_log_file_alter_table 2
# session default
connection default;
SELECT COUNT(*) FROM t1;
@@ -422,7 +485,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`c22f` int(11) NOT NULL,
`c1` int(11) NOT NULL,
- `c3` text NOT NULL,
+ `c3` char(255) NOT NULL,
`c4` varchar(6) NOT NULL DEFAULT 'Online',
PRIMARY KEY (`c1`,`c22f`,`c4`(5))
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT
diff --git a/mysql-test/suite/innodb/t/innodb-index-online.opt b/mysql-test/suite/innodb/t/innodb-index-online.opt
index a11d16860eb..ff20edbe2f7 100644
--- a/mysql-test/suite/innodb/t/innodb-index-online.opt
+++ b/mysql-test/suite/innodb/t/innodb-index-online.opt
@@ -1,5 +1,5 @@
--loose-innodb-sort-buffer-size=64k
---loose-innodb-online-alter-log-max-size=64k
+--loose-innodb-online-alter-log-max-size=128k
--loose-innodb-buffer-pool-size=5M
--loose-innodb-log-buffer-size=256k
--loose-innodb-sys-indexes
diff --git a/mysql-test/suite/innodb/t/innodb-index-online.test b/mysql-test/suite/innodb/t/innodb-index-online.test
index 24e3cd1ba22..efd700498c6 100644
--- a/mysql-test/suite/innodb/t/innodb-index-online.test
+++ b/mysql-test/suite/innodb/t/innodb-index-online.test
@@ -1,4 +1,5 @@
--source include/innodb_page_size_small.inc
+--source include/innodb_encrypt_log.inc
--source include/have_debug_sync.inc
let $innodb_metrics_select=
@@ -200,6 +201,18 @@ EXPLAIN SELECT COUNT(*) FROM t1 WHERE c2 > 3;
SHOW CREATE TABLE t1;
+connection default;
+SET @merge_encrypt_0=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted');
+SET @merge_decrypt_0=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted');
+SET @rowlog_encrypt_0=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted');
+connection con1;
+
# Exceed the configured innodb_online_alter_log_max_size.
# The actual limit is a multiple of innodb_sort_buf_size,
# because that is the size of the in-memory log buffers.
@@ -223,7 +236,7 @@ SET DEBUG_SYNC = 'now WAIT_FOR c2e_created';
# At this point, the clustered index scan must have completed,
# but the modification log keeps accumulating due to the DEBUG_SYNC.
eval $innodb_metrics_select;
-let $c= 2;
+let $c= 4;
while ($c)
{
BEGIN;
@@ -243,6 +256,22 @@ SELECT sf.name, sf.pos FROM INFORMATION_SCHEMA.INNODB_SYS_INDEXES si
INNER JOIN INFORMATION_SCHEMA.INNODB_SYS_FIELDS sf
ON si.index_id = sf.index_id WHERE si.name = '?c2e';
+SET @merge_encrypt_1=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted');
+SET @merge_decrypt_1=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted');
+SET @rowlog_encrypt_1=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted');
+
+SELECT
+(@merge_encrypt_1-@merge_encrypt_0)-
+(@merge_decrypt_1-@merge_decrypt_0) as sort_balance,
+@merge_encrypt_1>@merge_encrypt_0, @merge_decrypt_1>@merge_decrypt_0,
+@rowlog_encrypt_1>@rowlog_encrypt_0;
+
# Release con1.
SET DEBUG_SYNC = 'now SIGNAL dml2_done';
@@ -270,6 +299,19 @@ ALTER TABLE t1 COMMENT 'testing if c2e will be dropped';
# Check that the 'zombie' index c2e was dropped.
eval $innodb_metrics_select;
+SET @merge_encrypt_1=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted');
+SET @merge_decrypt_1=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted');
+SET @rowlog_encrypt_1=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted');
+SET @rowlog_decrypt_1=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_decrypted');
+
connection con1;
# Accumulate and apply some modification log.
SET DEBUG_SYNC = 'row_log_apply_before SIGNAL c2f_created WAIT_FOR dml3_done';
@@ -282,6 +324,9 @@ connection default;
SET DEBUG_SYNC = 'now WAIT_FOR c2f_created';
# Generate some log (delete-mark, delete-unmark, insert etc.)
eval $innodb_metrics_select;
+let $c= 2;
+while ($c)
+{
BEGIN;
INSERT INTO t1 SELECT 320 + c1, c2, c3 FROM t1 WHERE c1 > 160;
DELETE FROM t1 WHERE c1 > 320;
@@ -290,6 +335,8 @@ BEGIN;
UPDATE t1 SET c2 = c2 + 1;
DELETE FROM t1;
ROLLBACK;
+dec $c;
+}
eval $innodb_metrics_select;
# Release con1.
SET DEBUG_SYNC = 'now SIGNAL dml3_done';
@@ -300,6 +347,34 @@ reap;
ALTER TABLE t1 CHANGE c2 c22f INT;
eval $innodb_metrics_select;
+
+connection default;
+
+SET @merge_encrypt_2=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted');
+SET @merge_decrypt_2=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted');
+SET @rowlog_encrypt_2=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted');
+SET @rowlog_decrypt_2=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_decrypted');
+
+SELECT
+(@merge_encrypt_2-@merge_encrypt_1)-
+(@merge_decrypt_2-@merge_decrypt_1) as sort_balance,
+(@rowlog_encrypt_2-@rowlog_encrypt_1)-
+(@rowlog_decrypt_2-@rowlog_decrypt_1) as log_balance;
+SELECT
+@merge_encrypt_2-@merge_encrypt_1>0 as sort_encrypted,
+@merge_decrypt_2-@merge_decrypt_1>0 as sort_decrypted,
+@rowlog_encrypt_2-@rowlog_encrypt_1>0 as log_encrypted,
+@rowlog_decrypt_2-@rowlog_decrypt_1>0 as log_decrypted;
+
+connection con1;
SELECT COUNT(c22f) FROM t1;
CHECK TABLE t1;
diff --git a/mysql-test/suite/innodb/t/innodb-table-online-master.opt b/mysql-test/suite/innodb/t/innodb-table-online-master.opt
index 9ac01ffb5ad..92eea2b0d2e 100644
--- a/mysql-test/suite/innodb/t/innodb-table-online-master.opt
+++ b/mysql-test/suite/innodb/t/innodb-table-online-master.opt
@@ -1 +1 @@
---innodb-sort-buffer-size=64k --innodb-online-alter-log-max-size=64k --innodb-buffer-pool-size=5M --innodb-log-buffer-size=256k
+--innodb-sort-buffer-size=64k --innodb-online-alter-log-max-size=512k --innodb-buffer-pool-size=5M --innodb-log-buffer-size=256k
diff --git a/mysql-test/suite/innodb/t/innodb-table-online.test b/mysql-test/suite/innodb/t/innodb-table-online.test
index a1977fa06a4..dddbbb34117 100644
--- a/mysql-test/suite/innodb/t/innodb-table-online.test
+++ b/mysql-test/suite/innodb/t/innodb-table-online.test
@@ -1,4 +1,5 @@
--source include/innodb_page_size_small.inc
+--source include/innodb_encrypt_log.inc
--source include/have_debug.inc
--source include/have_debug_sync.inc
@@ -17,7 +18,7 @@ SET GLOBAL innodb_file_per_table = on;
# Save the initial number of concurrent sessions.
--source include/count_sessions.inc
-CREATE TABLE t1 (c1 INT PRIMARY KEY, c2 INT NOT NULL, c3 TEXT NOT NULL)
+CREATE TABLE t1 (c1 INT PRIMARY KEY, c2 INT NOT NULL, c3 CHAR(255) NOT NULL)
ENGINE = InnoDB;
INSERT INTO t1 VALUES (1,1,''), (2,2,''), (3,3,''), (4,4,''), (5,5,'');
@@ -183,10 +184,20 @@ INSERT INTO t1 SELECT 10 + c1, c2, c3 FROM t1;
INSERT INTO t1 SELECT 20 + c1, c2, c3 FROM t1;
INSERT INTO t1 SELECT 40 + c1, c2, c3 FROM t1;
# Purge may or may not have cleaned up the DELETE FROM t1 WHERE c1 = 7;
---replace_result 81 80
+--replace_column 9 ROWS
EXPLAIN SELECT COUNT(*) FROM t1 WHERE c2 > 3;
ANALYZE TABLE t1;
+SET @merge_encrypt_0=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted');
+SET @merge_decrypt_0=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted');
+SET @rowlog_encrypt_0=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted');
+
--echo # session con1
connection con1;
SHOW CREATE TABLE t1;
@@ -228,6 +239,22 @@ while ($c)
# Temporary table should exist until the DDL thread notices the overflow.
eval $innodb_metrics_select;
+SET @merge_encrypt_1=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted');
+SET @merge_decrypt_1=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted');
+SET @rowlog_encrypt_1=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted');
+
+SELECT
+(@merge_encrypt_1-@merge_encrypt_0)-
+(@merge_decrypt_1-@merge_decrypt_0) as sort_balance,
+@merge_encrypt_1>@merge_encrypt_0, @merge_decrypt_1>@merge_decrypt_0,
+@rowlog_encrypt_1>@rowlog_encrypt_0;
+
# Release con1.
SET DEBUG_SYNC = 'now SIGNAL dml2_done';
@@ -241,6 +268,19 @@ reap;
# when the above error was noticed.
eval $innodb_metrics_select;
+SET @merge_encrypt_1=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted');
+SET @merge_decrypt_1=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted');
+SET @rowlog_encrypt_1=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted');
+SET @rowlog_decrypt_1=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_decrypted');
+
# Accumulate and apply some modification log.
SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt3 WAIT_FOR dml3_done';
--error ER_MULTIPLE_PRI_KEY
@@ -249,8 +289,8 @@ ALTER TABLE t1 ADD PRIMARY KEY(c22f), CHANGE c2 c22f INT;
ALTER TABLE t1 DROP PRIMARY KEY, ADD PRIMARY KEY(c22f), CHANGE c2 c22f INT;
--send
ALTER TABLE t1 DROP PRIMARY KEY, ADD PRIMARY KEY(c1,c22f,c4(5)),
-CHANGE c2 c22f INT, CHANGE c3 c3 TEXT NULL, CHANGE c1 c1 INT AFTER c22f,
-ADD COLUMN c4 VARCHAR(6) DEFAULT 'Online';
+CHANGE c2 c22f INT, CHANGE c3 c3 CHAR(255) NULL, CHANGE c1 c1 INT AFTER c22f,
+ADD COLUMN c4 VARCHAR(6) DEFAULT 'Online', LOCK=NONE;
--echo # session default
connection default;
@@ -276,6 +316,30 @@ eval $innodb_metrics_select;
SELECT COUNT(c22f) FROM t1;
CHECK TABLE t1;
+SET @merge_encrypt_2=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted');
+SET @merge_decrypt_2=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted');
+SET @rowlog_encrypt_2=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted');
+SET @rowlog_decrypt_2=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_decrypted');
+
+SELECT
+(@merge_encrypt_2-@merge_encrypt_1)-
+(@merge_decrypt_2-@merge_decrypt_1) as sort_balance,
+(@rowlog_encrypt_2-@rowlog_encrypt_1)-
+(@rowlog_decrypt_2-@rowlog_decrypt_1) as log_balance;
+SELECT
+@merge_encrypt_2-@merge_encrypt_1>0 as sort_encrypted,
+@merge_decrypt_2-@merge_decrypt_1>0 as sort_decrypted,
+@rowlog_encrypt_2-@rowlog_encrypt_1>0 as log_encrypted,
+@rowlog_decrypt_2-@rowlog_decrypt_1>0 as log_decrypted;
+
# Create a column prefix index.
--error ER_DUP_ENTRY
ALTER TABLE t1 DROP PRIMARY KEY, ADD PRIMARY KEY c3p5(c3(5));
@@ -292,15 +356,15 @@ ALTER TABLE t1 DROP COLUMN c22f, DROP PRIMARY KEY, ADD PRIMARY KEY c3p5(c3(5)),
ALGORITHM = INPLACE;
--error ER_INVALID_USE_OF_NULL
-ALTER TABLE t1 MODIFY c3 TEXT NOT NULL;
+ALTER TABLE t1 MODIFY c3 CHAR(255) NOT NULL;
SET @@sql_mode = @old_sql_mode;
-UPDATE t1 SET c3=CONCAT(c1,REPEAT('foo',c1)) WHERE c3 IS NULL;
+UPDATE t1 SET c3=LEFT(CONCAT(c1,REPEAT('foo',c1)),255) WHERE c3 IS NULL;
SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL c3p5_created0 WAIT_FOR ins_done0';
# NULL -> NOT NULL only allowed INPLACE if strict sql_mode is on.
SET @@sql_mode = 'STRICT_TRANS_TABLES';
--send
-ALTER TABLE t1 MODIFY c3 TEXT NOT NULL, DROP COLUMN c22f,
+ALTER TABLE t1 MODIFY c3 CHAR(255) NOT NULL, DROP COLUMN c22f,
DROP PRIMARY KEY, ADD PRIMARY KEY(c1,c4(5)),
ADD COLUMN c5 CHAR(5) DEFAULT 'tired' FIRST;
@@ -325,7 +389,7 @@ ROLLBACK;
--echo # session con1
connection con1;
-ALTER TABLE t1 MODIFY c3 TEXT NOT NULL;
+ALTER TABLE t1 MODIFY c3 CHAR(255) NOT NULL;
SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL c3p5_created WAIT_FOR ins_done';
--send
ALTER TABLE t1 DROP PRIMARY KEY, DROP COLUMN c22f,
diff --git a/mysql-test/suite/jp/r/jp_convert_ucs2.result b/mysql-test/suite/jp/r/jp_convert_ucs2.result
index aa97d30f745..842ddfa2ea7 100644
--- a/mysql-test/suite/jp/r/jp_convert_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_convert_ucs2.result
@@ -153,13 +153,13 @@ SELECT `C1`, CONVERT(`C1` using ucs2) FROM `T3`;
齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒 齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒
SELECT `C1`, CONVERT(`C1` using sjis) FROM `T3`;
C1 CONVERT(`C1` using sjis)
-・˛˚~΄΅・・・・・・・・¡¦¿・・・ NULL
-・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪 NULL
-乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠 NULL
-仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众 NULL
-伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘 NULL
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖 NULL
-齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒 NULL
+・˛˚~΄΅・・・・・・・・¡¦¿・・・ ・??~??・・・・・・・・???・・・
+・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪 ・???????????????????
+乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠 ????????????????????
+仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众 ????????????????????
+伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘 ????????????????????
+鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖 ????????????????????
+齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒 ????????????????????
Warnings:
Warning 1977 Cannot convert 'ucs2' character 0x02DB to 'sjis'
Warning 1977 Cannot convert 'ucs2' character 0x9EF8 to 'sjis'
@@ -236,13 +236,13 @@ SELECT `C1`, CONVERT(`C1` using ucs2) FROM `T6`;
齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒 齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒
SELECT `C1`, CONVERT(`C1` using sjis) FROM `T6`;
C1 CONVERT(`C1` using sjis)
-・˛˚~΄΅・・・・・・・・¡¦¿・・・ NULL
-・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪 NULL
-乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠 NULL
-仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众 NULL
-伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘 NULL
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖 NULL
-齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒 NULL
+・˛˚~΄΅・・・・・・・・¡¦¿・・・ ・??~??・・・・・・・・???・・・
+・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪 ・???????????????????
+乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠 ????????????????????
+仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众 ????????????????????
+伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘 ????????????????????
+鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖 ????????????????????
+齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒 ????????????????????
Warnings:
Warning 1977 Cannot convert 'ucs2' character 0x02DB to 'sjis'
Warning 1977 Cannot convert 'ucs2' character 0x9EF8 to 'sjis'
@@ -319,13 +319,13 @@ SELECT `C1`, CONVERT(`C1` using ucs2) FROM `T9`;
齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒 齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒
SELECT `C1`, CONVERT(`C1` using sjis) FROM `T9`;
C1 CONVERT(`C1` using sjis)
-・˛˚~΄΅・・・・・・・・¡¦¿・・・ NULL
-乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠 NULL
-仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众 NULL
-伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘 NULL
-・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪 NULL
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖 NULL
-齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒 NULL
+・˛˚~΄΅・・・・・・・・¡¦¿・・・ ・??~??・・・・・・・・???・・・
+乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠 ????????????????????
+仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众 ????????????????????
+伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘 ????????????????????
+・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪 ・???????????????????
+鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖 ????????????????????
+齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒 ????????????????????
Warnings:
Warning 1977 Cannot convert 'ucs2' character 0x02DB to 'sjis'
Warning 1977 Cannot convert 'ucs2' character 0x4E5A to 'sjis'
diff --git a/mysql-test/suite/jp/r/jp_convert_ujis.result b/mysql-test/suite/jp/r/jp_convert_ujis.result
index afbc985df64..d47f6b4ef25 100644
--- a/mysql-test/suite/jp/r/jp_convert_ujis.result
+++ b/mysql-test/suite/jp/r/jp_convert_ujis.result
@@ -353,37 +353,37 @@ SELECT `C1`, CONVERT(`C1` using ucs2) FROM `T3`;
・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
SELECT `C1`, CONVERT(`C1` using sjis) FROM `T3`;
C1 CONVERT(`C1` using sjis)
-¤№・・・・・・・・・・・・・・・・・・ NULL
-ЈЉЊЋЌЎЏ・・・・・・・・・・・・・ NULL
-łŀʼnŋøœßŧþ・・・・・・・・・・・ NULL
-ÊĚĖĒĘ・ĜĞĢĠĤÍÌÏÎǏİĪĮĨ NULL
-ĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖ NULL
-ŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙ NULL
-ǕŴÝŸŶŹŽŻ・・・・・・・・・・・・ NULL
-êěėēęǵĝğ・ġĥíìïîǐ・īįĩ NULL
-ĵķĺľļńňņñóòöôǒőōõŕřŗ NULL
-śŝšşťţúùüûŭǔűūųůũǘǜǚ NULL
-ǖŵýÿŷźžż・・・・・・・・・・・・ NULL
-乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠 NULL
-仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众 NULL
-伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘 NULL
-佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄・・・・・ NULL
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖 NULL
-齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒 NULL
-龔龖龗龞龡龢龣龥・・・・・・・・・・・・ NULL
-・˛˚~΄΅・・・・・・・・¡¦¿・・・ NULL
-・άέήίϊΐόςύϋΰώ・・・・・・・ NULL
-・ÆĐ・Ħ・IJ・ŁĿ・ŊØŒ・ŦÞ・・・ NULL
-・ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈË NULL
-・áàäâăǎāąåãćĉčçċďéèë NULL
-・丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑 NULL
-・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪 NULL
-・・ђѓєѕіїјљњћќўџ・・・・・ NULL
-・・・・・ΆΈΉΊΪ・Ό・ΎΫ・Ώ・・・ NULL
-・・・・・・・・・・・・・æđðħıijĸ NULL
-・・・・・・・・・・・・・・ЂЃЄЅІЇ NULL
-・・・・・・・・・・・・・・・˘ˇ¸˙˝ NULL
-・・・・・・・・・・・・・・・ºª©®™ NULL
+¤№・・・・・・・・・・・・・・・・・・ ??・・・・・・・・・・・・・・・・・・
+ЈЉЊЋЌЎЏ・・・・・・・・・・・・・ ???????・・・・・・・・・・・・・
+łŀʼnŋøœßŧþ・・・・・・・・・・・ ?????????・・・・・・・・・・・
+ÊĚĖĒĘ・ĜĞĢĠĤÍÌÏÎǏİĪĮĨ ?????・??????????????
+ĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖ ????????????????????
+ŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙ ????????????????????
+ǕŴÝŸŶŹŽŻ・・・・・・・・・・・・ ????????・・・・・・・・・・・・
+êěėēęǵĝğ・ġĥíìïîǐ・īįĩ ????????・???????・???
+ĵķĺľļńňņñóòöôǒőōõŕřŗ ????????????????????
+śŝšşťţúùüûŭǔűūųůũǘǜǚ ????????????????????
+ǖŵýÿŷźžż・・・・・・・・・・・・ ????????・・・・・・・・・・・・
+乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠 ????????????????????
+仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众 ????????????????????
+伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘 ????????????????????
+佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄・・・・・ ???????????????・・・・・
+鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖 ????????????????????
+齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒 ????????????????????
+龔龖龗龞龡龢龣龥・・・・・・・・・・・・ ????????・・・・・・・・・・・・
+・˛˚~΄΅・・・・・・・・¡¦¿・・・ ・??~??・・・・・・・・???・・・
+・άέήίϊΐόςύϋΰώ・・・・・・・ ・????????????・・・・・・・
+・ÆĐ・Ħ・IJ・ŁĿ・ŊØŒ・ŦÞ・・・ ・??・?・?・??・???・??・・・
+・ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈË ・???????????????????
+・áàäâăǎāąåãćĉčçċďéèë ・???????????????????
+・丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑 ・???????????????????
+・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪 ・???????????????????
+・・ђѓєѕіїјљњћќўџ・・・・・ ・・?????????????・・・・・
+・・・・・ΆΈΉΊΪ・Ό・ΎΫ・Ώ・・・ ・・・・・?????・?・??・?・・・
+・・・・・・・・・・・・・æđðħıijĸ ・・・・・・・・・・・・・???????
+・・・・・・・・・・・・・・ЂЃЄЅІЇ ・・・・・・・・・・・・・・??????
+・・・・・・・・・・・・・・・˘ˇ¸˙˝ ・・・・・・・・・・・・・・・?????
+・・・・・・・・・・・・・・・ºª©®™ ・・・・・・・・・・・・・・・?????
・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
@@ -751,37 +751,37 @@ SELECT `C1`, CONVERT(`C1` using ucs2) FROM `T6`;
・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
SELECT `C1`, CONVERT(`C1` using sjis) FROM `T6`;
C1 CONVERT(`C1` using sjis)
-¤№・・・・・・・・・・・・・・・・・・ NULL
-ЈЉЊЋЌЎЏ・・・・・・・・・・・・・ NULL
-łŀʼnŋøœßŧþ・・・・・・・・・・・ NULL
-ÊĚĖĒĘ・ĜĞĢĠĤÍÌÏÎǏİĪĮĨ NULL
-ĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖ NULL
-ŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙ NULL
-ǕŴÝŸŶŹŽŻ・・・・・・・・・・・・ NULL
-êěėēęǵĝğ・ġĥíìïîǐ・īįĩ NULL
-ĵķĺľļńňņñóòöôǒőōõŕřŗ NULL
-śŝšşťţúùüûŭǔűūųůũǘǜǚ NULL
-ǖŵýÿŷźžż・・・・・・・・・・・・ NULL
-乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠 NULL
-仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众 NULL
-伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘 NULL
-佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄・・・・・ NULL
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖 NULL
-齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒 NULL
-龔龖龗龞龡龢龣龥・・・・・・・・・・・・ NULL
-・˛˚~΄΅・・・・・・・・¡¦¿・・・ NULL
-・άέήίϊΐόςύϋΰώ・・・・・・・ NULL
-・ÆĐ・Ħ・IJ・ŁĿ・ŊØŒ・ŦÞ・・・ NULL
-・ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈË NULL
-・áàäâăǎāąåãćĉčçċďéèë NULL
-・丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑 NULL
-・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪 NULL
-・・ђѓєѕіїјљњћќўџ・・・・・ NULL
-・・・・・ΆΈΉΊΪ・Ό・ΎΫ・Ώ・・・ NULL
-・・・・・・・・・・・・・æđðħıijĸ NULL
-・・・・・・・・・・・・・・ЂЃЄЅІЇ NULL
-・・・・・・・・・・・・・・・˘ˇ¸˙˝ NULL
-・・・・・・・・・・・・・・・ºª©®™ NULL
+¤№・・・・・・・・・・・・・・・・・・ ??・・・・・・・・・・・・・・・・・・
+ЈЉЊЋЌЎЏ・・・・・・・・・・・・・ ???????・・・・・・・・・・・・・
+łŀʼnŋøœßŧþ・・・・・・・・・・・ ?????????・・・・・・・・・・・
+ÊĚĖĒĘ・ĜĞĢĠĤÍÌÏÎǏİĪĮĨ ?????・??????????????
+ĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖ ????????????????????
+ŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙ ????????????????????
+ǕŴÝŸŶŹŽŻ・・・・・・・・・・・・ ????????・・・・・・・・・・・・
+êěėēęǵĝğ・ġĥíìïîǐ・īįĩ ????????・???????・???
+ĵķĺľļńňņñóòöôǒőōõŕřŗ ????????????????????
+śŝšşťţúùüûŭǔűūųůũǘǜǚ ????????????????????
+ǖŵýÿŷźžż・・・・・・・・・・・・ ????????・・・・・・・・・・・・
+乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠 ????????????????????
+仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众 ????????????????????
+伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘 ????????????????????
+佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄・・・・・ ???????????????・・・・・
+鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖 ????????????????????
+齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒 ????????????????????
+龔龖龗龞龡龢龣龥・・・・・・・・・・・・ ????????・・・・・・・・・・・・
+・˛˚~΄΅・・・・・・・・¡¦¿・・・ ・??~??・・・・・・・・???・・・
+・άέήίϊΐόςύϋΰώ・・・・・・・ ・????????????・・・・・・・
+・ÆĐ・Ħ・IJ・ŁĿ・ŊØŒ・ŦÞ・・・ ・??・?・?・??・???・??・・・
+・ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈË ・???????????????????
+・áàäâăǎāąåãćĉčçċďéèë ・???????????????????
+・丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑 ・???????????????????
+・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪 ・???????????????????
+・・ђѓєѕіїјљњћќўџ・・・・・ ・・?????????????・・・・・
+・・・・・ΆΈΉΊΪ・Ό・ΎΫ・Ώ・・・ ・・・・・?????・?・??・?・・・
+・・・・・・・・・・・・・æđðħıijĸ ・・・・・・・・・・・・・???????
+・・・・・・・・・・・・・・ЂЃЄЅІЇ ・・・・・・・・・・・・・・??????
+・・・・・・・・・・・・・・・˘ˇ¸˙˝ ・・・・・・・・・・・・・・・?????
+・・・・・・・・・・・・・・・ºª©®™ ・・・・・・・・・・・・・・・?????
・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
@@ -1149,45 +1149,45 @@ SELECT `C1`, CONVERT(`C1` using ucs2) FROM `T9`;
・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
SELECT `C1`, CONVERT(`C1` using sjis) FROM `T9`;
C1 CONVERT(`C1` using sjis)
-・・・・・・・・・・・・・・・˘ˇ¸˙˝ NULL
-・˛˚~΄΅・・・・・・・・¡¦¿・・・ NULL
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・ºª©®™ NULL
-¤№・・・・・・・・・・・・・・・・・・ NULL
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・ΆΈΉΊΪ・Ό・ΎΫ・Ώ・・・ NULL
-・άέήίϊΐόςύϋΰώ・・・・・・・ NULL
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・ЂЃЄЅІЇ NULL
-ЈЉЊЋЌЎЏ・・・・・・・・・・・・・ NULL
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・ђѓєѕіїјљњћќўџ・・・・・ NULL
-・ÆĐ・Ħ・IJ・ŁĿ・ŊØŒ・ŦÞ・・・ NULL
-・・・・・・・・・・・・・æđðħıijĸ NULL
-łŀʼnŋøœßŧþ・・・・・・・・・・・ NULL
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈË NULL
-ÊĚĖĒĘ・ĜĞĢĠĤÍÌÏÎǏİĪĮĨ NULL
-ĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖ NULL
-ŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙ NULL
-ǕŴÝŸŶŹŽŻ・・・・・・・・・・・・ NULL
-・áàäâăǎāąåãćĉčçċďéèë NULL
-êěėēęǵĝğ・ġĥíìïîǐ・īįĩ NULL
-ĵķĺľļńňņñóòöôǒőōõŕřŗ NULL
-śŝšşťţúùüûŭǔűūųůũǘǜǚ NULL
-ǖŵýÿŷźžż・・・・・・・・・・・・ NULL
-・丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑 NULL
-乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠 NULL
-仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众 NULL
-伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘 NULL
-佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄・・・・・ NULL
-・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪 NULL
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖 NULL
-齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒 NULL
-龔龖龗龞龡龢龣龥・・・・・・・・・・・・ NULL
+・・・・・・・・・・・・・・・˘ˇ¸˙˝ ・・・・・・・・・・・・・・・?????
+・˛˚~΄΅・・・・・・・・¡¦¿・・・ ・??~??・・・・・・・・???・・・
+・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
+・・・・・・・・・・・・・・・ºª©®™ ・・・・・・・・・・・・・・・?????
+¤№・・・・・・・・・・・・・・・・・・ ??・・・・・・・・・・・・・・・・・・
+・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
+・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
+・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
+・・・・・ΆΈΉΊΪ・Ό・ΎΫ・Ώ・・・ ・・・・・?????・?・??・?・・・
+・άέήίϊΐόςύϋΰώ・・・・・・・ ・????????????・・・・・・・
+・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
+・・・・・・・・・・・・・・ЂЃЄЅІЇ ・・・・・・・・・・・・・・??????
+ЈЉЊЋЌЎЏ・・・・・・・・・・・・・ ???????・・・・・・・・・・・・・
+・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
+・・ђѓєѕіїјљњћќўџ・・・・・ ・・?????????????・・・・・
+・ÆĐ・Ħ・IJ・ŁĿ・ŊØŒ・ŦÞ・・・ ・??・?・?・??・???・??・・・
+・・・・・・・・・・・・・æđðħıijĸ ・・・・・・・・・・・・・???????
+łŀʼnŋøœßŧþ・・・・・・・・・・・ ?????????・・・・・・・・・・・
+・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
+・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
+・ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈË ・???????????????????
+ÊĚĖĒĘ・ĜĞĢĠĤÍÌÏÎǏİĪĮĨ ?????・??????????????
+ĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖ ????????????????????
+ŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙ ????????????????????
+ǕŴÝŸŶŹŽŻ・・・・・・・・・・・・ ????????・・・・・・・・・・・・
+・áàäâăǎāąåãćĉčçċďéèë ・???????????????????
+êěėēęǵĝğ・ġĥíìïîǐ・īįĩ ????????・???????・???
+ĵķĺľļńňņñóòöôǒőōõŕřŗ ????????????????????
+śŝšşťţúùüûŭǔűūųůũǘǜǚ ????????????????????
+ǖŵýÿŷźžż・・・・・・・・・・・・ ????????・・・・・・・・・・・・
+・丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑 ・???????????????????
+乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠 ????????????????????
+仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众 ????????????????????
+伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘 ????????????????????
+佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄・・・・・ ???????????????・・・・・
+・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪 ・???????????????????
+鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖 ????????????????????
+齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒 ????????????????????
+龔龖龗龞龡龢龣龥・・・・・・・・・・・・ ????????・・・・・・・・・・・・
・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
Warnings:
Warning 1977 Cannot convert 'ujis' character 0x8FA2AF to 'sjis'
diff --git a/mysql-test/suite/jp/r/jp_convert_utf8.result b/mysql-test/suite/jp/r/jp_convert_utf8.result
index 89c8b582c40..e33edfb1c3f 100644
--- a/mysql-test/suite/jp/r/jp_convert_utf8.result
+++ b/mysql-test/suite/jp/r/jp_convert_utf8.result
@@ -111,7 +111,7 @@ SELECT `鐚o`, CONVERT(`鐚o` using ujis) FROM `鐚器`;
糸筝筝筝筝延原筝寂舷箙箙箙篋篋莟篋綣篋篋 糸筝筝筝筝延原筝寂舷箙箙箙篋篋莟篋綣篋篋
肢i薛罠莖莊峨翫綮綣罐惹羌羲 肢i薛罠莖莊峨翫綮綣罐惹羌羲
脂薺薺ら薺薺薺臥藏藏薺薺咲藏ら匡藏臥薹藏 脂薺薺ら薺薺薺臥藏藏薺薺咲藏ら匡藏臥薹藏
-障篁錫鐚鐚若鐔モ NULL
+障篁錫鐚鐚若鐔モ 障篁錫鐚?鐔モ
篋篋篋≫紺篋割唆篁篁篁篁篁篁篁篁篁篁隙篏篌遺 篋篋篋≫紺篋割唆篁篁篁篁篁篁篁篁篁篁隙篏篌遺
篏篏篏篏銀箴鋐篏私秋篏遺篏箴箴篆篆篆篆篆 篏篏篏篏銀箴鋐篏私秋篏遺篏箴箴篆篆篆篆篆
篆篆篆篆や織ュ篌篆九≦篆鞘侵 篆篆篆篆や織ュ篌篆九≦篆鞘侵
@@ -249,7 +249,7 @@ SELECT `鐚o`, CONVERT(`鐚o` using sjis) FROM `鐚器`;
糸筝筝筝筝延原筝寂舷箙箙箙篋篋莟篋綣篋篋 糸筝筝筝筝延原筝寂舷箙箙箙篋篋莟篋綣篋篋
肢i薛罠莖莊峨翫綮綣罐惹羌羲 肢i薛罠莖莊峨翫綮綣罐惹羌羲
脂薺薺ら薺薺薺臥藏藏薺薺咲藏ら匡藏臥薹藏 脂薺薺ら薺薺薺臥藏藏薺薺咲藏ら匡藏臥薹藏
-障篁錫鐚鐚若鐔モ NULL
+障篁錫鐚鐚若鐔モ 障篁錫鐚?鐔モ
篋篋篋≫紺篋割唆篁篁篁篁篁篁篁篁篁篁隙篏篌遺 篋篋篋≫紺篋割唆篁篁篁篁篁篁篁篁篁篁隙篏篌遺
篏篏篏篏銀箴鋐篏私秋篏遺篏箴箴篆篆篆篆篆 篏篏篏篏銀箴鋐篏私秋篏遺篏箴箴篆篆篆篆篆
篆篆篆篆や織ュ篌篆九≦篆鞘侵 篆篆篆篆や織ュ篌篆九≦篆鞘侵
@@ -287,7 +287,7 @@ SELECT `鐚o`, CONVERT(`鐚o` using ujis) FROM `鐚器`;
暫テ 暫テ
暫|辰但ト奪達巽枎竪谷 暫|辰但ト奪達巽枎竪谷
暫残残蚊仕朕仕仕γ祉祉 暫残残蚊仕朕仕仕γ祉祉
-史鐔祉祉祉祉祉祉祉斬‖β帥祉祉 NULL
+史鐔祉祉祉祉祉祉祉斬‖β帥祉祉 史?祉祉祉祉祉祉祉斬‖β帥祉祉
士劉流溜琉祉祉祉祉祉祉 士劉流溜琉祉祉祉祉祉祉
祉姿祉祉祉祉 祉姿祉祉祉祉
祉祉祉祉士葎士士ホ士祉祉 祉祉祉祉士葎士士ホ士祉祉
@@ -359,46 +359,46 @@ SELECT `鐚o`, CONVERT(`鐚o` using ucs2) FROM `鐚器`;
蘊蘊蘊蘊蘊♂匠蘊i哨祉祉祉祉祉祉祉祉祉祉祉 蘊蘊蘊蘊蘊♂匠蘊i哨祉祉祉祉祉祉祉祉祉祉祉
SELECT `鐚o`, CONVERT(`鐚o` using sjis) FROM `鐚器`;
鐚o CONVERT(`鐚o` using sjis)
-棚乃残…ッ狸誰樽残眺挑 NULL
-残帳弔ヌ棵暢町懲 NULL
-調超長捗鳥 NULL
-諜跳頂直勅単坦嘆旦担探 NULL
-鼎鄭適徹的轍溺敵 NULL
-邸泥釘炭湛端短鏑撤笛迭哲滴 NULL
-鉄展填店貼纏祉祉祉祉祉祉祉祉祉祉祉 NULL
-典箪耽天添転甜祉祉祉祉祉祉祉祉祉祉祉 NULL
-造祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 NULL
-淡擢綻祉祉祉祉祉祉祉祉祉祉 NULL
-ミ祉祉祉祉祉祉祉祉祉祉祉祉 NULL
-暫テ NULL
-暫|辰但ト奪達巽枎竪谷 NULL
-暫残残蚊仕朕仕仕γ祉祉 NULL
-史鐔祉祉祉祉祉祉祉斬‖β帥祉祉 NULL
-士劉流溜琉祉祉祉祉祉祉 NULL
-祉姿祉祉祉祉 NULL
-祉祉祉祉士葎士士ホ士祉祉 NULL
-祉祉祉祉祉祉祉祉祉祉祉祉暫δ丹徴脹蝶銚 NULL
-祉祉祉祉祉祉祉祉祉祉祉祉祉姉 NULL
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉斬座息速 NULL
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉史存 NULL
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
-私筝筝筝筝筝筝d犬筝筝筝筝筝遺元箙箙箙箙箙 NULL
-脂燦藥翠藜藜藜騐藜藜藜藜藜藜藜藜藜藜∫痔藜 NULL
-箙箙箙d宏箙箙岩控箙剛洪篋篋篋篋篋篋剛篁篁篁篁 NULL
-篁>拶篁篁篁延山篁灸蚕篁鞘賛篌篌篌篌篌篌篌篌篌篌 NULL
-篌篌篌延篌割宍篌隙執篌私湿篏篏篏篏篏篏篏篏篏篏 NULL
-篏篏d終篏篏篏延酬篏娯醜篏坂十篏鞘箴箴祉祉祉祉 NULL
-藜藜藜演鴫藜顔七藜拷失藜守悉藜翠藹藹藹藹藹藹藹藹 NULL
-藹藹藹藹藹藹藹藹藹藹藹育襲藹渇週藹咲十蘊騖蘊蘊 NULL
-蘊蘊蘊蘊蘊♂匠蘊i哨祉祉祉祉祉祉祉祉祉祉祉 NULL
+棚乃残…ッ狸誰樽残眺挑 ??????????????????
+残帳弔ヌ棵暢町懲 ???????????????????
+調超長捗鳥 ????????????????????
+諜跳頂直勅単坦嘆旦担探 ????????????????????
+鼎鄭適徹的轍溺敵 ????????????????????
+邸泥釘炭湛端短鏑撤笛迭哲滴 ????????????????????
+鉄展填店貼纏祉祉祉祉祉祉祉祉祉祉祉 ????????祉祉祉祉祉祉祉祉祉祉祉
+典箪耽天添転甜祉祉祉祉祉祉祉祉祉祉祉 ????????祉祉祉祉祉祉祉祉祉祉祉
+造祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 ??祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+淡擢綻祉祉祉祉祉祉祉祉祉祉 ?????????祉祉祉祉祉祉祉祉祉祉
+ミ祉祉祉祉祉祉祉祉祉祉祉祉 ???????祉祉祉祉祉祉祉祉祉祉祉祉
+暫テ ???????????????????
+暫|辰但ト奪達巽枎竪谷 ???????????????????
+暫残残蚊仕朕仕仕γ祉祉 ???????????祉祉
+史鐔祉祉祉祉祉祉祉斬‖β帥祉祉 ?????祉祉祉祉祉祉祉???祉祉
+士劉流溜琉祉祉祉祉祉祉 ????????????祉祉祉祉祉祉
+祉姿祉祉祉祉 祉?????????????祉祉祉祉
+祉祉祉祉士葎士士ホ士祉祉 祉祉祉祉?????????祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉暫δ丹徴脹蝶銚 祉祉祉祉祉祉祉祉祉祉祉祉???????
+祉祉祉祉祉祉祉祉祉祉祉祉祉姉 祉祉祉祉祉祉祉祉祉祉祉祉祉??????
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉斬座息速 祉祉祉祉祉祉祉祉祉祉祉祉祉祉?????
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉史存 祉祉祉祉祉祉祉祉祉祉祉祉祉祉?????
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+私筝筝筝筝筝筝d犬筝筝筝筝筝遺元箙箙箙箙箙 ???????????????????
+脂燦藥翠藜藜藜騐藜藜藜藜藜藜藜藜藜藜∫痔藜 ???????????????????
+箙箙箙d宏箙箙岩控箙剛洪篋篋篋篋篋篋剛篁篁篁篁 ????????????????????
+篁>拶篁篁篁延山篁灸蚕篁鞘賛篌篌篌篌篌篌篌篌篌篌 ????????????????????
+篌篌篌延篌割宍篌隙執篌私湿篏篏篏篏篏篏篏篏篏篏 ????????????????????
+篏篏d終篏篏篏延酬篏娯醜篏坂十篏鞘箴箴祉祉祉祉 ???????????????祉祉祉祉
+藜藜藜演鴫藜顔七藜拷失藜守悉藜翠藹藹藹藹藹藹藹藹 ????????????????????
+藹藹藹藹藹藹藹藹藹藹藹育襲藹渇週藹咲十蘊騖蘊蘊 ????????????????????
+蘊蘊蘊蘊蘊♂匠蘊i哨祉祉祉祉祉祉祉祉祉祉祉 ????????祉祉祉祉祉祉祉祉祉祉祉
Warnings:
Warning 1977 Cannot convert 'utf8' character 0xC3AA to 'sjis'
Warning 1977 Cannot convert 'utf8' character 0xC38A to 'sjis'
@@ -515,7 +515,7 @@ SELECT `鐚o`, CONVERT(`鐚o` using ujis) FROM `鐚器`;
糸筝筝筝筝延原筝寂舷箙箙箙篋篋莟篋綣篋篋 糸筝筝筝筝延原筝寂舷箙箙箙篋篋莟篋綣篋篋
肢i薛罠莖莊峨翫綮綣罐惹羌羲 肢i薛罠莖莊峨翫綮綣罐惹羌羲
脂薺薺ら薺薺薺臥藏藏薺薺咲藏ら匡藏臥薹藏 脂薺薺ら薺薺薺臥藏藏薺薺咲藏ら匡藏臥薹藏
-障篁錫鐚鐚若鐔モ NULL
+障篁錫鐚鐚若鐔モ 障篁錫鐚?鐔モ
篋篋篋≫紺篋割唆篁篁篁篁篁篁篁篁篁篁隙篏篌遺 篋篋篋≫紺篋割唆篁篁篁篁篁篁篁篁篁篁隙篏篌遺
篏篏篏篏銀箴鋐篏私秋篏遺篏箴箴篆篆篆篆篆 篏篏篏篏銀箴鋐篏私秋篏遺篏箴箴篆篆篆篆篆
篆篆篆篆や織ュ篌篆九≦篆鞘侵 篆篆篆篆や織ュ篌篆九≦篆鞘侵
@@ -653,7 +653,7 @@ SELECT `鐚o`, CONVERT(`鐚o` using sjis) FROM `鐚器`;
糸筝筝筝筝延原筝寂舷箙箙箙篋篋莟篋綣篋篋 糸筝筝筝筝延原筝寂舷箙箙箙篋篋莟篋綣篋篋
肢i薛罠莖莊峨翫綮綣罐惹羌羲 肢i薛罠莖莊峨翫綮綣罐惹羌羲
脂薺薺ら薺薺薺臥藏藏薺薺咲藏ら匡藏臥薹藏 脂薺薺ら薺薺薺臥藏藏薺薺咲藏ら匡藏臥薹藏
-障篁錫鐚鐚若鐔モ NULL
+障篁錫鐚鐚若鐔モ 障篁錫鐚?鐔モ
篋篋篋≫紺篋割唆篁篁篁篁篁篁篁篁篁篁隙篏篌遺 篋篋篋≫紺篋割唆篁篁篁篁篁篁篁篁篁篁隙篏篌遺
篏篏篏篏銀箴鋐篏私秋篏遺篏箴箴篆篆篆篆篆 篏篏篏篏銀箴鋐篏私秋篏遺篏箴箴篆篆篆篆篆
篆篆篆篆や織ュ篌篆九≦篆鞘侵 篆篆篆篆や織ュ篌篆九≦篆鞘侵
@@ -691,7 +691,7 @@ SELECT `鐚o`, CONVERT(`鐚o` using ujis) FROM `鐚器`;
暫テ 暫テ
暫|辰但ト奪達巽枎竪谷 暫|辰但ト奪達巽枎竪谷
暫残残蚊仕朕仕仕γ祉祉 暫残残蚊仕朕仕仕γ祉祉
-史鐔祉祉祉祉祉祉祉斬‖β帥祉祉 NULL
+史鐔祉祉祉祉祉祉祉斬‖β帥祉祉 史?祉祉祉祉祉祉祉斬‖β帥祉祉
士劉流溜琉祉祉祉祉祉祉 士劉流溜琉祉祉祉祉祉祉
祉姿祉祉祉祉 祉姿祉祉祉祉
祉祉祉祉士葎士士ホ士祉祉 祉祉祉祉士葎士士ホ士祉祉
@@ -763,46 +763,46 @@ SELECT `鐚o`, CONVERT(`鐚o` using ucs2) FROM `鐚器`;
蘊蘊蘊蘊蘊♂匠蘊i哨祉祉祉祉祉祉祉祉祉祉祉 蘊蘊蘊蘊蘊♂匠蘊i哨祉祉祉祉祉祉祉祉祉祉祉
SELECT `鐚o`, CONVERT(`鐚o` using sjis) FROM `鐚器`;
鐚o CONVERT(`鐚o` using sjis)
-棚乃残…ッ狸誰樽残眺挑 NULL
-残帳弔ヌ棵暢町懲 NULL
-調超長捗鳥 NULL
-諜跳頂直勅単坦嘆旦担探 NULL
-鼎鄭適徹的轍溺敵 NULL
-邸泥釘炭湛端短鏑撤笛迭哲滴 NULL
-鉄展填店貼纏祉祉祉祉祉祉祉祉祉祉祉 NULL
-典箪耽天添転甜祉祉祉祉祉祉祉祉祉祉祉 NULL
-造祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 NULL
-淡擢綻祉祉祉祉祉祉祉祉祉祉 NULL
-ミ祉祉祉祉祉祉祉祉祉祉祉祉 NULL
-暫テ NULL
-暫|辰但ト奪達巽枎竪谷 NULL
-暫残残蚊仕朕仕仕γ祉祉 NULL
-史鐔祉祉祉祉祉祉祉斬‖β帥祉祉 NULL
-士劉流溜琉祉祉祉祉祉祉 NULL
-祉姿祉祉祉祉 NULL
-祉祉祉祉士葎士士ホ士祉祉 NULL
-祉祉祉祉祉祉祉祉祉祉祉祉暫δ丹徴脹蝶銚 NULL
-祉祉祉祉祉祉祉祉祉祉祉祉祉姉 NULL
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉斬座息速 NULL
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉史存 NULL
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
-私筝筝筝筝筝筝d犬筝筝筝筝筝遺元箙箙箙箙箙 NULL
-脂燦藥翠藜藜藜騐藜藜藜藜藜藜藜藜藜藜∫痔藜 NULL
-箙箙箙d宏箙箙岩控箙剛洪篋篋篋篋篋篋剛篁篁篁篁 NULL
-篁>拶篁篁篁延山篁灸蚕篁鞘賛篌篌篌篌篌篌篌篌篌篌 NULL
-篌篌篌延篌割宍篌隙執篌私湿篏篏篏篏篏篏篏篏篏篏 NULL
-篏篏d終篏篏篏延酬篏娯醜篏坂十篏鞘箴箴祉祉祉祉 NULL
-藜藜藜演鴫藜顔七藜拷失藜守悉藜翠藹藹藹藹藹藹藹藹 NULL
-藹藹藹藹藹藹藹藹藹藹藹育襲藹渇週藹咲十蘊騖蘊蘊 NULL
-蘊蘊蘊蘊蘊♂匠蘊i哨祉祉祉祉祉祉祉祉祉祉祉 NULL
+棚乃残…ッ狸誰樽残眺挑 ??????????????????
+残帳弔ヌ棵暢町懲 ???????????????????
+調超長捗鳥 ????????????????????
+諜跳頂直勅単坦嘆旦担探 ????????????????????
+鼎鄭適徹的轍溺敵 ????????????????????
+邸泥釘炭湛端短鏑撤笛迭哲滴 ????????????????????
+鉄展填店貼纏祉祉祉祉祉祉祉祉祉祉祉 ????????祉祉祉祉祉祉祉祉祉祉祉
+典箪耽天添転甜祉祉祉祉祉祉祉祉祉祉祉 ????????祉祉祉祉祉祉祉祉祉祉祉
+造祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 ??祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+淡擢綻祉祉祉祉祉祉祉祉祉祉 ?????????祉祉祉祉祉祉祉祉祉祉
+ミ祉祉祉祉祉祉祉祉祉祉祉祉 ???????祉祉祉祉祉祉祉祉祉祉祉祉
+暫テ ???????????????????
+暫|辰但ト奪達巽枎竪谷 ???????????????????
+暫残残蚊仕朕仕仕γ祉祉 ???????????祉祉
+史鐔祉祉祉祉祉祉祉斬‖β帥祉祉 ?????祉祉祉祉祉祉祉???祉祉
+士劉流溜琉祉祉祉祉祉祉 ????????????祉祉祉祉祉祉
+祉姿祉祉祉祉 祉?????????????祉祉祉祉
+祉祉祉祉士葎士士ホ士祉祉 祉祉祉祉?????????祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉暫δ丹徴脹蝶銚 祉祉祉祉祉祉祉祉祉祉祉祉???????
+祉祉祉祉祉祉祉祉祉祉祉祉祉姉 祉祉祉祉祉祉祉祉祉祉祉祉祉??????
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉斬座息速 祉祉祉祉祉祉祉祉祉祉祉祉祉祉?????
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉史存 祉祉祉祉祉祉祉祉祉祉祉祉祉祉?????
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+私筝筝筝筝筝筝d犬筝筝筝筝筝遺元箙箙箙箙箙 ???????????????????
+脂燦藥翠藜藜藜騐藜藜藜藜藜藜藜藜藜藜∫痔藜 ???????????????????
+箙箙箙d宏箙箙岩控箙剛洪篋篋篋篋篋篋剛篁篁篁篁 ????????????????????
+篁>拶篁篁篁延山篁灸蚕篁鞘賛篌篌篌篌篌篌篌篌篌篌 ????????????????????
+篌篌篌延篌割宍篌隙執篌私湿篏篏篏篏篏篏篏篏篏篏 ????????????????????
+篏篏d終篏篏篏延酬篏娯醜篏坂十篏鞘箴箴祉祉祉祉 ???????????????祉祉祉祉
+藜藜藜演鴫藜顔七藜拷失藜守悉藜翠藹藹藹藹藹藹藹藹 ????????????????????
+藹藹藹藹藹藹藹藹藹藹藹育襲藹渇週藹咲十蘊騖蘊蘊 ????????????????????
+蘊蘊蘊蘊蘊♂匠蘊i哨祉祉祉祉祉祉祉祉祉祉祉 ????????祉祉祉祉祉祉祉祉祉祉祉
Warnings:
Warning 1977 Cannot convert 'utf8' character 0xC3AA to 'sjis'
Warning 1977 Cannot convert 'utf8' character 0xC38A to 'sjis'
@@ -874,7 +874,7 @@ pqrstuvwxyz{|}~ pqrstuvwxyz{|}~
SELECT `鐚o`, CONVERT(`鐚o` using ujis) FROM `鐚器`;
鐚o CONVERT(`鐚o` using ujis)
鐚鐚誌鐚鐚鐚卒鐔即鐚常殖鐚帥 鐚鐚誌鐚鐚鐚卒鐔即鐚常殖鐚帥
-障篁錫鐚鐚若鐔モ NULL
+障篁錫鐚鐚若鐔モ 障篁錫鐚?鐔モ
鐚鐚鐚誌悉鐔鐔 鐚鐚鐚誌悉鐔鐔
鐚賊歎鐚鐚鐚р癌属霞鰍鐃 鐚賊歎鐚鐚鐚р癌属霞鰍鐃
鐚蔵贈鐚鐚鐚鐚鐚則祉祉祉祉 鐚蔵贈鐚鐚鐚鐚鐚則祉祉祉祉
@@ -1012,7 +1012,7 @@ SELECT `鐚o`, CONVERT(`鐚o` using ucs2) FROM `鐚器`;
SELECT `鐚o`, CONVERT(`鐚o` using sjis) FROM `鐚器`;
鐚o CONVERT(`鐚o` using sjis)
鐚鐚誌鐚鐚鐚卒鐔即鐚常殖鐚帥 鐚鐚誌鐚鐚鐚卒鐔即鐚常殖鐚帥
-障篁錫鐚鐚若鐔モ NULL
+障篁錫鐚鐚若鐔モ 障篁錫鐚?鐔モ
鐚鐚鐚誌悉鐔鐔 鐚鐚鐚誌悉鐔鐔
鐚賊歎鐚鐚鐚р癌属霞鰍鐃 鐚賊歎鐚鐚鐚р癌属霞鰍鐃
鐚蔵贈鐚鐚鐚鐚鐚則祉祉祉祉 鐚蔵贈鐚鐚鐚鐚鐚則祉祉祉祉
@@ -1082,7 +1082,7 @@ Warning 1977 Cannot convert 'utf8' character 0xEFBCBC to 'sjis'
SELECT `鐚o`, CONVERT(`鐚o` using ujis) FROM `鐚器`;
鐚o CONVERT(`鐚o` using ujis)
祉祉祉祉祉祉祉祉祉祉祉祉祉祉史存 祉祉祉祉祉祉祉祉祉祉祉祉祉祉史存
-史鐔祉祉祉祉祉祉祉斬‖β帥祉祉 NULL
+史鐔祉祉祉祉祉祉祉斬‖β帥祉祉 史?祉祉祉祉祉祉祉斬‖β帥祉祉
祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
祉祉祉祉祉祉祉祉祉祉祉祉祉祉斬座息速 祉祉祉祉祉祉祉祉祉祉祉祉祉祉斬座息速
造祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 造祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
@@ -1167,45 +1167,45 @@ SELECT `鐚o`, CONVERT(`鐚o` using ucs2) FROM `鐚器`;
祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
SELECT `鐚o`, CONVERT(`鐚o` using sjis) FROM `鐚器`;
鐚o CONVERT(`鐚o` using sjis)
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉史存 NULL
-史鐔祉祉祉祉祉祉祉斬‖β帥祉祉 NULL
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉斬座息速 NULL
-造祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 NULL
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
-祉祉祉祉士葎士士ホ士祉祉 NULL
-士劉流溜琉祉祉祉祉祉祉 NULL
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
-祉祉祉祉祉祉祉祉祉祉祉祉祉姉 NULL
-ミ祉祉祉祉祉祉祉祉祉祉祉祉 NULL
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
-祉姿祉祉祉祉 NULL
-暫残残蚊仕朕仕仕γ祉祉 NULL
-祉祉祉祉祉祉祉祉祉祉祉祉暫δ丹徴脹蝶銚 NULL
-淡擢綻祉祉祉祉祉祉祉祉祉祉 NULL
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
-祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
-暫テ NULL
-残帳弔ヌ棵暢町懲 NULL
-調超長捗鳥 NULL
-鼎鄭適徹的轍溺敵 NULL
-鉄展填店貼纏祉祉祉祉祉祉祉祉祉祉祉 NULL
-暫|辰但ト奪達巽枎竪谷 NULL
-棚乃残…ッ狸誰樽残眺挑 NULL
-諜跳頂直勅単坦嘆旦担探 NULL
-邸泥釘炭湛端短鏑撤笛迭哲滴 NULL
-典箪耽天添転甜祉祉祉祉祉祉祉祉祉祉祉 NULL
-私筝筝筝筝筝筝d犬筝筝筝筝筝遺元箙箙箙箙箙 NULL
-箙箙箙d宏箙箙岩控箙剛洪篋篋篋篋篋篋剛篁篁篁篁 NULL
-篁>拶篁篁篁延山篁灸蚕篁鞘賛篌篌篌篌篌篌篌篌篌篌 NULL
-篌篌篌延篌割宍篌隙執篌私湿篏篏篏篏篏篏篏篏篏篏 NULL
-篏篏d終篏篏篏延酬篏娯醜篏坂十篏鞘箴箴祉祉祉祉 NULL
-脂燦藥翠藜藜藜騐藜藜藜藜藜藜藜藜藜藜∫痔藜 NULL
-藜藜藜演鴫藜顔七藜拷失藜守悉藜翠藹藹藹藹藹藹藹藹 NULL
-藹藹藹藹藹藹藹藹藹藹藹育襲藹渇週藹咲十蘊騖蘊蘊 NULL
-蘊蘊蘊蘊蘊♂匠蘊i哨祉祉祉祉祉祉祉祉祉祉祉 NULL
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉史存 祉祉祉祉祉祉祉祉祉祉祉祉祉祉?????
+史鐔祉祉祉祉祉祉祉斬‖β帥祉祉 ?????祉祉祉祉祉祉祉???祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉斬座息速 祉祉祉祉祉祉祉祉祉祉祉祉祉祉?????
+造祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 ??祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+祉祉祉祉士葎士士ホ士祉祉 祉祉祉祉?????????祉祉
+士劉流溜琉祉祉祉祉祉祉 ????????????祉祉祉祉祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉祉姉 祉祉祉祉祉祉祉祉祉祉祉祉祉??????
+ミ祉祉祉祉祉祉祉祉祉祉祉祉 ???????祉祉祉祉祉祉祉祉祉祉祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+祉姿祉祉祉祉 祉?????????????祉祉祉祉
+暫残残蚊仕朕仕仕γ祉祉 ???????????祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉暫δ丹徴脹蝶銚 祉祉祉祉祉祉祉祉祉祉祉祉???????
+淡擢綻祉祉祉祉祉祉祉祉祉祉 ?????????祉祉祉祉祉祉祉祉祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
+暫テ ???????????????????
+残帳弔ヌ棵暢町懲 ???????????????????
+調超長捗鳥 ????????????????????
+鼎鄭適徹的轍溺敵 ????????????????????
+鉄展填店貼纏祉祉祉祉祉祉祉祉祉祉祉 ????????祉祉祉祉祉祉祉祉祉祉祉
+暫|辰但ト奪達巽枎竪谷 ???????????????????
+棚乃残…ッ狸誰樽残眺挑 ??????????????????
+諜跳頂直勅単坦嘆旦担探 ????????????????????
+邸泥釘炭湛端短鏑撤笛迭哲滴 ????????????????????
+典箪耽天添転甜祉祉祉祉祉祉祉祉祉祉祉 ????????祉祉祉祉祉祉祉祉祉祉祉
+私筝筝筝筝筝筝d犬筝筝筝筝筝遺元箙箙箙箙箙 ???????????????????
+箙箙箙d宏箙箙岩控箙剛洪篋篋篋篋篋篋剛篁篁篁篁 ????????????????????
+篁>拶篁篁篁延山篁灸蚕篁鞘賛篌篌篌篌篌篌篌篌篌篌 ????????????????????
+篌篌篌延篌割宍篌隙執篌私湿篏篏篏篏篏篏篏篏篏篏 ????????????????????
+篏篏d終篏篏篏延酬篏娯醜篏坂十篏鞘箴箴祉祉祉祉 ???????????????祉祉祉祉
+脂燦藥翠藜藜藜騐藜藜藜藜藜藜藜藜藜藜∫痔藜 ???????????????????
+藜藜藜演鴫藜顔七藜拷失藜守悉藜翠藹藹藹藹藹藹藹藹 ????????????????????
+藹藹藹藹藹藹藹藹藹藹藹育襲藹渇週藹咲十蘊騖蘊蘊 ????????????????????
+蘊蘊蘊蘊蘊♂匠蘊i哨祉祉祉祉祉祉祉祉祉祉祉 ????????祉祉祉祉祉祉祉祉祉祉祉
祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉 祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉祉
Warnings:
Warning 1977 Cannot convert 'utf8' character 0xCB98 to 'sjis'
diff --git a/mysql-test/suite/mariabackup/apply-log-only-incr.result b/mysql-test/suite/mariabackup/apply-log-only-incr.result
new file mode 100644
index 00000000000..2baed8c1db9
--- /dev/null
+++ b/mysql-test/suite/mariabackup/apply-log-only-incr.result
@@ -0,0 +1,29 @@
+call mtr.add_suppression("InnoDB: New log files created");
+CREATE TABLE t(a INT UNSIGNED PRIMARY KEY) ENGINE INNODB;
+INSERT INTO t VALUES(0);
+COMMIT;
+start transaction;
+NOT FOUND /Rollback of trx with id/ in current_test
+# expect NOT FOUND
+NOT FOUND /Rollback of trx with id/ in current_test
+# expect NOT FOUND
+commit;
+SELECT count(*) FROM t;
+count(*)
+201
+# Restore and check results
+# shutdown server
+# remove datadir
+# xtrabackup move back
+# restart server
+SELECT COUNT(*) FROM t;
+COUNT(*)
+1
+SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+SELECT COUNT(*) FROM t;
+COUNT(*)
+201
+SELECT * FROM t;
+a
+0
+DROP TABLE t;
diff --git a/mysql-test/suite/mariabackup/apply-log-only-incr.test b/mysql-test/suite/mariabackup/apply-log-only-incr.test
new file mode 100644
index 00000000000..aa5110cc51e
--- /dev/null
+++ b/mysql-test/suite/mariabackup/apply-log-only-incr.test
@@ -0,0 +1,63 @@
+--source include/have_innodb.inc
+
+call mtr.add_suppression("InnoDB: New log files created");
+
+let $basedir=$MYSQLTEST_VARDIR/tmp/backup;
+let $incremental_dir=$MYSQLTEST_VARDIR/tmp/backup_inc1;
+
+CREATE TABLE t(a INT UNSIGNED PRIMARY KEY) ENGINE INNODB;
+INSERT INTO t VALUES(0);
+COMMIT;
+
+start transaction;
+--disable_query_log
+let $n=100;
+while ($n) {
+eval INSERT t VALUES(101-$n);
+dec $n;
+}
+
+--disable_result_log
+exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$basedir;
+--enable_result_log
+let $n=100;
+while ($n) {
+eval INSERT t VALUES(201-$n);
+dec $n;
+}
+--enable_query_log
+
+--disable_result_log
+exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --ftwrl-wait-timeout=5 --ftwrl-wait-threshold=300 --ftwrl-wait-query-type=all --target-dir=$incremental_dir --incremental-basedir=$basedir ;
+exec $XTRABACKUP --prepare --apply-log-only --target-dir=$basedir ;
+--enable_result_log
+
+let SEARCH_FILE=$MYSQLTEST_VARDIR/log/current_test;
+--let SEARCH_PATTERN= Rollback of trx with id
+--source include/search_pattern_in_file.inc
+--echo # expect NOT FOUND
+
+exec $XTRABACKUP --prepare --apply-log-only --target-dir=$basedir --incremental-dir=$incremental_dir ;
+
+--source include/search_pattern_in_file.inc
+--echo # expect NOT FOUND
+
+commit;
+SELECT count(*) FROM t;
+echo # Restore and check results;
+--let $targetdir=$basedir
+--let $restart_parameters= --innodb-force-recovery=3
+--source include/restart_and_restore.inc
+
+rmdir $basedir;
+rmdir $incremental_dir;
+
+SELECT COUNT(*) FROM t;
+SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+SELECT COUNT(*) FROM t;
+
+--let $restart_parameters=
+--source include/restart_mysqld.inc
+
+SELECT * FROM t;
+DROP TABLE t;
diff --git a/mysql-test/suite/mariabackup/apply-log-only.result b/mysql-test/suite/mariabackup/apply-log-only.result
new file mode 100644
index 00000000000..04b9c0d8ee2
--- /dev/null
+++ b/mysql-test/suite/mariabackup/apply-log-only.result
@@ -0,0 +1,10 @@
+call mtr.add_suppression("InnoDB: New log files created");
+CREATE TABLE t(a varchar(60)) ENGINE INNODB;
+start transaction;
+INSERT INTO t VALUES(1);
+NOT FOUND /Rollback of trx with id/ in current_test
+# expect NOT FOUND
+SELECT count(*) FROM t;
+count(*)
+1
+DROP TABLE t;
diff --git a/mysql-test/suite/mariabackup/apply-log-only.test b/mysql-test/suite/mariabackup/apply-log-only.test
new file mode 100644
index 00000000000..96a251fc03b
--- /dev/null
+++ b/mysql-test/suite/mariabackup/apply-log-only.test
@@ -0,0 +1,25 @@
+--source include/have_innodb.inc
+call mtr.add_suppression("InnoDB: New log files created");
+
+let $basedir=$MYSQLTEST_VARDIR/tmp/backup;
+
+CREATE TABLE t(a varchar(60)) ENGINE INNODB;
+start transaction;
+INSERT INTO t VALUES(1);
+
+--disable_result_log
+exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$basedir;
+--enable_result_log
+
+exec $XTRABACKUP --prepare --apply-log-only --target-dir=$basedir ;
+
+let SEARCH_FILE=$MYSQLTEST_VARDIR/log/current_test;
+--let SEARCH_PATTERN= Rollback of trx with id
+--source include/search_pattern_in_file.inc
+--echo # expect NOT FOUND
+
+SELECT count(*) FROM t;
+DROP TABLE t;
+
+# Cleanup
+rmdir $basedir;
diff --git a/mysql-test/t/ctype_utf8.test b/mysql-test/t/ctype_utf8.test
index d1fe93d9251..877db3f54f6 100644
--- a/mysql-test/t/ctype_utf8.test
+++ b/mysql-test/t/ctype_utf8.test
@@ -1990,6 +1990,18 @@ SET @@SQL_MODE=default;
#DROP FUNCTION f1;
#SET NAMES utf8;
+--echo #
+--echo # MDEV-10191 non convertible chars convert() resulted in Null instead "?" on Windows
+--echo #
+
+SET sql_mode='STRICT_TRANS_TABLES';
+SELECT CONVERT(_utf8 0xC499 USING latin1);
+SELECT CAST(_utf8 0xC499 AS CHAR CHARACTER SET latin1);
+
+SET sql_mode=default;
+SELECT CONVERT(_utf8 0xC499 USING latin1);
+SELECT CAST(_utf8 0xC499 AS CHAR CHARACTER SET latin1);
+
--echo #
--echo # End of 10.1 tests