[Commits] ee0695b: Fix 32-bit sysvars test

elenst at montyprogram.com elenst at montyprogram.com
Sun May 8 13:37:49 EEST 2016


revision-id: ee0695b8072783d04b27328f974d94273b3fa248 ()
parent(s): 234efb1d282ac5cc6d445447b8c52e8507ef224b
author: Elena Stepanova
committer: Elena Stepanova
timestamp: 2016-05-08 13:37:12 +0300
message:

Fix 32-bit sysvars test

---
 .../sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff   |   45 ++++++++++----------
 1 file changed, 22 insertions(+), 23 deletions(-)

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
index 6bba4d4..c04f4fe 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff
+++ b/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff
@@ -1,5 +1,5 @@
---- suite/sys_vars/r/sysvars_innodb.result
-+++ suite/sys_vars/r/sysvars_innodb,32bit,xtradb.reject
+--- suite/sys_vars/r/sysvars_innodb.result	2016-05-06 14:03:16.000000000 +0300
++++ suite/sys_vars/r/sysvars_innodb,32bit.reject	2016-05-08 13:28:44.312418574 +0300
 @@ -47,13 +47,27 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
@@ -313,7 +313,7 @@
  COMMAND_LINE_ARGUMENT	OPTIONAL
 +VARIABLE_NAME	INNODB_EMPTY_FREE_LIST_ALGORITHM
 +SESSION_VALUE	NULL
-+GLOBAL_VALUE	BACKOFF
++GLOBAL_VALUE	LEGACY
 +GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 +DEFAULT_VALUE	BACKOFF
 +VARIABLE_SCOPE	GLOBAL
@@ -1119,21 +1119,14 @@
  VARIABLE_COMMENT	Time of innodb thread sleeping before joining InnoDB queue (usec). Value 0 disable a sleep
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	1000000
-@@ -2203,14 +2637,28 @@
+@@ -2217,6 +2651,34 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
- COMMAND_LINE_ARGUMENT	REQUIRED
--VARIABLE_NAME	INNODB_TMPDIR
--SESSION_VALUE	
--GLOBAL_VALUE	
+ COMMAND_LINE_ARGUMENT	OPTIONAL
 +VARIABLE_NAME	INNODB_TRACK_CHANGED_PAGES
 +SESSION_VALUE	NULL
 +GLOBAL_VALUE	OFF
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
--DEFAULT_VALUE	
--VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	VARCHAR
--VARIABLE_COMMENT	Directory for temporary non-tablespace files.
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 +DEFAULT_VALUE	OFF
 +VARIABLE_SCOPE	GLOBAL
 +VARIABLE_TYPE	BOOLEAN
@@ -1152,10 +1145,16 @@
 +VARIABLE_SCOPE	GLOBAL
 +VARIABLE_TYPE	BOOLEAN
 +VARIABLE_COMMENT	Force log tracker to catch up with checkpoint now
- NUMERIC_MIN_VALUE	NULL
- NUMERIC_MAX_VALUE	NULL
- NUMERIC_BLOCK_SIZE	NULL
-@@ -2265,7 +2713,7 @@
++NUMERIC_MIN_VALUE	NULL
++NUMERIC_MAX_VALUE	NULL
++NUMERIC_BLOCK_SIZE	NULL
++ENUM_VALUE_LIST	NULL
++READ_ONLY	NO
++COMMAND_LINE_ARGUMENT	OPTIONAL
+ VARIABLE_NAME	INNODB_TRX_PURGE_VIEW_UPDATE_ONLY_DEBUG
+ SESSION_VALUE	NULL
+ GLOBAL_VALUE	OFF
+@@ -2265,7 +2727,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	128
  VARIABLE_SCOPE	GLOBAL
@@ -1164,7 +1163,7 @@
  VARIABLE_COMMENT	Number of undo logs to use.
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	128
-@@ -2279,7 +2727,7 @@
+@@ -2279,7 +2741,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	0
  VARIABLE_SCOPE	GLOBAL
@@ -1173,7 +1172,7 @@
  VARIABLE_COMMENT	Number of undo tablespaces to use. 
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	126
-@@ -2294,7 +2742,7 @@
+@@ -2294,7 +2756,7 @@
  DEFAULT_VALUE	OFF
  VARIABLE_SCOPE	GLOBAL
  VARIABLE_TYPE	BOOLEAN
@@ -1182,7 +1181,7 @@
  NUMERIC_MIN_VALUE	NULL
  NUMERIC_MAX_VALUE	NULL
  NUMERIC_BLOCK_SIZE	NULL
-@@ -2315,6 +2763,20 @@
+@@ -2315,6 +2777,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	YES
  COMMAND_LINE_ARGUMENT	NONE
@@ -1203,7 +1202,7 @@
  VARIABLE_NAME	INNODB_USE_MTFLUSH
  SESSION_VALUE	NULL
  GLOBAL_VALUE	OFF
-@@ -2329,6 +2791,20 @@
+@@ -2329,6 +2805,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	YES
  COMMAND_LINE_ARGUMENT	NONE
@@ -1224,7 +1223,7 @@
  VARIABLE_NAME	INNODB_USE_SYS_MALLOC
  SESSION_VALUE	NULL
  GLOBAL_VALUE	ON
-@@ -2359,12 +2835,12 @@
+@@ -2359,12 +2849,12 @@
  COMMAND_LINE_ARGUMENT	OPTIONAL
  VARIABLE_NAME	INNODB_VERSION
  SESSION_VALUE	NULL
@@ -1239,7 +1238,7 @@
  NUMERIC_MIN_VALUE	NULL
  NUMERIC_MAX_VALUE	NULL
  NUMERIC_BLOCK_SIZE	NULL
-@@ -2377,7 +2853,7 @@
+@@ -2377,7 +2867,7 @@
  GLOBAL_VALUE_ORIGIN	CONFIG
  DEFAULT_VALUE	4
  VARIABLE_SCOPE	GLOBAL


More information about the commits mailing list