From ba177535f5ce38974514ec1eea8bbe4b4bbc5017 Mon Sep 17 00:00:00 2001
From: "istruewing@chilla.local" <>
Date: Tue, 17 Jul 2007 09:25:01 +0200
Subject: [PATCH] Post-merge fixes Disabled test cases that produce errors in a
 "server log".

---
 mysql-test/suite/binlog/t/disabled.def | 14 ++++++++++++++
 mysql-test/t/disabled.def              |  1 -
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 mysql-test/suite/binlog/t/disabled.def

diff --git a/mysql-test/suite/binlog/t/disabled.def b/mysql-test/suite/binlog/t/disabled.def
new file mode 100644
index 00000000000..76eeb5b00ef
--- /dev/null
+++ b/mysql-test/suite/binlog/t/disabled.def
@@ -0,0 +1,14 @@
+##############################################################################
+#
+#  List the test cases that are to be disabled temporarily.
+#
+#  Separate the test case name and the comment with ':'.
+#
+#    <testcasename> : BUG#<xxxx> <date disabled> <disabler> <comment>
+#
+#  Do not use any TAB characters for whitespace.
+#
+##############################################################################
+
+binlog_innodb        : Bug#29806 2007-07-15 ingo master.err: InnoDB: Error: MySQL is freeing a thd
+binlog_killed        : Bug#29806 2007-07-17 ingo master.err: InnoDB: Error: MySQL is freeing a thd
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index b994561116d..d253b4b51e2 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -25,5 +25,4 @@ ctype_big5               : BUG#26711 2007-06-21 Lars Test has never worked on Do
 
 mysql_upgrade        : Bug#28560 test links to /usr/local/mysql/lib libraries, causes non-determinism and failures on ABI breakage
 federated_innodb     : Bug#29522 failed assertion in binlog_close_connection()
-binlog_innodb        : Bug#29806 2007-07-15 ingo master.err: InnoDB: Error: MySQL is freeing a thd
 innodb_mysql         : Bug#29807 2007-07-15 ingo master.err: Cannot find table test/t2 from the internal data dictionary
-- 
2.30.9