summaryrefslogtreecommitdiff
path: root/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2020-12-23 19:28:02 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2020-12-23 19:28:02 +0100
commit25561435e0b1fe42ec29d5ab06dc15875cdd1cfa (patch)
treed2e67d4509577d84da7ade2820154c904180e151 /mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
parentfa1aef39ebc7d84d24d4e3d2124f982526632ee9 (diff)
parent8d8370e31d48e0bc6139c18770746f9959c21598 (diff)
downloadmariadb-git-25561435e0b1fe42ec29d5ab06dc15875cdd1cfa.tar.gz
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/suite/sys_vars/r/sysvars_server_embedded.result')
-rw-r--r--mysql-test/suite/sys_vars/r/sysvars_server_embedded.result6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
index fbf6e37e715..3a561d93335 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
@@ -1014,10 +1014,10 @@ READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME GROUP_CONCAT_MAX_LEN
VARIABLE_SCOPE SESSION
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT The maximum length of the result of function GROUP_CONCAT()
NUMERIC_MIN_VALUE 4
-NUMERIC_MAX_VALUE 18446744073709551615
+NUMERIC_MAX_VALUE 4294967295
NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL
READ_ONLY NO
@@ -1896,7 +1896,7 @@ VARIABLE_NAME MAX_SORT_LENGTH
VARIABLE_SCOPE SESSION
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT The number of bytes to use when sorting BLOB or TEXT values (only the first max_sort_length bytes of each value are used; the rest are ignored)
-NUMERIC_MIN_VALUE 8
+NUMERIC_MIN_VALUE 64
NUMERIC_MAX_VALUE 8388608
NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL