Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mdev9864

MariaDB · Aug 31, 2016 · 080f16a · 080f16a
2 parents f11e892 + d8ad96e
commit 080f16a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 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
@@ -885,7 +885,7 @@
  NUMERIC_MAX_VALUE	256
 @@ -2815,7 +2815,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	181
+ DEFAULT_VALUE	184
  VARIABLE_SCOPE	GLOBAL
 -VARIABLE_TYPE	BIGINT UNSIGNED
 +VARIABLE_TYPE	INT UNSIGNED
@@ -1078,12 +1078,12 @@
  READ_ONLY	NO
 @@ -3319,7 +3319,7 @@
  GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	0
+ DEFAULT_VALUE	1
  VARIABLE_SCOPE	SESSION
 -VARIABLE_TYPE	BIGINT UNSIGNED
 +VARIABLE_TYPE	INT 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
 @@ -3417,7 +3417,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME

diff --git 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