Merge 10.1 into 10.2

For running the Galera tests, the variable my_disable_leak_check
was set to true in order to avoid assertions due to memory leaks
at shutdown.

Some adjustments due to MDEV-13625 (merge InnoDB tests from MySQL 5.6)
were performed. The most notable behaviour changes from 10.0 and 10.1
are the following:

* innodb.innodb-table-online: adjustments for the DROP COLUMN
behaviour change (MDEV-11114, MDEV-13613)

* innodb.innodb-index-online-fk: the removal of a (1,NULL) record
from the result; originally removed in MySQL 5.7 in the
Oracle Bug #16244691 fix
https://github.com/mysql/mysql-server/commit/377774689bf6a16af74182753fe950d514c2c6dd

* innodb.create-index-debug: disabled due to MDEV-13680
(the MySQL Bug #77497 fix was not merged from 5.6 to 5.7.10)

* innodb.innodb-alter-autoinc: MariaDB 10.2 behaves like MySQL 5.6/5.7,
while MariaDB 10.0 and 10.1 assign different values when
auto_increment_increment or auto_increment_offset are used.
Also MySQL 5.6/5.7 exhibit different behaviour between
LGORITHM=INPLACE and ALGORITHM=COPY, so something needs to be tested
and fixed in both MariaDB 10.0 and 10.2.

* innodb.innodb-wl5980-alter: disabled because it would trigger an
InnoDB assertion failure (MDEV-13668 may need additional effort in 10.2)

1 files changed, 46 insertions, 48 deletions

diff --git a/storage/innobase/trx/trx0sys.cc b/storage/innobase/trx/trx0sys.cc
index c35faede4b9..dc59260c31d 100644
--- a/storage/innobase/trx/trx0sys.cc
+++ b/storage/innobase/trx/trx0sys.cc
@@ -245,85 +245,83 @@ trx_sys_print_mysql_binlog_offset()
 static long long trx_sys_cur_xid_seqno = -1;
 static unsigned char trx_sys_cur_xid_uuid[16];
 
-long long read_wsrep_xid_seqno(const XID* xid)
+/** Read WSREP XID seqno */
+static inline long long read_wsrep_xid_seqno(const XID* xid)
 {
 	long long seqno;
 	memcpy(&seqno, xid->data + 24, sizeof(long long));
 	return seqno;
 }
 
-void read_wsrep_xid_uuid(const XID* xid, unsigned char* buf)
+/** Read WSREP XID UUID */
+static inline void read_wsrep_xid_uuid(const XID* xid, unsigned char* buf)
 {
 	memcpy(buf, xid->data + 8, 16);
 }
 
 #endif /* UNIV_DEBUG */
 
+/** Update WSREP XID info in sys_header of TRX_SYS_PAGE_NO = 5.
+@param[in]	xid		Transaction XID
+@param[in,out]	sys_header	sys_header
+@param[in]	mtr		minitransaction */
+UNIV_INTERN
 void
 trx_sys_update_wsrep_checkpoint(
-/*============================*/
-	const XID*	xid,		/*!< in: transaction XID */
-	trx_sysf_t*	sys_header,	/*!< in: sys_header */
-	mtr_t*		mtr)		/*!< in: mtr */
+	const XID*	xid,
+	trx_sysf_t*	sys_header,
+	mtr_t*		mtr)
 {
+	ut_ad(xid->formatID == 1);
+	ut_ad(wsrep_is_wsrep_xid(xid));
+
+	if (mach_read_from_4(sys_header + TRX_SYS_WSREP_XID_INFO
+			     + TRX_SYS_WSREP_XID_MAGIC_N_FLD)
+		!= TRX_SYS_WSREP_XID_MAGIC_N) {
+		mlog_write_ulint(sys_header + TRX_SYS_WSREP_XID_INFO
+			+ TRX_SYS_WSREP_XID_MAGIC_N_FLD,
+			TRX_SYS_WSREP_XID_MAGIC_N,
+			MLOG_4BYTES, mtr);
 #ifdef UNIV_DEBUG
-	{
+	} else {
 		/* Check that seqno is monotonically increasing */
 		unsigned char xid_uuid[16];
 		long long xid_seqno = read_wsrep_xid_seqno(xid);
 		read_wsrep_xid_uuid(xid, xid_uuid);
-		if (!memcmp(xid_uuid, trx_sys_cur_xid_uuid, 16))
-		{
-			/*
-			This check is a protection against the initial seqno (-1)
-			assigned in read_wsrep_xid_uuid(), which, if not checked,
-			would cause the following assertion to fail.
-			*/
-			if (xid_seqno > -1 )
-			{
-				ut_ad(xid_seqno > trx_sys_cur_xid_seqno);
-			}
+
+		if (!memcmp(xid_uuid, trx_sys_cur_xid_uuid, 8)) {
+			ut_ad(xid_seqno > trx_sys_cur_xid_seqno);
+			trx_sys_cur_xid_seqno = xid_seqno;
 		} else {
 			memcpy(trx_sys_cur_xid_uuid, xid_uuid, 16);
 		}
+
 		trx_sys_cur_xid_seqno = xid_seqno;
-	}
 #endif /* UNIV_DEBUG */
+	}
 
-		ut_ad(xid && mtr);
-		ut_a(xid->formatID == -1 || wsrep_is_wsrep_xid(xid));
-
-		if (mach_read_from_4(sys_header + TRX_SYS_WSREP_XID_INFO
-				+ TRX_SYS_WSREP_XID_MAGIC_N_FLD)
-			!= TRX_SYS_WSREP_XID_MAGIC_N) {
-			mlog_write_ulint(sys_header + TRX_SYS_WSREP_XID_INFO
-				+ TRX_SYS_WSREP_XID_MAGIC_N_FLD,
-				TRX_SYS_WSREP_XID_MAGIC_N,
-				MLOG_4BYTES, mtr);
-		}
-
-		mlog_write_ulint(sys_header + TRX_SYS_WSREP_XID_INFO
-			+ TRX_SYS_WSREP_XID_FORMAT,
-			(int)xid->formatID,
-			MLOG_4BYTES, mtr);
-		mlog_write_ulint(sys_header + TRX_SYS_WSREP_XID_INFO
-			+ TRX_SYS_WSREP_XID_GTRID_LEN,
-			(int)xid->gtrid_length,
-			MLOG_4BYTES, mtr);
-		mlog_write_ulint(sys_header + TRX_SYS_WSREP_XID_INFO
-			+ TRX_SYS_WSREP_XID_BQUAL_LEN,
-			(int)xid->bqual_length,
-			MLOG_4BYTES, mtr);
-		mlog_write_string(sys_header + TRX_SYS_WSREP_XID_INFO
-			+ TRX_SYS_WSREP_XID_DATA,
-			(const unsigned char*) xid->data,
-			XIDDATASIZE, mtr);
-
+	mlog_write_ulint(sys_header + TRX_SYS_WSREP_XID_INFO
+		+ TRX_SYS_WSREP_XID_FORMAT,
+		(int)xid->formatID,
+		MLOG_4BYTES, mtr);
+	mlog_write_ulint(sys_header + TRX_SYS_WSREP_XID_INFO
+		+ TRX_SYS_WSREP_XID_GTRID_LEN,
+		(int)xid->gtrid_length,
+		MLOG_4BYTES, mtr);
+	mlog_write_ulint(sys_header + TRX_SYS_WSREP_XID_INFO
+		+ TRX_SYS_WSREP_XID_BQUAL_LEN,
+		(int)xid->bqual_length,
+		MLOG_4BYTES, mtr);
+	mlog_write_string(sys_header + TRX_SYS_WSREP_XID_INFO
+		+ TRX_SYS_WSREP_XID_DATA,
+		(const unsigned char*) xid->data,
+		XIDDATASIZE, mtr);
 }
 
 /** Read WSREP checkpoint XID from sys header.
 @param[out]	xid	WSREP XID
 @return	whether the checkpoint was present */
+UNIV_INTERN
 bool
 trx_sys_read_wsrep_checkpoint(XID* xid)
 {