diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-06 18:07:04 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-06 18:07:04 +0300 |
| commit | 0df01ccb667b23a0af33f76a43632900f0bd7744 (patch) | |
| tree | 1247afcb1ac5f216de3fd32cdb16503979ff685d /mysql-test/r/ctype_utf8mb4.result | |
| parent | 1bd5b75c733840813ea1fe18c5908422a707e677 (diff) | |
| parent | f30ff10c8d02d8385bafa290b8c73367d49aece2 (diff) | |
| download | mariadb-git-0df01ccb667b23a0af33f76a43632900f0bd7744.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/r/ctype_utf8mb4.result')
| -rw-r--r-- | mysql-test/r/ctype_utf8mb4.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/ctype_utf8mb4.result b/mysql-test/r/ctype_utf8mb4.result index b0777a0b9f0..691ac51e241 100644 --- a/mysql-test/r/ctype_utf8mb4.result +++ b/mysql-test/r/ctype_utf8mb4.result @@ -2371,10 +2371,10 @@ drop table t1; # # Check strnxfrm() with odd length # -set max_sort_length=5; +set max_sort_length=9; select @@max_sort_length; @@max_sort_length -5 +9 create table t1 (a varchar(128) character set utf8mb4 collate utf8mb4_general_ci); insert into t1 values ('a'),('b'),('c'); select * from t1 order by a; |