after-merge fixes

.gitignore

@@ -52,6 +52,7 @@ extra/perror
 extra/replace
 extra/resolve_stack_dump
 extra/resolveip
+import_executables.cmake
 include/*.h.tmp
 include/config.h
 include/my_config.h
@@ -169,26 +170,24 @@ storage/perfschema/pfs_lex_token.h
 storage/tokudb/ft-index/buildheader/db.h
 storage/tokudb/ft-index/buildheader/make_tdb
 storage/tokudb/ft-index/buildheader/runcat.sh
-storage/tokudb/ft-index/ft/ftverify
 storage/tokudb/ft-index/ft/log_code.cc
 storage/tokudb/ft-index/ft/log_header.h
 storage/tokudb/ft-index/ft/log_print.cc
 storage/tokudb/ft-index/ft/logformat
-storage/tokudb/ft-index/ft/tdb-recover
-storage/tokudb/ft-index/ft/tdb_logprint
-storage/tokudb/ft-index/ft/tokuftdump
 storage/tokudb/ft-index/portability/merge_archives_tokuportability_static.cmake
 storage/tokudb/ft-index/portability/toku_config.h
 storage/tokudb/ft-index/portability/tokuportability_static_depends.cc
 storage/tokudb/ft-index/src/merge_archives_tokufractaltree_static.cmake
 storage/tokudb/ft-index/src/tokufractaltree_static_depends.cc
 storage/tokudb/ft-index/toku_include/toku_config.h
+storage/tokudb/ft-index/tools/ba_replay
+storage/tokudb/ft-index/tools/ftverify
+storage/tokudb/ft-index/tools/tdb-recover
+storage/tokudb/ft-index/tools/tdb_logprint
 storage/tokudb/ft-index/tools/tokudb_dump
 storage/tokudb/ft-index/tools/tokudb_gen
 storage/tokudb/ft-index/tools/tokudb_load
-storage/tokudb/ft-index/utils/tokudb_dump
-storage/tokudb/ft-index/utils/tokudb_gen
-storage/tokudb/ft-index/utils/tokudb_load
+storage/tokudb/ft-index/tools/tokuftdump
 storage/tokudb/ft-index/xz/
 support-files/MySQL-shared-compat.spec
 support-files/binary-configure

mysql-test/r/innodb_load_xa.result

@@ -9,13 +9,8 @@ start transaction;
 insert t1 values (1);
 insert t1 values (2);
 commit;
-include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-mysqld-bin.000001	#	Gtid	#	#	GTID #-#-#
-mysqld-bin.000001	#	Query	#	#	use `test`; create table t1 (a int) engine=innodb
-mysqld-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
-mysqld-bin.000001	#	Query	#	#	use `test`; insert t1 values (1)
-mysqld-bin.000001	#	Query	#	#	use `test`; insert t1 values (2)
-mysqld-bin.000001	#	Query	#	#	COMMIT
+show status like 'Handler_prepare';
+Variable_name	Value
+Handler_prepare	0
 drop table t1;
 uninstall plugin innodb;

mysql-test/suite/sys_vars/r/sysvars_aria,32bit.rdiff

@@ -1,96 +1,48 @@
---- suite/sys_vars/r/sysvars_aria.result	2014-10-10 13:33:55.000000000 +0300
-+++ suite/sys_vars/r/sysvars_aria,32bit.reject	2014-10-10 19:35:09.000000000 +0300
-@@ -7,7 +7,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	8192
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Block size to be used for Aria index pages.
- NUMERIC_MIN_VALUE	1024
- NUMERIC_MAX_VALUE	32768
-@@ -21,7 +21,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	30
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Interval between tries to do an automatic checkpoints. In seconds; 0 means 'no automatic checkpoints' which makes sense only for testing.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -35,7 +35,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1048576
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of bytes that the transaction log has to grow between checkpoints before a new checkpoint is written to the log.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -49,7 +49,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of consecutive log recovery failures after which logs will be automatically deleted to cure the problem; 0 (the default) disables the feature.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	255
-@@ -77,7 +77,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Interval between commite in microseconds (1/1000000c). 0 stands for no waiting for other threads to come and do a commit in "hard" mode and no sync()/commit at all in "soft" mode.  Option has only an effect if aria_group_commit is used
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -91,7 +91,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	1073741824
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Limit for transaction log size
- NUMERIC_MIN_VALUE	8388608
- NUMERIC_MAX_VALUE	4294967295
-@@ -133,10 +133,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	300
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	This characterizes the number of hits a hot block has to be untouched until it is considered aged enough to be downgraded to a warm block. This specifies the percentage ratio of that number of hits to the total number of blocks in the page cache.
- NUMERIC_MIN_VALUE	100
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	100
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -161,7 +161,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	100
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The minimum percentage of warm blocks in key cache
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	100
-@@ -203,7 +203,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of threads to use when repairing Aria tables. The value of 1 disables parallel repair.
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	128
-@@ -220,7 +220,7 @@
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE.
- NUMERIC_MIN_VALUE	4096
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
+10c10
+< VARIABLE_TYPE	BIGINT UNSIGNED
+---
+> VARIABLE_TYPE	INT UNSIGNED
+24c24
+< VARIABLE_TYPE	BIGINT UNSIGNED
+---
+> VARIABLE_TYPE	INT UNSIGNED
+38c38
+< VARIABLE_TYPE	BIGINT UNSIGNED
+---
+> VARIABLE_TYPE	INT UNSIGNED
+52c52
+< VARIABLE_TYPE	BIGINT UNSIGNED
+---
+> VARIABLE_TYPE	INT UNSIGNED
+80c80
+< VARIABLE_TYPE	BIGINT UNSIGNED
+---
+> VARIABLE_TYPE	INT UNSIGNED
+94c94
+< VARIABLE_TYPE	BIGINT UNSIGNED
+---
+> VARIABLE_TYPE	INT UNSIGNED
+136c136
+< VARIABLE_TYPE	BIGINT UNSIGNED
+---
+> VARIABLE_TYPE	INT UNSIGNED
+139c139
+< NUMERIC_MAX_VALUE	18446744073709551615
+---
+> NUMERIC_MAX_VALUE	4294967295
+164c164
+< VARIABLE_TYPE	BIGINT UNSIGNED
+---
+> VARIABLE_TYPE	INT UNSIGNED
+178c178
+< VARIABLE_TYPE	BIGINT UNSIGNED
+---
+> VARIABLE_TYPE	INT UNSIGNED
+220c220
+< VARIABLE_TYPE	BIGINT UNSIGNED
+---
+> VARIABLE_TYPE	INT UNSIGNED
+237c237
+< NUMERIC_MAX_VALUE	18446744073709551615
+---
+> NUMERIC_MAX_VALUE	4294967295

mysql-test/suite/sys_vars/r/sysvars_aria.result

@@ -169,6 +169,20 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	ARIA_PAGECACHE_FILE_HASH_SIZE
+SESSION_VALUE	NULL
+GLOBAL_VALUE	512
+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+DEFAULT_VALUE	512
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_COMMENT	Number of hash buckets for open and changed files.  If you have a lot of Aria files open you should increase this for faster flush of changes. A good value is probably 1/10 of number of possible open Aria files.
+NUMERIC_MIN_VALUE	128
+NUMERIC_MAX_VALUE	16384
+NUMERIC_BLOCK_SIZE	1
+ENUM_VALUE_LIST	NULL
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	ARIA_PAGE_CHECKSUM
 SESSION_VALUE	NULL
 GLOBAL_VALUE	ON

mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff

@@ -1,5 +1,5 @@
---- suite/sys_vars/r/sysvars_innodb.result	2014-10-11 01:09:47.000000000 +0300
-+++ suite/sys_vars/r/sysvars_innodb,32bit,xtradb.reject	2014-10-11 01:18:23.000000000 +0300
+--- suite/sys_vars/r/sysvars_innodb.result	2014-10-15 18:22:06.000000000 +0300
++++ suite/sys_vars/r/sysvars_innodb,32bit,xtradb.reject	2014-10-15 18:33:17.000000000 +0300
 @@ -25,7 +25,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	10
@@ -859,7 +859,7 @@
  VARIABLE_COMMENT	An InnoDB page number.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	4294967295
-@@ -1629,13 +1937,41 @@
+@@ -1629,6 +1937,34 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	OPTIONAL
@@ -891,9 +891,10 @@
 +ENUM_VALUE_LIST	NULL
 +READ_ONLY	NO
 +COMMAND_LINE_ARGUMENT	OPTIONAL
- VARIABLE_NAME	INNODB_SORT_BUFFER_SIZE
+ VARIABLE_NAME	INNODB_SIMULATE_COMP_FAILURES
  SESSION_VALUE	NULL
- GLOBAL_VALUE	1048576
+ GLOBAL_VALUE	0
+@@ -1649,7 +1985,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	1048576
  VARIABLE_SCOPE	GLOBAL
@@ -902,7 +903,7 @@
  VARIABLE_COMMENT	Memory buffer size for index creation
  NUMERIC_MIN_VALUE	65536
  NUMERIC_MAX_VALUE	67108864
-@@ -1649,10 +1985,10 @@
+@@ -1663,10 +1999,10 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	6
  VARIABLE_SCOPE	GLOBAL
@@ -915,7 +916,7 @@
  NUMERIC_BLOCK_SIZE	0
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -1678,7 +2014,7 @@
+@@ -1692,7 +2028,7 @@
  DEFAULT_VALUE	nulls_equal
  VARIABLE_SCOPE	GLOBAL
  VARIABLE_TYPE	ENUM
@@ -924,7 +925,7 @@
  NUMERIC_MIN_VALUE	NULL
  NUMERIC_MAX_VALUE	NULL
  NUMERIC_BLOCK_SIZE	NULL
-@@ -1817,7 +2153,7 @@
+@@ -1831,7 +2167,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	1
  VARIABLE_SCOPE	GLOBAL
@@ -933,7 +934,7 @@
  VARIABLE_COMMENT	Size of the mutex/lock wait array.
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	1024
-@@ -1831,10 +2167,10 @@
+@@ -1845,10 +2181,10 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	30
  VARIABLE_SCOPE	GLOBAL
@@ -946,7 +947,7 @@
  NUMERIC_BLOCK_SIZE	0
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -1859,7 +2195,7 @@
+@@ -1873,7 +2209,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	0
  VARIABLE_SCOPE	GLOBAL
@@ -955,7 +956,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
-@@ -1873,7 +2209,7 @@
+@@ -1887,7 +2223,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	10000
  VARIABLE_SCOPE	GLOBAL
@@ -964,7 +965,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
-@@ -1881,6 +2217,34 @@
+@@ -1895,6 +2231,34 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	REQUIRED
@@ -999,7 +1000,7 @@
  VARIABLE_NAME	INNODB_TRX_PURGE_VIEW_UPDATE_ONLY_DEBUG
  SESSION_VALUE	NULL
  GLOBAL_VALUE	OFF
-@@ -1929,7 +2293,7 @@
+@@ -1943,7 +2307,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	128
  VARIABLE_SCOPE	GLOBAL
@@ -1008,7 +1009,7 @@
  VARIABLE_COMMENT	Number of undo logs to use.
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	128
-@@ -1943,7 +2307,7 @@
+@@ -1957,7 +2321,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	0
  VARIABLE_SCOPE	GLOBAL
@@ -1017,7 +1018,7 @@
  VARIABLE_COMMENT	Number of undo tablespaces to use. 
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	126
-@@ -1958,7 +2322,7 @@
+@@ -1972,7 +2336,7 @@
  DEFAULT_VALUE	OFF
  VARIABLE_SCOPE	GLOBAL
  VARIABLE_TYPE	BOOLEAN
@@ -1026,7 +1027,7 @@
  NUMERIC_MIN_VALUE	NULL
  NUMERIC_MAX_VALUE	NULL
  NUMERIC_BLOCK_SIZE	NULL
-@@ -1979,6 +2343,20 @@
+@@ -1993,6 +2357,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	YES
  COMMAND_LINE_ARGUMENT	NONE
@@ -1047,7 +1048,7 @@
  VARIABLE_NAME	INNODB_USE_MTFLUSH
  SESSION_VALUE	NULL
  GLOBAL_VALUE	OFF
-@@ -1993,6 +2371,20 @@
+@@ -2007,6 +2385,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	YES
  COMMAND_LINE_ARGUMENT	NONE
@@ -1068,12 +1069,12 @@
  VARIABLE_NAME	INNODB_USE_SYS_MALLOC
  SESSION_VALUE	NULL
  GLOBAL_VALUE	ON
-@@ -2023,12 +2415,12 @@
+@@ -2037,12 +2429,12 @@
  COMMAND_LINE_ARGUMENT	OPTIONAL
  VARIABLE_NAME	INNODB_VERSION
  SESSION_VALUE	NULL
--GLOBAL_VALUE	5.6.17
-+GLOBAL_VALUE	5.6.17-65.0
+-GLOBAL_VALUE	5.6.20
++GLOBAL_VALUE	5.6.20-68.0
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	NULL
  VARIABLE_SCOPE	GLOBAL
@@ -1083,7 +1084,7 @@
  NUMERIC_MIN_VALUE	NULL
  NUMERIC_MAX_VALUE	NULL
  NUMERIC_BLOCK_SIZE	NULL
-@@ -2041,7 +2433,7 @@
+@@ -2055,7 +2447,7 @@
  GLOBAL_VALUE_ORIGIN	CONFIG
  DEFAULT_VALUE	4
  VARIABLE_SCOPE	GLOBAL

mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff

@@ -1,5 +1,5 @@
---- suite/sys_vars/r/sysvars_innodb.result	2014-10-11 00:05:25.000000000 +0200
-+++ suite/sys_vars/r/sysvars_innodb,xtradb.reject	2014-10-11 00:05:51.000000000 +0200
+--- 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
 @@ -47,6 +47,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
@@ -545,10 +545,10 @@
 +ENUM_VALUE_LIST	NULL
 +READ_ONLY	NO
 +COMMAND_LINE_ARGUMENT	OPTIONAL
- VARIABLE_NAME	INNODB_SORT_BUFFER_SIZE
+ VARIABLE_NAME	INNODB_SIMULATE_COMP_FAILURES
  SESSION_VALUE	NULL
- GLOBAL_VALUE	1048576
-@@ -1678,7 +2112,7 @@
+ GLOBAL_VALUE	0
+@@ -1692,7 +2126,7 @@
  DEFAULT_VALUE	nulls_equal
  VARIABLE_SCOPE	GLOBAL
  VARIABLE_TYPE	ENUM
@@ -557,7 +557,7 @@
  NUMERIC_MIN_VALUE	NULL
  NUMERIC_MAX_VALUE	NULL
  NUMERIC_BLOCK_SIZE	NULL
-@@ -1881,6 +2315,34 @@
+@@ -1895,6 +2329,34 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	REQUIRED
@@ -592,7 +592,7 @@
  VARIABLE_NAME	INNODB_TRX_PURGE_VIEW_UPDATE_ONLY_DEBUG
  SESSION_VALUE	NULL
  GLOBAL_VALUE	OFF
-@@ -1958,7 +2420,7 @@
+@@ -1972,7 +2434,7 @@
  DEFAULT_VALUE	OFF
  VARIABLE_SCOPE	GLOBAL
  VARIABLE_TYPE	BOOLEAN
@@ -601,7 +601,7 @@
  NUMERIC_MIN_VALUE	NULL
  NUMERIC_MAX_VALUE	NULL
  NUMERIC_BLOCK_SIZE	NULL
-@@ -1979,6 +2441,20 @@
+@@ -1993,6 +2455,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	YES
  COMMAND_LINE_ARGUMENT	NONE
@@ -622,7 +622,7 @@
  VARIABLE_NAME	INNODB_USE_MTFLUSH
  SESSION_VALUE	NULL
  GLOBAL_VALUE	OFF
-@@ -1993,6 +2469,20 @@
+@@ -2007,6 +2483,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	YES
  COMMAND_LINE_ARGUMENT	NONE
@@ -643,12 +643,12 @@
  VARIABLE_NAME	INNODB_USE_SYS_MALLOC
  SESSION_VALUE	NULL
  GLOBAL_VALUE	ON
-@@ -2023,12 +2513,12 @@
+@@ -2037,12 +2527,12 @@
  COMMAND_LINE_ARGUMENT	OPTIONAL
  VARIABLE_NAME	INNODB_VERSION
  SESSION_VALUE	NULL
--GLOBAL_VALUE	5.6.17
-+GLOBAL_VALUE	5.6.17-65.0
+-GLOBAL_VALUE	5.6.20
++GLOBAL_VALUE	5.6.20-68.0
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	NULL
  VARIABLE_SCOPE	GLOBAL

mysql-test/suite/sys_vars/r/sysvars_innodb.result

@@ -1629,6 +1629,20 @@ NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	OPTIONAL
+VARIABLE_NAME	INNODB_SIMULATE_COMP_FAILURES
+SESSION_VALUE	NULL
+GLOBAL_VALUE	0
+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+DEFAULT_VALUE	0
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_COMMENT	Simulate compression failures.
+NUMERIC_MIN_VALUE	0
+NUMERIC_MAX_VALUE	99
+NUMERIC_BLOCK_SIZE	0
+ENUM_VALUE_LIST	NULL
+READ_ONLY	NO
+COMMAND_LINE_ARGUMENT	NONE
 VARIABLE_NAME	INNODB_SORT_BUFFER_SIZE
 SESSION_VALUE	NULL
 GLOBAL_VALUE	1048576
@@ -2023,7 +2037,7 @@ READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	INNODB_VERSION
 SESSION_VALUE	NULL
-GLOBAL_VALUE	5.6.17
+GLOBAL_VALUE	5.6.20
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	NULL
 VARIABLE_SCOPE	GLOBAL

mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result

@@ -1449,6 +1449,20 @@ NUMERIC_BLOCK_SIZE	NULL
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	KEY_CACHE_FILE_HASH_SIZE
+SESSION_VALUE	NULL
+GLOBAL_VALUE	512
+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+DEFAULT_VALUE	512
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_COMMENT	Number of hash buckets for open and changed files.  If you have a lot of MyISAM files open you should increase this for faster flush of changes. A good value is probably 1/10 of number of possible open MyISAM files.
+NUMERIC_MIN_VALUE	NULL
+NUMERIC_MAX_VALUE	NULL
+NUMERIC_BLOCK_SIZE	NULL
+ENUM_VALUE_LIST	NULL
+READ_ONLY	NO
+COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	KEY_CACHE_SEGMENTS
 SESSION_VALUE	NULL
 GLOBAL_VALUE	0
@@ -4466,7 +4480,7 @@ GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	OFF
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BOOLEAN
-VARIABLE_COMMENT	Specify whether to time mutexes (only InnoDB mutexes are currently supported)
+VARIABLE_COMMENT	Specify whether to time mutexes. Deprecated, has no effect.
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL

mysql-test/t/innodb_load_xa.opt

@@ -1 +1 @@
---ignore-builtin-innodb --loose-innodb --log-bin
+--ignore-builtin-innodb --loose-innodb

mysql-test/t/innodb_load_xa.test

@@ -3,6 +3,10 @@
 #
 --source include/not_embedded.inc
 
+# this test needs exactly one (1) XA-capable engine running initially.
+# it's binlog "engine" in 10.0 but wsrep in here, because it cannot be disabled
+--source include/have_wsrep.inc
+
 if (!$HA_INNODB_SO) {
   --skip Need InnoDB plugin
 }
@@ -13,6 +17,6 @@ start transaction;
 insert t1 values (1);
 insert t1 values (2);
 commit;
---source include/show_binlog_events.inc
+show status like 'Handler_prepare';
 drop table t1;
 uninstall plugin innodb;

storage/innobase/handler/ha_innodb.cc

@@ -4467,7 +4467,7 @@ innobase_kill_query(
 		THD *owner = trx->current_lock_mutex_owner;
 
 		/* Cancel a pending lock request. */
-		if (owner != cur) {
+		if (!owner || owner != cur) {
 			lock_mutex_enter();
 		}
 		trx_mutex_enter(trx);
@@ -4475,7 +4475,7 @@ innobase_kill_query(
 			lock_cancel_waiting_and_release(trx->lock.wait_lock);
 		}
 		trx_mutex_exit(trx);
-		if (owner != cur) {
+		if (!owner || owner != cur) {
 			lock_mutex_exit();
 		}
 	}

storage/tokudb/ha_tokudb_alter_56.cc

@@ -221,7 +221,7 @@ static bool change_type_is_supported(TABLE *table, TABLE *altered_table, Alter_i
 static ulong fix_handler_flags(THD *thd, TABLE *table, TABLE *altered_table, Alter_inplace_info *ha_alter_info) {
     ulong handler_flags = ha_alter_info->handler_flags;
 
-#if 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100099
+#if 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100199
     // This is automatically supported, hide the flag from later checks
     handler_flags &= ~Alter_inplace_info::ALTER_PARTITIONED;
 #endif

storage/xtradb/handler/ha_innodb.cc

@@ -5069,7 +5069,7 @@ innobase_kill_connection(
 		THD *cur = current_thd;
 		THD *owner = trx->current_lock_mutex_owner;
 
-		if (owner != cur) {
+		if (!owner || owner != cur) {
 			lock_mutex_enter();
 		}
 		trx_mutex_enter(trx);
@@ -5079,7 +5079,7 @@ innobase_kill_connection(
 			lock_cancel_waiting_and_release(trx->lock.wait_lock);
 
 		trx_mutex_exit(trx);
-		if (owner != cur) {
+		if (!owner || owner != cur) {
 			lock_mutex_exit();
 		}
 	}