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

16 years ago · bb8a7e66d2
5 changed files with 3 additions and 25 deletions
--- a/mysql-test/t/bug46760.test
+++ b/mysql-test/t/bug46760.test
@ -1,9 +1,3 @@
--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 #
--- a/mysql-test/t/innodb_autoinc_lock_mode_zero.test
+++ b/mysql-test/t/innodb_autoinc_lock_mode_zero.test
@ -1,9 +1,3 @@
--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

--- a/mysql-test/t/innodb_bug30919.test
+++ b/mysql-test/t/innodb_bug30919.test
@ -1,9 +1,3 @@
--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
--- a/mysql-test/t/lock_tables_lost_commit.test
+++ b/mysql-test/t/lock_tables_lost_commit.test
@ -1,9 +1,3 @@
--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
--- a/storage/innobase/sync/sync0arr.c
+++ b/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;