diff options
| author | Igor Babaev <igor@askmonty.org> | 2016-08-31 10:49:36 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2016-08-31 10:49:36 -0700 |
| commit | 080f16a87741f6e798f6d78ddfa3edc895a7ea6c (patch) | |
| tree | 27c60c3b28104d0d6f6bf610f30df728d1eedd58 /mysql-test/suite/sys_vars/r/sysvars_server_embedded.result | |
| parent | f11e892b572ef62db2375599d4bc4fd88527bede (diff) | |
| parent | d8ad96eac0df9241ba200634717227a7153086e1 (diff) | |
| download | mariadb-git-080f16a87741f6e798f6d78ddfa3edc895a7ea6c.tar.gz | |
Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mdev9864
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.result | 8 |
1 files changed, 4 insertions, 4 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 06e31cac5d3..6a9615e2dbc 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result @@ -2825,9 +2825,9 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_STATEMENT_CLASSES SESSION_VALUE NULL -GLOBAL_VALUE 181 +GLOBAL_VALUE 184 GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 181 +DEFAULT_VALUE 184 VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Maximum number of statement instruments. @@ -3331,11 +3331,11 @@ VARIABLE_NAME SERVER_ID SESSION_VALUE 1 GLOBAL_VALUE 1 GLOBAL_VALUE_ORIGIN CONFIG -DEFAULT_VALUE 0 +DEFAULT_VALUE 1 VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Uniquely identifies the server instance in the community of replication partners -NUMERIC_MIN_VALUE 0 +NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL |