diff options
| author | Igor Babaev <igor@askmonty.org> | 2017-11-03 15:12:01 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2017-11-03 15:12:01 -0700 |
| commit | 388ba068baba0cd4c88a1b5427f725ad4885eff6 (patch) | |
| tree | 7183abee423d1943b20ecca5cb5a9bc9a71c5bac /mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff | |
| parent | 9ada5a3c1ac4a98ac7175e57e0b6badb83e4fcc0 (diff) | |
| download | mariadb-git-388ba068baba0cd4c88a1b5427f725ad4885eff6.tar.gz | |
Post-merge fixes for mdev-12172, mdev-12176.
Diffstat (limited to 'mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff')
| -rw-r--r-- | mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff index 5f09f1c26f8..ab019da30e0 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff @@ -287,6 +287,19 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO +@@ -1556,10 +1556,10 @@ + GLOBAL_VALUE_ORIGIN COMPILE-TIME + DEFAULT_VALUE 10000 + VARIABLE_SCOPE SESSION +-VARIABLE_TYPE BIGINT UNSIGNED ++VARIABLE_TYPE INT UNSIGNED + VARIABLE_COMMENT The minimum number of scalar elements in the value list of IN predicate that triggers its conversion to IN subquery + NUMERIC_MIN_VALUE 0 +-NUMERIC_MAX_VALUE 18446744073709551615 ++NUMERIC_MAX_VALUE 4294967295 + NUMERIC_BLOCK_SIZE 1 + ENUM_VALUE_LIST NULL + READ_ONLY NO @@ -1639,7 +1639,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 86400 @@ -1267,3 +1280,12 @@ VARIABLE_COMMENT Size of transaction coordinator log. ENUM_VALUE_LIST NULL READ_ONLY YES +@@ -5422,7 +5422,7 @@ + VARIABLE_TYPE BIGINT UNSIGNED + VARIABLE_COMMENT Sets the internal state of the RAND() generator for replication purposes + NUMERIC_MIN_VALUE 0 +-NUMERIC_MAX_VALUE 18446744073709551615 ++NUMERIC_MAX_VALUE 4294967295 + NUMERIC_BLOCK_SIZE 1 + ENUM_VALUE_LIST NULL + READ_ONLY NO |