From d27387d3f1048af0ed7a6b8d57a3b3d6a7f10744 Mon Sep 17 00:00:00 2001
From: Vasil Dimov <vasil.dimov@oracle.com>
Date: Mon, 19 Apr 2010 14:07:35 +0300
Subject: Re-enable tests that have been fixed and update the innodb test to
 the latest behavior after it has been disabled for a long time.

---
 mysql-test/suite/innodb/t/disabled.def | 1 -
 1 file changed, 1 deletion(-)

(limited to 'mysql-test/suite/innodb/t/disabled.def')

diff --git a/mysql-test/suite/innodb/t/disabled.def b/mysql-test/suite/innodb/t/disabled.def
index 6535ee27887..e69de29bb2d 100644
--- a/mysql-test/suite/innodb/t/disabled.def
+++ b/mysql-test/suite/innodb/t/disabled.def
@@ -1 +0,0 @@
-innodb-index                  : Bug#49396 2009-12-03 test fails in embedded mode
-- 
cgit v1.2.1


From b7ee1e64473edaba0c27ce1aa20ab5d5ca6fd068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@oracle.com>
Date: Wed, 5 May 2010 14:03:14 +0300
Subject: Merge from mysql-5.1-innodb:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  ------------------------------------------------------------
  revno: 3449
  revision-id: marko.makela@oracle.com-20100505104425-39y6qbffgotrhck2
  parent: marko.makela@oracle.com-20100505104001-883pqiepo384qr5h
  committer: Marko Mäkelä <marko.makela@oracle.com>
  branch nick: 5.1-innodb
  timestamp: Wed 2010-05-05 13:44:25 +0300
  message:
    Factor out innodb_multi_update.test from innodb.test
---
 mysql-test/suite/innodb/t/disabled.def | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'mysql-test/suite/innodb/t/disabled.def')

diff --git a/mysql-test/suite/innodb/t/disabled.def b/mysql-test/suite/innodb/t/disabled.def
index e69de29bb2d..da04138fd0a 100644
--- a/mysql-test/suite/innodb/t/disabled.def
+++ b/mysql-test/suite/innodb/t/disabled.def
@@ -0,0 +1,12 @@
+##############################################################################
+#
+#  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.
+#
+##############################################################################
+innodb_multi_update: Bug #38999 2010-05-05 mmakela Valgrind warnings
-- 
cgit v1.2.1

