Follow-up for the 10.1 -> 10.2 merge

Fix 32-bit rdiffs to get rid of failed hunks
MariaDB · Jan 19, 2017 · b9631b4 · b9631b4
1 parent b05bf8f
commit b9631b4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 33 deletions.
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff
@@ -134,15 +134,6 @@
  NUMERIC_BLOCK_SIZE	0
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -641,7 +641,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	InnoDB system tablespace size to be set in recovery.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
 @@ -865,7 +865,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	120
@@ -543,19 +534,6 @@
  VARIABLE_COMMENT	Memory buffer size for index creation
  NUMERIC_MIN_VALUE	65536
  NUMERIC_MAX_VALUE	67108864
-@@ -2195,10 +2195,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	6
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum delay between polling for a spin lock (6 by default)
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	0
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
 @@ -2391,7 +2391,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	1

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
@@ -997,12 +997,12 @@
  VARIABLE_SCOPE	SESSION
 -VARIABLE_TYPE	BIGINT UNSIGNED
 +VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT      Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting.
- NUMERIC_MIN_VALUE     0
- NUMERIC_MAX_VALUE     4294967295
+ VARIABLE_COMMENT	Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting.
+ NUMERIC_MIN_VALUE	0
+ NUMERIC_MAX_VALUE	4294967295
 @@ -3123,7 +3123,7 @@
- GLOBAL_VALUE_ORIGIN   COMPILE-TIME
- DEFAULT_VALUE 16384
+ GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+ DEFAULT_VALUE	16384
  VARIABLE_SCOPE	SESSION
 -VARIABLE_TYPE	BIGINT UNSIGNED
 +VARIABLE_TYPE	INT UNSIGNED

diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff
@@ -997,12 +997,12 @@
  VARIABLE_SCOPE	SESSION
 -VARIABLE_TYPE	BIGINT UNSIGNED
 +VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT      Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting.
- NUMERIC_MIN_VALUE     0
- NUMERIC_MAX_VALUE     4294967295
+ VARIABLE_COMMENT	Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting.
+ NUMERIC_MIN_VALUE	0
+ NUMERIC_MAX_VALUE	4294967295
 @@ -3347,7 +3347,7 @@
- GLOBAL_VALUE_ORIGIN   COMPILE-TIME
- DEFAULT_VALUE 16384
+ GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+ DEFAULT_VALUE	16384
  VARIABLE_SCOPE	SESSION
 -VARIABLE_TYPE	BIGINT UNSIGNED
 +VARIABLE_TYPE	INT UNSIGNED
@@ -1204,7 +1204,7 @@
  NUMERIC_MAX_VALUE	1048576
 @@ -4719,7 +4719,7 @@
  GLOBAL_VALUE_ORIGIN	AUTO
- DEFAULT_VALUE	0
+ DEFAULT_VALUE	256
  VARIABLE_SCOPE	GLOBAL
 -VARIABLE_TYPE	BIGINT UNSIGNED
 +VARIABLE_TYPE	INT UNSIGNED