update for 32-bit, again

8f92a70e · Sergei Golubchik · 0d54cb12 · 8f92a70e
Commit 8f92a70e authored Jun 02, 2015 by Sergei Golubchik
Hide whitespace changes
Inline Side-by-side

Showing with 67 additions and 70 deletions

mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff ...l-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff +67 -70

No files found.
--- a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff
+++ b/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff
--- suite/sys_vars/r/sysvars_innodb.result	2015-01-12 18:39:38.000000000 +0200
-+++ suite/sys_vars/r/sysvars_innodb,32bit,xtradb.reject	2015-01-12 19:18:29.000000000 +0200
+--- suite/sys_vars/r/sysvars_innodb.result
+++ suite/sys_vars/r/sysvars_innodb,32bit,xtradb.reject
 @@ -47,13 +47,27 @@
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -280,7 +280,7 @@
 VARIABLE_NAME	INNODB_DATA_FILE_PATH
 SESSION_VALUE	NULL
 GLOBAL_VALUE	ibdata1:12M:autoextend
-@@ -697,7 +837,7 @@
+@@ -725,7 +865,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	120
 VARIABLE_SCOPE	GLOBAL
@@ -289,7 +289,7 @@
 VARIABLE_COMMENT	Number of pages reserved in doublewrite buffer for batch flushing
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	127
-@@ -705,6 +845,20 @@
+@@ -733,6 +873,20 @@
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	OPTIONAL
@@ -310,10 +310,10 @@
 VARIABLE_NAME	INNODB_ENCRYPTION_ROTATE_KEY_AGE
 SESSION_VALUE	NULL
 GLOBAL_VALUE	1
-@@ -775,13 +929,27 @@
- ENUM_VALUE_LIST	NULL
+@@ -803,13 +957,27 @@
+ ENUM_VALUE_LIST	OFF,ON,FORCE
 READ_ONLY	NO
- COMMAND_LINE_ARGUMENT	REQUIRED
+ COMMAND_LINE_ARGUMENT	OPTIONAL
 +VARIABLE_NAME	INNODB_FAKE_CHANGES
 +SESSION_VALUE	OFF
 +GLOBAL_VALUE	OFF
@@ -339,7 +339,7 @@
 VARIABLE_COMMENT	Speeds up the shutdown process of the InnoDB storage engine. Possible values are 0, 1 (faster) or 2 (fastest - crash-like).
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	2
-@@ -795,7 +963,7 @@
+@@ -823,7 +991,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	600
 VARIABLE_SCOPE	GLOBAL
@@ -348,7 +348,7 @@
 VARIABLE_COMMENT	Maximum number of seconds that semaphore times out in InnoDB.
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	4294967295
-@@ -865,7 +1033,7 @@
+@@ -893,7 +1061,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
@@ -357,7 +357,7 @@
 VARIABLE_COMMENT	Make the first page of the given tablespace dirty.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	4294967295
-@@ -879,7 +1047,7 @@
+@@ -907,7 +1075,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	30
 VARIABLE_SCOPE	GLOBAL
@@ -366,7 +366,7 @@
 VARIABLE_COMMENT	Number of iterations over which the background flushing is averaged.
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	1000
-@@ -902,12 +1070,12 @@
+@@ -930,12 +1098,12 @@
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	INNODB_FLUSH_LOG_AT_TRX_COMMIT
@@ -382,7 +382,7 @@
 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
 NUMERIC_MAX_VALUE	3
-@@ -935,7 +1103,7 @@
+@@ -963,7 +1131,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	GLOBAL
@@ -391,7 +391,7 @@
 VARIABLE_COMMENT	Set to 0 (don't flush neighbors from buffer pool), 1 (flush contiguous neighbors from buffer pool) or 2 (flush neighbors from buffer pool), when flushing a block
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	2
-@@ -977,7 +1145,7 @@
+@@ -1005,7 +1173,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
@@ -400,7 +400,7 @@
 VARIABLE_COMMENT	Helps to save your data in case the disk image of the database becomes corrupt.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	6
-@@ -991,7 +1159,7 @@
+@@ -1019,7 +1187,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
@@ -409,7 +409,7 @@
 VARIABLE_COMMENT	Kills the server during crash recovery.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	10
-@@ -999,6 +1167,20 @@
+@@ -1027,6 +1195,20 @@
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
@@ -430,7 +430,7 @@
 VARIABLE_NAME	INNODB_FT_AUX_TABLE
 SESSION_VALUE	NULL
 GLOBAL_VALUE	
-@@ -1019,7 +1201,7 @@
+@@ -1047,7 +1229,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	8000000
 VARIABLE_SCOPE	GLOBAL
@@ -439,7 +439,7 @@
 VARIABLE_COMMENT	InnoDB Fulltext search cache size in bytes
 NUMERIC_MIN_VALUE	1600000
 NUMERIC_MAX_VALUE	80000000
-@@ -1061,7 +1243,7 @@
+@@ -1089,7 +1271,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	84
 VARIABLE_SCOPE	GLOBAL
@@ -448,7 +448,7 @@
 VARIABLE_COMMENT	InnoDB Fulltext search maximum token size in characters
 NUMERIC_MIN_VALUE	10
 NUMERIC_MAX_VALUE	84
-@@ -1075,7 +1257,7 @@
+@@ -1103,7 +1285,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	3
 VARIABLE_SCOPE	GLOBAL
@@ -457,7 +457,7 @@
 VARIABLE_COMMENT	InnoDB Fulltext search minimum token size in characters
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	16
-@@ -1089,7 +1271,7 @@
+@@ -1117,7 +1299,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	2000
 VARIABLE_SCOPE	GLOBAL
@@ -466,7 +466,7 @@
 VARIABLE_COMMENT	InnoDB Fulltext search number of words to optimize for each optimize table call 
 NUMERIC_MIN_VALUE	1000
 NUMERIC_MAX_VALUE	10000
-@@ -1103,7 +1285,7 @@
+@@ -1131,7 +1313,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	2000000000
 VARIABLE_SCOPE	GLOBAL
@@ -475,7 +475,7 @@
 VARIABLE_COMMENT	InnoDB Fulltext search query result cache limit in bytes
 NUMERIC_MIN_VALUE	1000000
 NUMERIC_MAX_VALUE	4294967295
-@@ -1131,7 +1313,7 @@
+@@ -1159,7 +1341,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	2
 VARIABLE_SCOPE	GLOBAL
@@ -484,7 +484,7 @@
 VARIABLE_COMMENT	InnoDB Fulltext search parallel sort degree, will round up to nearest power of 2 number
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	16
-@@ -1145,7 +1327,7 @@
+@@ -1173,7 +1355,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	640000000
 VARIABLE_SCOPE	GLOBAL
@@ -493,7 +493,7 @@
 VARIABLE_COMMENT	Total memory allocated for InnoDB Fulltext Search cache
 NUMERIC_MIN_VALUE	32000000
 NUMERIC_MAX_VALUE	1600000000
-@@ -1173,7 +1355,7 @@
+@@ -1201,7 +1383,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	100
 VARIABLE_SCOPE	GLOBAL
@@ -502,7 +502,7 @@
 VARIABLE_COMMENT	Up to what percentage of dirty pages should be flushed when innodb finds it has spare resources to do so.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	100
-@@ -1201,10 +1383,10 @@
+@@ -1243,10 +1425,10 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	200
 VARIABLE_SCOPE	GLOBAL
@@ -515,7 +515,7 @@
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
-@@ -1213,12 +1395,26 @@
+@@ -1255,12 +1437,26 @@
 SESSION_VALUE	NULL
 GLOBAL_VALUE	2000
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
@@ -545,7 +545,7 @@
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
-@@ -1251,6 +1447,20 @@
+@@ -1293,6 +1489,20 @@
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
@@ -566,7 +566,7 @@
 VARIABLE_NAME	INNODB_LOCKS_UNSAFE_FOR_BINLOG
 SESSION_VALUE	NULL
 GLOBAL_VALUE	OFF
-@@ -1271,7 +1481,7 @@
+@@ -1313,7 +1523,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	50
 VARIABLE_SCOPE	SESSION
@@ -575,7 +575,7 @@
 VARIABLE_COMMENT	Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. Values above 100000000 disable the timeout.
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	1073741824
-@@ -1279,41 +1489,111 @@
+@@ -1321,39 +1531,109 @@
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
@@ -617,8 +617,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 -DEFAULT_VALUE	OFF
 +DEFAULT_VALUE	
- VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BOOLEAN
+VARIABLE_SCOPE	GLOBAL
 +VARIABLE_TYPE	VARCHAR
 +VARIABLE_COMMENT	Where full logs should be archived.
 +NUMERIC_MIN_VALUE	NULL
@@ -702,12 +701,10 @@
 +GLOBAL_VALUE	OFF
 +GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 +DEFAULT_VALUE	OFF
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BOOLEAN
+ VARIABLE_SCOPE	GLOBAL
+ VARIABLE_TYPE	BOOLEAN
 VARIABLE_COMMENT	Enables/disables the logging of entire compressed page images. InnoDB logs the compressed pages to prevent corruption if the zlib compression algorithm changes. When turned OFF, InnoDB will assume that the zlib compression algorithm doesn't change.
- NUMERIC_MIN_VALUE	NULL
- NUMERIC_MAX_VALUE	NULL
-@@ -1327,7 +1607,7 @@
+@@ -1369,7 +1649,7 @@
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	2
 VARIABLE_SCOPE	GLOBAL
@@ -716,7 +713,7 @@
 VARIABLE_COMMENT	Number of log files in the log group. InnoDB writes to the files in a circular fashion.
 NUMERIC_MIN_VALUE	2
 NUMERIC_MAX_VALUE	100
-@@ -1369,9 +1649,37 @@
+@@ -1411,9 +1691,37 @@
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	1024
 VARIABLE_SCOPE	GLOBAL
@@ -755,7 +752,7 @@
 NUMERIC_MAX_VALUE	18446744073709551615
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
-@@ -1411,10 +1719,10 @@
+@@ -1453,10 +1761,10 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
@@ -768,7 +765,7 @@
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
-@@ -1425,7 +1733,7 @@
+@@ -1467,7 +1775,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
@@ -777,7 +774,7 @@
 VARIABLE_COMMENT	Maximum delay of user threads in micro-seconds
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	10000000
-@@ -1439,7 +1747,7 @@
+@@ -1481,7 +1789,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
@@ -786,7 +783,7 @@
 VARIABLE_COMMENT	Number of identical copies of log groups we keep for the database. Currently this should be set to 1.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	10
-@@ -1509,7 +1817,7 @@
+@@ -1551,7 +1859,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	8
 VARIABLE_SCOPE	GLOBAL
@@ -795,7 +792,7 @@
 VARIABLE_COMMENT	Number of multi-threaded flush threads
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	64
-@@ -1565,10 +1873,10 @@
+@@ -1607,10 +1915,10 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
@@ -808,7 +805,7 @@
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
-@@ -1593,7 +1901,7 @@
+@@ -1635,7 +1943,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	16
 VARIABLE_SCOPE	GLOBAL
@@ -817,7 +814,7 @@
 VARIABLE_COMMENT	Number of rw_locks protecting buffer pool page_hash. Rounded up to the next power of 2
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	1024
-@@ -1607,7 +1915,7 @@
+@@ -1649,7 +1957,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	16384
 VARIABLE_SCOPE	GLOBAL
@@ -826,7 +823,7 @@
 VARIABLE_COMMENT	Page size to use for all InnoDB tablespaces.
 NUMERIC_MIN_VALUE	4096
 NUMERIC_MAX_VALUE	65536
-@@ -1643,13 +1951,69 @@
+@@ -1685,13 +1993,69 @@
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	OPTIONAL
@@ -897,7 +894,7 @@
 VARIABLE_COMMENT	Number of UNDO log pages to purge in one batch from the history list.
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	5000
-@@ -1691,7 +2055,7 @@
+@@ -1733,7 +2097,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	GLOBAL
@@ -906,7 +903,7 @@
 VARIABLE_COMMENT	Purge threads can be from 1 to 32. Default is 1.
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	32
-@@ -1719,7 +2083,7 @@
+@@ -1761,7 +2125,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	56
 VARIABLE_SCOPE	GLOBAL
@@ -915,7 +912,7 @@
 VARIABLE_COMMENT	Number of pages that must be accessed sequentially for InnoDB to trigger a readahead.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	64
-@@ -1733,7 +2097,7 @@
+@@ -1775,7 +2139,7 @@
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	4
 VARIABLE_SCOPE	GLOBAL
@@ -924,7 +921,7 @@
 VARIABLE_COMMENT	Number of background read I/O threads in InnoDB.
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	64
-@@ -1761,10 +2125,10 @@
+@@ -1803,10 +2167,10 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
@@ -937,7 +934,7 @@
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
-@@ -1789,7 +2153,7 @@
+@@ -1831,7 +2195,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	128
 VARIABLE_SCOPE	GLOBAL
@@ -946,7 +943,7 @@
 VARIABLE_COMMENT	Number of undo logs to use (deprecated).
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	128
-@@ -1803,7 +2167,7 @@
+@@ -1845,7 +2209,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
@@ -955,7 +952,7 @@
 VARIABLE_COMMENT	An InnoDB page number.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	4294967295
-@@ -1811,6 +2175,48 @@
+@@ -1853,6 +2217,48 @@
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	OPTIONAL
@@ -1001,10 +998,10 @@
 +ENUM_VALUE_LIST	NULL
 +READ_ONLY	NO
 +COMMAND_LINE_ARGUMENT	REQUIRED
- VARIABLE_NAME	INNODB_SCRUB_FORCE_TESTING
+ VARIABLE_NAME	INNODB_SCRUB_LOG
 SESSION_VALUE	NULL
 GLOBAL_VALUE	OFF
-@@ -1853,6 +2259,34 @@
+@@ -1881,6 +2287,34 @@
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	OPTIONAL
@@ -1039,7 +1036,7 @@
 VARIABLE_NAME	INNODB_SIMULATE_COMP_FAILURES
 SESSION_VALUE	NULL
 GLOBAL_VALUE	0
-@@ -1873,7 +2307,7 @@
+@@ -1901,7 +2335,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1048576
 VARIABLE_SCOPE	GLOBAL
@@ -1048,7 +1045,7 @@
 VARIABLE_COMMENT	Memory buffer size for index creation
 NUMERIC_MIN_VALUE	65536
 NUMERIC_MAX_VALUE	67108864
-@@ -1887,10 +2321,10 @@
+@@ -1915,10 +2349,10 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	6
 VARIABLE_SCOPE	GLOBAL
@@ -1061,7 +1058,7 @@
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
-@@ -1916,7 +2350,7 @@
+@@ -1944,7 +2378,7 @@
 DEFAULT_VALUE	nulls_equal
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	ENUM
@@ -1070,7 +1067,7 @@
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
-@@ -2083,7 +2517,7 @@
+@@ -2111,7 +2545,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	GLOBAL
@@ -1079,7 +1076,7 @@
 VARIABLE_COMMENT	Size of the mutex/lock wait array.
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	1024
-@@ -2097,10 +2531,10 @@
+@@ -2125,10 +2559,10 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	30
 VARIABLE_SCOPE	GLOBAL
@@ -1092,7 +1089,7 @@
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
-@@ -2125,7 +2559,7 @@
+@@ -2153,7 +2587,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
@@ -1101,7 +1098,7 @@
 VARIABLE_COMMENT	Helps in performance tuning in heavily concurrent environments. Sets the maximum number of threads allowed inside InnoDB. Value 0 will disable the thread throttling.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1000
-@@ -2139,7 +2573,7 @@
+@@ -2167,7 +2601,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	10000
 VARIABLE_SCOPE	GLOBAL
@@ -1110,7 +1107,7 @@
 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
-@@ -2147,6 +2581,34 @@
+@@ -2175,6 +2609,34 @@
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
@@ -1145,7 +1142,7 @@
 VARIABLE_NAME	INNODB_TRX_PURGE_VIEW_UPDATE_ONLY_DEBUG
 SESSION_VALUE	NULL
 GLOBAL_VALUE	OFF
-@@ -2195,7 +2657,7 @@
+@@ -2223,7 +2685,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	128
 VARIABLE_SCOPE	GLOBAL
@@ -1154,7 +1151,7 @@
 VARIABLE_COMMENT	Number of undo logs to use.
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	128
-@@ -2209,7 +2671,7 @@
+@@ -2237,7 +2699,7 @@
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
@@ -1163,7 +1160,7 @@
 VARIABLE_COMMENT	Number of undo tablespaces to use. 
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	126
-@@ -2224,7 +2686,7 @@
+@@ -2252,7 +2714,7 @@
 DEFAULT_VALUE	OFF
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BOOLEAN
@@ -1172,7 +1169,7 @@
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
-@@ -2245,6 +2707,20 @@
+@@ -2273,6 +2735,20 @@
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	NONE
@@ -1193,7 +1190,7 @@
 VARIABLE_NAME	INNODB_USE_MTFLUSH
 SESSION_VALUE	NULL
 GLOBAL_VALUE	OFF
-@@ -2259,6 +2735,20 @@
+@@ -2287,6 +2763,20 @@
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	NONE
@@ -1214,12 +1211,12 @@
 VARIABLE_NAME	INNODB_USE_SYS_MALLOC
 SESSION_VALUE	NULL
 GLOBAL_VALUE	ON
-@@ -2289,12 +2779,12 @@
+@@ -2317,12 +2807,12 @@
 COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	INNODB_VERSION
 SESSION_VALUE	NULL
-GLOBAL_VALUE	5.6.23
-+GLOBAL_VALUE	5.6.22-72.0
+-GLOBAL_VALUE	5.6.24
+GLOBAL_VALUE	5.6.23-72.1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	NULL
 VARIABLE_SCOPE	GLOBAL
@@ -1229,7 +1226,7 @@
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
-@@ -2307,7 +2797,7 @@
+@@ -2335,7 +2825,7 @@
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	4
 VARIABLE_SCOPE	GLOBAL