From a80c59c7fc8bf6b6514342609695dda8dff2035c Mon Sep 17 00:00:00 2001
From: Vasil Dimov <vasil.dimov@oracle.com>
Date: Tue, 25 May 2010 10:36:06 +0300
Subject: [PATCH] (second attempt) Disable the tests on embedded windows that
 fail due to

Bug #53947 InnoDB: Assertion failure in thread 4224 in file
.\sync\sync0sync.c line 324

This changeset should be reverted once the bug is fixed.
---
 mysql-test/suite/innodb/t/innodb.test                       | 6 ++++++
 mysql-test/suite/sys_vars/t/identity_func.test              | 6 ++++++
 .../suite/sys_vars/t/innodb_autoinc_lock_mode_func.test     | 6 ++++++
 mysql-test/suite/sys_vars/t/last_insert_id_func.test        | 6 ++++++
 mysql-test/suite/sys_vars/t/storage_engine_basic.test       | 6 ++++++
 mysql-test/suite/sys_vars/t/tx_isolation_func.test          | 6 ++++++
 mysql-test/t/bug46760.test                                  | 6 ++++++
 mysql-test/t/innodb_autoinc_lock_mode_zero.test             | 6 ++++++
 mysql-test/t/innodb_bug30919.test                           | 6 ++++++
 mysql-test/t/lock_tables_lost_commit.test                   | 6 ++++++
 10 files changed, 60 insertions(+)

diff --git a/mysql-test/suite/innodb/t/innodb.test b/mysql-test/suite/innodb/t/innodb.test
index f15d9747ee4..a283cd26ccb 100644
--- a/mysql-test/suite/innodb/t/innodb.test
+++ b/mysql-test/suite/innodb/t/innodb.test
@@ -1,3 +1,9 @@
+--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
+
 #######################################################################
 #                                                                     #
 # Please, DO NOT TOUCH this file as well as the innodb.result file.   #
diff --git a/mysql-test/suite/sys_vars/t/identity_func.test b/mysql-test/suite/sys_vars/t/identity_func.test
index ff93607a2cd..6f7b6bac18e 100644
--- a/mysql-test/suite/sys_vars/t/identity_func.test
+++ b/mysql-test/suite/sys_vars/t/identity_func.test
@@ -1,3 +1,9 @@
+--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
+
 #################### mysql-test\t\identity_func.test ##########################
 #                                                                             #
 # Variable Name: identity                                                     #
diff --git a/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test b/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test
index 89c1c80a6dc..082507efd07 100644
--- a/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test
+++ b/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test
@@ -1,3 +1,9 @@
+--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
+
 ################# mysql-test\t\innodb_autoinc_lock_mode_func.test  ############
 #                                                                             #
 # Variable Name: innodb_autoinc_lock_mode                                     #
diff --git a/mysql-test/suite/sys_vars/t/last_insert_id_func.test b/mysql-test/suite/sys_vars/t/last_insert_id_func.test
index 2309c539bd9..bb3adbc1c64 100644
--- a/mysql-test/suite/sys_vars/t/last_insert_id_func.test
+++ b/mysql-test/suite/sys_vars/t/last_insert_id_func.test
@@ -1,3 +1,9 @@
+--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
+
 ################# mysql-test\t\last_insert_id_func.test #######################
 #                                                                             #
 # Variable Name: last_insert_id                                               #
diff --git a/mysql-test/suite/sys_vars/t/storage_engine_basic.test b/mysql-test/suite/sys_vars/t/storage_engine_basic.test
index e62390cb384..7ec071e6414 100644
--- a/mysql-test/suite/sys_vars/t/storage_engine_basic.test
+++ b/mysql-test/suite/sys_vars/t/storage_engine_basic.test
@@ -1,3 +1,9 @@
+--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
+
 ############## mysql-test\t\storage_engine_basic.test ##################
 #                                                                      #
 #                                                                      # 
diff --git a/mysql-test/suite/sys_vars/t/tx_isolation_func.test b/mysql-test/suite/sys_vars/t/tx_isolation_func.test
index 7072de6b086..3a78d46e527 100644
--- a/mysql-test/suite/sys_vars/t/tx_isolation_func.test
+++ b/mysql-test/suite/sys_vars/t/tx_isolation_func.test
@@ -1,3 +1,9 @@
+--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
+
 ############# mysql-test\t\tx_isolation_func.test #######################################
 #                                                                                       #
 # Variable Name: tx_isolation                                                           #
diff --git a/mysql-test/t/bug46760.test b/mysql-test/t/bug46760.test
index f55edbbfa42..32b0dd3c715 100644
--- a/mysql-test/t/bug46760.test
+++ b/mysql-test/t/bug46760.test
@@ -1,3 +1,9 @@
+--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 #
diff --git a/mysql-test/t/innodb_autoinc_lock_mode_zero.test b/mysql-test/t/innodb_autoinc_lock_mode_zero.test
index 96f748673c0..2a9c69b9876 100644
--- a/mysql-test/t/innodb_autoinc_lock_mode_zero.test
+++ b/mysql-test/t/innodb_autoinc_lock_mode_zero.test
@@ -1,3 +1,9 @@
+--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
 
diff --git a/mysql-test/t/innodb_bug30919.test b/mysql-test/t/innodb_bug30919.test
index 56b2c7bc03d..2b09a76b1df 100644
--- a/mysql-test/t/innodb_bug30919.test
+++ b/mysql-test/t/innodb_bug30919.test
@@ -1,3 +1,9 @@
+--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
diff --git a/mysql-test/t/lock_tables_lost_commit.test b/mysql-test/t/lock_tables_lost_commit.test
index 754c8f3c378..f7ce6df87cf 100644
--- a/mysql-test/t/lock_tables_lost_commit.test
+++ b/mysql-test/t/lock_tables_lost_commit.test
@@ -1,3 +1,9 @@
+--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
-- 
2.30.9