summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-06-06 18:07:04 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-06-06 18:07:04 +0300
commit0df01ccb667b23a0af33f76a43632900f0bd7744 (patch)
tree1247afcb1ac5f216de3fd32cdb16503979ff685d /mysql-test/include
parent1bd5b75c733840813ea1fe18c5908422a707e677 (diff)
parentf30ff10c8d02d8385bafa290b8c73367d49aece2 (diff)
downloadmariadb-git-0df01ccb667b23a0af33f76a43632900f0bd7744.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/ctype_utf8mb4.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/include/ctype_utf8mb4.inc b/mysql-test/include/ctype_utf8mb4.inc
index edd58ee32e7..862afe96f6c 100644
--- a/mysql-test/include/ctype_utf8mb4.inc
+++ b/mysql-test/include/ctype_utf8mb4.inc
@@ -1585,7 +1585,7 @@ drop table t1;
--echo #
--echo # Check strnxfrm() with odd length
--echo #
-set max_sort_length=5;
+set max_sort_length=9;
select @@max_sort_length;
eval create table t1 (a varchar(128) character set utf8mb4 collate utf8mb4_general_ci) engine $engine;
insert into t1 values ('a'),('b'),('c');