diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-06 18:50:25 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-06 18:50:25 +0300 |
commit | b3e395a13ee7e9df323cb654d18dc81ff2f3fd1e (patch) | |
tree | 6078ccc55d5298796c3f626fb4886a131b833e37 /mysql-test/main/ctype_utf8mb4_innodb.result | |
parent | e14ffd85d09a62d098d3db9597fd34bf3d4c4fe3 (diff) | |
parent | 187b9c924ebaff8f02fb4e2139a01fd1512e3dc9 (diff) | |
download | mariadb-git-b3e395a13ee7e9df323cb654d18dc81ff2f3fd1e.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/main/ctype_utf8mb4_innodb.result')
-rw-r--r-- | mysql-test/main/ctype_utf8mb4_innodb.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/ctype_utf8mb4_innodb.result b/mysql-test/main/ctype_utf8mb4_innodb.result index c5fa569bd77..3c7d0ba2fb7 100644 --- a/mysql-test/main/ctype_utf8mb4_innodb.result +++ b/mysql-test/main/ctype_utf8mb4_innodb.result @@ -2329,10 +2329,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) engine InnoDB; insert into t1 values ('a'),('b'),('c'); select * from t1 order by a; |