summaryrefslogtreecommitdiff
path: root/sql/sys_vars.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-06-06 18:50:25 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-06-06 18:50:25 +0300
commitb3e395a13ee7e9df323cb654d18dc81ff2f3fd1e (patch)
tree6078ccc55d5298796c3f626fb4886a131b833e37 /sql/sys_vars.cc
parente14ffd85d09a62d098d3db9597fd34bf3d4c4fe3 (diff)
parent187b9c924ebaff8f02fb4e2139a01fd1512e3dc9 (diff)
downloadmariadb-git-b3e395a13ee7e9df323cb654d18dc81ff2f3fd1e.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sys_vars.cc')
-rw-r--r--sql/sys_vars.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index f132395b7d2..6166de2701a 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -2301,7 +2301,7 @@ static Sys_var_ulong Sys_max_sort_length(
"the first max_sort_length bytes of each value are used; the rest "
"are ignored)",
SESSION_VAR(max_sort_length), CMD_LINE(REQUIRED_ARG),
- VALID_RANGE(4, 8192*1024L), DEFAULT(1024), BLOCK_SIZE(1));
+ VALID_RANGE(8, 8192*1024L), DEFAULT(1024), BLOCK_SIZE(1));
static Sys_var_ulong Sys_max_sp_recursion_depth(
"max_sp_recursion_depth",