diff options
author | Igor Babaev <igor@askmonty.org> | 2019-02-03 18:41:18 -0800 |
---|---|---|
committer | Igor Babaev <igor@askmonty.org> | 2019-02-03 18:41:18 -0800 |
commit | 37deed3f37561f264f65e162146bbc2ad35fb1a2 (patch) | |
tree | c1cfb6c0995bfcc4ac3fb335f518a8b404413e32 /mysql-test/main/ctype_utf16le.result | |
parent | 658128af43b4d7c6db445164f8ed25ed4d1e3109 (diff) | |
parent | 5b996782be6b752ce50a0ecaa222b0688aa9e75d (diff) | |
download | mariadb-git-37deed3f37561f264f65e162146bbc2ad35fb1a2.tar.gz |
Merge branch '10.4' into bb-10.4-mdev16188
Diffstat (limited to 'mysql-test/main/ctype_utf16le.result')
-rw-r--r-- | mysql-test/main/ctype_utf16le.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/ctype_utf16le.result b/mysql-test/main/ctype_utf16le.result index 4d1186bd361..633809b51fa 100644 --- a/mysql-test/main/ctype_utf16le.result +++ b/mysql-test/main/ctype_utf16le.result @@ -1124,7 +1124,7 @@ INSERT INTO t1 VALUES (0xDF84); SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR ALTER TABLE t1 MODIFY column s1 VARCHAR(50) CHARACTER SET utf16le; Warnings: -Warning 1366 Incorrect string value: '\xDF\x84' for column 's1' at row 1 +Warning 1366 Incorrect string value: '\xDF\x84' for column `test`.`t1`.`s1` at row 1 SELECT HEX(s1) FROM t1; HEX(s1) 3F00 @@ -1136,7 +1136,7 @@ CREATE TABLE t1 (s1 VARCHAR(5) CHARACTER SET ucs2, s2 VARCHAR(5) CHARACTER SET u INSERT INTO t1 (s1) VALUES (0xdf84); UPDATE IGNORE t1 set s2 = s1; Warnings: -Warning 1366 Incorrect string value: '\xDF\x84' for column 's2' at row 1 +Warning 1366 Incorrect string value: '\xDF\x84' for column `test`.`t1`.`s2` at row 1 SELECT HEX(s2) FROM t1; HEX(s2) 3F00 |