diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-12-25 09:13:28 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-12-25 09:13:28 +0100 |
| commit | 478b83032b170b2ae030fa77fe4bed60a7910472 (patch) | |
| tree | a3893bb725e227dc15c6997731cdeba622ae1744 /sql/sys_vars.cc | |
| parent | 0aa02567dd62d96467f84ba96cc67b103f63c9e0 (diff) | |
| parent | 043bd85a574a88856ab9c6d497e682ed06fe45e9 (diff) | |
| download | mariadb-git-478b83032b170b2ae030fa77fe4bed60a7910472.tar.gz | |
Merge branch '10.3' into 10.4bb-10.4-MDEV-23468
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 4c3028b0a00..5f5f9b5daf8 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -2352,7 +2352,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(8, 8192*1024L), DEFAULT(1024), BLOCK_SIZE(1)); + VALID_RANGE(64, 8192*1024L), DEFAULT(1024), BLOCK_SIZE(1)); static Sys_var_ulong Sys_max_sp_recursion_depth( "max_sp_recursion_depth", @@ -4570,11 +4570,11 @@ static Sys_var_ulong Sys_default_week_format( SESSION_VAR(default_week_format), CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, 7), DEFAULT(0), BLOCK_SIZE(1)); -static Sys_var_ulonglong Sys_group_concat_max_len( +static Sys_var_uint Sys_group_concat_max_len( "group_concat_max_len", "The maximum length of the result of function GROUP_CONCAT()", SESSION_VAR(group_concat_max_len), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(4, SIZE_T_MAX), DEFAULT(1024*1024), BLOCK_SIZE(1)); + VALID_RANGE(4, UINT_MAX32), DEFAULT(1024*1024), BLOCK_SIZE(1)); static char *glob_hostname_ptr; static Sys_var_charptr Sys_hostname( |