Merge mysql-trunk-innodb from bk-internal into my local tree

mysql-test/t/bug46760.test

---source include/not_windows_embedded.inc
-# remove this when
-# Bug#53947 InnoDB: Assertion failure in thread 4224 in file
-#   .\sync\sync0sync.c line 324
-# is fixed
-
 -- source include/have_innodb.inc
 
 --echo #

mysql-test/t/innodb_autoinc_lock_mode_zero.test

---source include/not_windows_embedded.inc
-# remove this when
-# Bug#53947 InnoDB: Assertion failure in thread 4224 in file
-#   .\sync\sync0sync.c line 324
-# is fixed
-
 # This test runs with old-style locking, as:
 # --innodb-autoinc-lock-mode=0
 

mysql-test/t/innodb_bug30919.test

---source include/not_windows_embedded.inc
-# remove this when
-# Bug#53947 InnoDB: Assertion failure in thread 4224 in file
-#   .\sync\sync0sync.c line 324
-# is fixed
-
 --source include/have_innodb.inc
 --source include/have_partition.inc
 --vertical_results

mysql-test/t/lock_tables_lost_commit.test

---source include/not_windows_embedded.inc
-# remove this when
-# Bug#53947 InnoDB: Assertion failure in thread 4224 in file
-#   .\sync\sync0sync.c line 324
-# is fixed
-
 # Test for Bug#578 mysqlimport -l silently fails when binlog-ignore-db is set
 
 --source include/have_innodb.inc

storage/innobase/sync/sync0arr.c

@@ -504,7 +504,9 @@ sync_array_cell_print(
 		   || type == RW_LOCK_WAIT_EX
 		   || type == RW_LOCK_SHARED) {
 
-		fputs(type == RW_LOCK_EX ? "X-lock on" : "S-lock on", file);
+		fputs(type == RW_LOCK_EX ? "X-lock on"
+		      : type == RW_LOCK_WAIT_EX ? "X-lock (wait_ex) on"
+		      : "S-lock on", file);
 
 		rwlock = cell->old_wait_rw_lock;