Fix embedded and 32-bit test results after MDEV-8580

MariaDB · Jul 14, 2016 · 1168c1a · 1168c1a
1 parent 12ac3ee
commit 1168c1a
Show file tree

Hide file tree

Showing 5 changed files with 98 additions and 579 deletions.
diff --git a/mysql-test/suite/sys_vars/r/sysvars_debug,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_debug,32bit.rdiff
@@ -9,16 +9,3 @@
  VARIABLE_COMMENT	Extra sleep (in microseconds) to add to binlog fsync(), for debugging
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	4294967295
-@@ -35,10 +35,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Call my_debug_put_break_here() if crc matches this number (for debug)
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff b/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff
@@ -111,7 +111,7 @@
 +NUMERIC_MIN_VALUE	NULL
 +NUMERIC_MAX_VALUE	NULL
 +NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	NULL
++ENUM_VALUE_LIST	OFF,ON
 +READ_ONLY	YES
 +COMMAND_LINE_ARGUMENT	NONE
  VARIABLE_NAME	INNODB_BUFFER_POOL_SIZE
@@ -150,7 +150,7 @@
 +NUMERIC_MIN_VALUE	NULL
 +NUMERIC_MAX_VALUE	NULL
 +NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	NULL
++ENUM_VALUE_LIST	OFF,ON
 +READ_ONLY	NO
 +COMMAND_LINE_ARGUMENT	OPTIONAL
 +VARIABLE_NAME	INNODB_CLEANER_FLUSH_CHUNK_SIZE
@@ -343,7 +343,7 @@
 +NUMERIC_MIN_VALUE	NULL
 +NUMERIC_MAX_VALUE	NULL
 +NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	NULL
++ENUM_VALUE_LIST	OFF,ON
 +READ_ONLY	NO
 +COMMAND_LINE_ARGUMENT	OPTIONAL
  VARIABLE_NAME	INNODB_FAST_SHUTDOWN
@@ -578,7 +578,7 @@
 +NUMERIC_MIN_VALUE	NULL
 +NUMERIC_MAX_VALUE	NULL
 +NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	NULL
++ENUM_VALUE_LIST	OFF,ON
 +READ_ONLY	NO
 +COMMAND_LINE_ARGUMENT	NONE
  VARIABLE_NAME	INNODB_LOCKS_UNSAFE_FOR_BINLOG
@@ -624,7 +624,7 @@
  NUMERIC_MIN_VALUE	NULL
  NUMERIC_MAX_VALUE	NULL
  NUMERIC_BLOCK_SIZE	NULL
- ENUM_VALUE_LIST	NULL
+ ENUM_VALUE_LIST	OFF,ON
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	OPTIONAL
 -VARIABLE_NAME	INNODB_LOG_COMPRESSED_PAGES
@@ -695,7 +695,7 @@
 +NUMERIC_MIN_VALUE	NULL
 +NUMERIC_MAX_VALUE	NULL
 +NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	NULL
++ENUM_VALUE_LIST	OFF,ON
 +READ_ONLY	NO
 +COMMAND_LINE_ARGUMENT	OPTIONAL
 +VARIABLE_NAME	INNODB_LOG_CHECKSUM_ALGORITHM
@@ -850,7 +850,7 @@
 +NUMERIC_MIN_VALUE	NULL
 +NUMERIC_MAX_VALUE	NULL
 +NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	NULL
++ENUM_VALUE_LIST	OFF,ON
 +READ_ONLY	NO
 +COMMAND_LINE_ARGUMENT	OPTIONAL
 +VARIABLE_NAME	INNODB_PRIORITY_IO
@@ -864,7 +864,7 @@
 +NUMERIC_MIN_VALUE	NULL
 +NUMERIC_MAX_VALUE	NULL
 +NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	NULL
++ENUM_VALUE_LIST	OFF,ON
 +READ_ONLY	NO
 +COMMAND_LINE_ARGUMENT	OPTIONAL
 +VARIABLE_NAME	INNODB_PRIORITY_MASTER
@@ -878,7 +878,7 @@
 +NUMERIC_MIN_VALUE	NULL
 +NUMERIC_MAX_VALUE	NULL
 +NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	NULL
++ENUM_VALUE_LIST	OFF,ON
 +READ_ONLY	NO
 +COMMAND_LINE_ARGUMENT	OPTIONAL
 +VARIABLE_NAME	INNODB_PRIORITY_PURGE
@@ -892,7 +892,7 @@
 +NUMERIC_MIN_VALUE	NULL
 +NUMERIC_MAX_VALUE	NULL
 +NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	NULL
++ENUM_VALUE_LIST	OFF,ON
 +READ_ONLY	NO
 +COMMAND_LINE_ARGUMENT	OPTIONAL
  VARIABLE_NAME	INNODB_PURGE_BATCH_SIZE
@@ -1134,7 +1134,7 @@
 +NUMERIC_MIN_VALUE	NULL
 +NUMERIC_MAX_VALUE	NULL
 +NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	NULL
++ENUM_VALUE_LIST	OFF,ON
 +READ_ONLY	NO
 +COMMAND_LINE_ARGUMENT	NONE
 +VARIABLE_NAME	INNODB_TRACK_REDO_LOG_NOW
@@ -1148,7 +1148,7 @@
 +NUMERIC_MIN_VALUE	NULL
 +NUMERIC_MAX_VALUE	NULL
 +NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	NULL
++ENUM_VALUE_LIST	OFF,ON
 +READ_ONLY	NO
 +COMMAND_LINE_ARGUMENT	OPTIONAL
  VARIABLE_NAME	INNODB_TRX_PURGE_VIEW_UPDATE_ONLY_DEBUG
@@ -1196,7 +1196,7 @@
 +NUMERIC_MIN_VALUE	NULL
 +NUMERIC_MAX_VALUE	NULL
 +NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	NULL
++ENUM_VALUE_LIST	OFF,ON
 +READ_ONLY	NO
 +COMMAND_LINE_ARGUMENT	NONE
  VARIABLE_NAME	INNODB_USE_MTFLUSH
@@ -1217,7 +1217,7 @@
 +NUMERIC_MIN_VALUE	NULL
 +NUMERIC_MAX_VALUE	NULL
 +NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	NULL
++ENUM_VALUE_LIST	OFF,ON
 +READ_ONLY	YES
 +COMMAND_LINE_ARGUMENT	NONE
  VARIABLE_NAME	INNODB_USE_SYS_MALLOC