4 files changed, 39 insertions, 4 deletions
diff --git a/mysql-test/t/check.test b/mysql-test/t/check.test
index eb72d75da3c..363f9d419d6 100644
--- a/mysql-test/t/check.test
+++ b/mysql-test/t/check.test
@@ -37,3 +37,12 @@ Create view v1 as Select * from t1;
 Check Table v1,t2;
 drop view v1;
 drop table t1, t2;
+
+#
+# BUG#26325 - TEMPORARY TABLE "corrupt" after first read, according to CHECK
+#             TABLE
+#
+CREATE TEMPORARY TABLE t1(a INT);
+CHECK TABLE t1;
+REPAIR TABLE t1;
+DROP TABLE t1;
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 07c5b4d56a3..f04809b668d 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -25,4 +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()
-lowercase_table3     : Bug#29839 2007-07-17 ingo Cannot find table test/T1 from the internal data dictionary
+federated_transactions   : Bug#29523 Transactions do not work
diff --git a/mysql-test/t/federated.test b/mysql-test/t/federated.test
index fa65568e9cc..d54934a2e73 100644
--- a/mysql-test/t/federated.test
+++ b/mysql-test/t/federated.test
@@ -1683,4 +1683,30 @@ connection slave;
 drop table federated.t1;
 
 
+#
+# BUG#29875 Disable support for transactions
+#
+connection slave;
+CREATE TABLE federated.t1 (a INT PRIMARY KEY) DEFAULT CHARSET=utf8;
+connection master;
+--replace_result $SLAVE_MYPORT SLAVE_PORT
+eval CREATE TABLE federated.t1 (a INT PRIMARY KEY)
+  ENGINE=FEDERATED
+  CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1'
+  DEFAULT CHARSET=utf8;
+
+SELECT transactions FROM information_schema.engines WHERE engine="FEDERATED";
+INSERT INTO federated.t1 VALUES (1);
+SET autocommit=0;
+INSERT INTO federated.t1 VALUES (2);
+ROLLBACK;
+SET autocommit=1;
+SELECT * FROM federated.t1;
+
+DROP TABLE federated.t1;
+connection slave;
+DROP TABLE federated.t1;
+
+--echo End of 5.1 tests
+
 source include/federated_cleanup.inc;
diff --git a/mysql-test/t/lowercase_table3.test b/mysql-test/t/lowercase_table3.test
index 75f6e5188c5..51385b4b178 100644
--- a/mysql-test/t/lowercase_table3.test
+++ b/mysql-test/t/lowercase_table3.test
@@ -27,9 +27,9 @@ flush tables;
 # storing things in lower case.
 #
 
-CREATE TABLE t1 (a int) ENGINE=INNODB;
+CREATE TABLE bug29839 (a int) ENGINE=INNODB;
 --error 1146
-SELECT * from T1;
-drop table t1;
+SELECT * from BUG29839;
+drop table bug29839;
 
 # End of 4.1 tests