diff options
| author | Alexander Barkov <bar@mysql.com> | 2010-03-11 14:34:11 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mysql.com> | 2010-03-11 14:34:11 +0400 |
| commit | b0ed7a5499ab81919dfb9605f1304bb16bd7deac (patch) | |
| tree | bf2cc43cccc940c1a6702ba10b12897c9504ba79 /mysql-test | |
| parent | 9c2961ab63aaefb34b1afd6d247ac3716f57745c (diff) | |
| download | mariadb-git-b0ed7a5499ab81919dfb9605f1304bb16bd7deac.tar.gz | |
An additional fix for WL#1213 4-byte UTF8
- Fixing crash on attempt to create a fulltext index with an utf8mb4 column
- fixing wrong border width for supplementary characters in mysql client:
mysql --default-character-set=utf8mb4 -e "select concat(_utf32 0x20000,'a')"
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/ctype_utf8mb4.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/ctype_utf8mb4.test | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/ctype_utf8mb4.result b/mysql-test/r/ctype_utf8mb4.result index d43f3b0e0bd..4de7a192546 100644 --- a/mysql-test/r/ctype_utf8mb4.result +++ b/mysql-test/r/ctype_utf8mb4.result @@ -2438,6 +2438,9 @@ t1 CREATE TABLE `t1` ( INSERT INTO t1(subject) VALUES ('abcd'); INSERT INTO t1(subject) VALUES(x'f0909080'); DROP TABLE t1; +CREATE TABLE t1 (a TEXT CHARACTER SET utf8mb4, FULLTEXT INDEX(a)); +INSERT INTO t1 VALUES (0xF0A08080 /* U+20000 */ ); +DROP TABLE t1; # # Bug #51676 Server crashes on SELECT, ORDER BY on 'utf8mb4' column # diff --git a/mysql-test/t/ctype_utf8mb4.test b/mysql-test/t/ctype_utf8mb4.test index 8916de670c1..f396d36e5b0 100644 --- a/mysql-test/t/ctype_utf8mb4.test +++ b/mysql-test/t/ctype_utf8mb4.test @@ -1763,6 +1763,13 @@ INSERT INTO t1(subject) VALUES ('abcd'); INSERT INTO t1(subject) VALUES(x'f0909080'); DROP TABLE t1; +# +# Make sure fulltext does not crash on supplementary characters +# +CREATE TABLE t1 (a TEXT CHARACTER SET utf8mb4, FULLTEXT INDEX(a)); +INSERT INTO t1 VALUES (0xF0A08080 /* U+20000 */ ); +DROP TABLE t1; + --echo # --echo # Bug #51676 Server crashes on SELECT, ORDER BY on 'utf8mb4' column --echo # |