update result files

1 files changed, 38 insertions, 24 deletions

diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff b/mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff
index 2a568df373b..f553cd4f586 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff
+++ b/mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff
@@ -1,5 +1,5 @@
---- suite/sys_vars/r/sysvars_innodb.result	2014-10-15 10:14:25.000000000 +0200
-+++ suite/sys_vars/r/sysvars_innodb,xtradb.reject	2014-10-15 10:25:10.000000000 +0200
+--- suite/sys_vars/r/sysvars_innodb.result	2015-02-12 15:19:56.000000000 +0100
++++ suite/sys_vars/r/sysvars_innodb,xtradb.reject	2015-02-13 00:46:02.000000000 +0100
 @@ -47,6 +47,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
@@ -21,7 +21,7 @@
  VARIABLE_NAME	INNODB_ADAPTIVE_MAX_SLEEP_DELAY
  SESSION_VALUE	NULL
  GLOBAL_VALUE	150000
-@@ -285,6 +299,20 @@
+@@ -341,6 +355,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	REQUIRED
@@ -42,7 +42,7 @@
  VARIABLE_NAME	INNODB_BUFFER_POOL_SIZE
  SESSION_VALUE	NULL
  GLOBAL_VALUE	8388608
-@@ -362,7 +390,7 @@
+@@ -418,7 +446,7 @@
  DEFAULT_VALUE	ON
  VARIABLE_SCOPE	GLOBAL
  VARIABLE_TYPE	BOOLEAN
@@ -51,7 +51,7 @@
  NUMERIC_MIN_VALUE	NULL
  NUMERIC_MAX_VALUE	NULL
  NUMERIC_BLOCK_SIZE	NULL
-@@ -383,6 +411,104 @@
+@@ -439,6 +467,104 @@
  ENUM_VALUE_LIST	CRC32,STRICT_CRC32,INNODB,STRICT_INNODB,NONE,STRICT_NONE
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	REQUIRED
@@ -156,7 +156,7 @@
  VARIABLE_NAME	INNODB_CMP_PER_INDEX_ENABLED
  SESSION_VALUE	NULL
  GLOBAL_VALUE	OFF
-@@ -481,6 +607,20 @@
+@@ -537,6 +663,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	REQUIRED
@@ -177,7 +177,7 @@
  VARIABLE_NAME	INNODB_DATA_FILE_PATH
  SESSION_VALUE	NULL
  GLOBAL_VALUE	ibdata1:12M:autoextend
-@@ -649,6 +789,34 @@
+@@ -705,6 +845,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	YES
  COMMAND_LINE_ARGUMENT	OPTIONAL
@@ -195,6 +195,13 @@
 +ENUM_VALUE_LIST	LEGACY,BACKOFF
 +READ_ONLY	NO
 +COMMAND_LINE_ARGUMENT	OPTIONAL
+ VARIABLE_NAME	INNODB_ENCRYPTION_ROTATE_KEY_AGE
+ SESSION_VALUE	NULL
+ GLOBAL_VALUE	1
+@@ -775,6 +929,20 @@
+ ENUM_VALUE_LIST	NULL
+ READ_ONLY	NO
+ COMMAND_LINE_ARGUMENT	REQUIRED
 +VARIABLE_NAME	INNODB_FAKE_CHANGES
 +SESSION_VALUE	OFF
 +GLOBAL_VALUE	OFF
@@ -212,7 +219,7 @@
  VARIABLE_NAME	INNODB_FAST_SHUTDOWN
  SESSION_VALUE	NULL
  GLOBAL_VALUE	1
-@@ -762,11 +930,11 @@
+@@ -902,11 +1070,11 @@
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	OPTIONAL
  VARIABLE_NAME	INNODB_FLUSH_LOG_AT_TRX_COMMIT
@@ -226,7 +233,7 @@
  VARIABLE_TYPE	BIGINT UNSIGNED
  VARIABLE_COMMENT	Controls the durability/speed trade-off for commits. Set to 0 (write and flush redo log to disk only once per second), 1 (flush to disk at each commit), 2 (write to log at commit but flush to disk only once per second) or 3 (flush to disk at prepare and at commit, slower and usually redundant). 1 and 3 guarantees that after a crash, committed transactions will not be lost and will be consistent with the binlog and other transactional engines. 2 can get inconsistent and lose transactions if there is a power failure or kernel crash but not if mysqld crashes. 0 has no guarantees in case of crash. 0 and 2 can be faster than 1 or 3.
  NUMERIC_MIN_VALUE	0
-@@ -859,6 +1027,20 @@
+@@ -999,6 +1167,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	YES
  COMMAND_LINE_ARGUMENT	REQUIRED
@@ -247,7 +254,7 @@
  VARIABLE_NAME	INNODB_FT_AUX_TABLE
  SESSION_VALUE	NULL
  GLOBAL_VALUE	
-@@ -1055,6 +1237,20 @@
+@@ -1223,6 +1405,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	REQUIRED
@@ -268,7 +275,7 @@
  VARIABLE_NAME	INNODB_LARGE_PREFIX
  SESSION_VALUE	NULL
  GLOBAL_VALUE	OFF
-@@ -1083,6 +1279,20 @@
+@@ -1251,6 +1447,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	REQUIRED
@@ -289,7 +296,7 @@
  VARIABLE_NAME	INNODB_LOCKS_UNSAFE_FOR_BINLOG
  SESSION_VALUE	NULL
  GLOBAL_VALUE	OFF
-@@ -1111,6 +1321,62 @@
+@@ -1279,6 +1489,62 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	REQUIRED
@@ -352,7 +359,7 @@
  VARIABLE_NAME	INNODB_LOG_BUFFER_SIZE
  SESSION_VALUE	NULL
  GLOBAL_VALUE	1048576
-@@ -1139,6 +1405,20 @@
+@@ -1307,6 +1573,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	OPTIONAL
@@ -372,8 +379,8 @@
 +COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	INNODB_LOG_COMPRESSED_PAGES
  SESSION_VALUE	NULL
- GLOBAL_VALUE	ON
-@@ -1209,6 +1489,34 @@
+ GLOBAL_VALUE	OFF
+@@ -1377,6 +1657,34 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	REQUIRED
@@ -407,8 +414,8 @@
 +COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	INNODB_MAX_DIRTY_PAGES_PCT
  SESSION_VALUE	NULL
- GLOBAL_VALUE	75
-@@ -1461,6 +1769,62 @@
+ GLOBAL_VALUE	75.000000
+@@ -1643,6 +1951,62 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	OPTIONAL
@@ -471,7 +478,7 @@
  VARIABLE_NAME	INNODB_PURGE_BATCH_SIZE
  SESSION_VALUE	NULL
  GLOBAL_VALUE	300
-@@ -1629,6 +1993,76 @@
+@@ -1811,6 +2175,48 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	OPTIONAL
@@ -517,6 +524,13 @@
 +ENUM_VALUE_LIST	NULL
 +READ_ONLY	NO
 +COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	INNODB_SCRUB_FORCE_TESTING
+ SESSION_VALUE	NULL
+ GLOBAL_VALUE	OFF
+@@ -1853,6 +2259,34 @@
+ ENUM_VALUE_LIST	NULL
+ READ_ONLY	NO
+ COMMAND_LINE_ARGUMENT	OPTIONAL
 +VARIABLE_NAME	INNODB_SHOW_LOCKS_HELD
 +SESSION_VALUE	NULL
 +GLOBAL_VALUE	10
@@ -548,7 +562,7 @@
  VARIABLE_NAME	INNODB_SIMULATE_COMP_FAILURES
  SESSION_VALUE	NULL
  GLOBAL_VALUE	0
-@@ -1692,7 +2126,7 @@
+@@ -1916,7 +2350,7 @@
  DEFAULT_VALUE	nulls_equal
  VARIABLE_SCOPE	GLOBAL
  VARIABLE_TYPE	ENUM
@@ -557,7 +571,7 @@
  NUMERIC_MIN_VALUE	NULL
  NUMERIC_MAX_VALUE	NULL
  NUMERIC_BLOCK_SIZE	NULL
-@@ -1895,6 +2329,34 @@
+@@ -2147,6 +2581,34 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	REQUIRED
@@ -592,7 +606,7 @@
  VARIABLE_NAME	INNODB_TRX_PURGE_VIEW_UPDATE_ONLY_DEBUG
  SESSION_VALUE	NULL
  GLOBAL_VALUE	OFF
-@@ -1972,7 +2434,7 @@
+@@ -2224,7 +2686,7 @@
  DEFAULT_VALUE	OFF
  VARIABLE_SCOPE	GLOBAL
  VARIABLE_TYPE	BOOLEAN
@@ -601,7 +615,7 @@
  NUMERIC_MIN_VALUE	NULL
  NUMERIC_MAX_VALUE	NULL
  NUMERIC_BLOCK_SIZE	NULL
-@@ -1993,6 +2455,20 @@
+@@ -2245,6 +2707,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	YES
  COMMAND_LINE_ARGUMENT	NONE
@@ -622,7 +636,7 @@
  VARIABLE_NAME	INNODB_USE_MTFLUSH
  SESSION_VALUE	NULL
  GLOBAL_VALUE	OFF
-@@ -2007,6 +2483,20 @@
+@@ -2259,6 +2735,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	YES
  COMMAND_LINE_ARGUMENT	NONE
@@ -643,7 +657,7 @@
  VARIABLE_NAME	INNODB_USE_SYS_MALLOC
  SESSION_VALUE	NULL
  GLOBAL_VALUE	ON
-@@ -2037,12 +2527,12 @@
+@@ -2289,12 +2779,12 @@
  COMMAND_LINE_ARGUMENT	OPTIONAL
  VARIABLE_NAME	INNODB_VERSION
  SESSION_VALUE	NULL