fixed test suite failures in 5.1-bugteam

4 files changed, 9 insertions, 0 deletions

diff --git a/mysql-test/r/trigger-trans.result b/mysql-test/r/trigger-trans.result
index 29df8cbe06d..2c4e355af9d 100644
--- a/mysql-test/r/trigger-trans.result
+++ b/mysql-test/r/trigger-trans.result
@@ -188,3 +188,5 @@ b	val
 12	e
 13	f
 14	g
+drop trigger t1_after_insert;
+drop table t1,t2;
diff --git a/mysql-test/suite/rpl/r/rpl_temporary.result b/mysql-test/suite/rpl/r/rpl_temporary.result
index 03d2ca660dc..d8fea78ecb4 100644
--- a/mysql-test/suite/rpl/r/rpl_temporary.result
+++ b/mysql-test/suite/rpl/r/rpl_temporary.result
@@ -24,6 +24,9 @@ drop table if exists t1,t2;
 create table t1(f int);
 create table t2(f int);
 insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+10
 create temporary table t3(f int);
 insert into t3 select * from t1 where f<6;
 create temporary table t3(f int);
diff --git a/mysql-test/suite/rpl/t/rpl_temporary.test b/mysql-test/suite/rpl/t/rpl_temporary.test
index 51b38ed4837..a40d1cbb5c5 100644
--- a/mysql-test/suite/rpl/t/rpl_temporary.test
+++ b/mysql-test/suite/rpl/t/rpl_temporary.test
@@ -56,6 +56,8 @@ drop table if exists t1,t2;
 create table t1(f int);
 create table t2(f int);
 insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
+# Auxiliary select (We want that all rows are in the table)
+SELECT COUNT(*) FROM t1;
 
 connection con1;
 create temporary table t3(f int);
diff --git a/mysql-test/t/trigger-trans.test b/mysql-test/t/trigger-trans.test
index ae223b2666e..4d6e82dedcb 100644
--- a/mysql-test/t/trigger-trans.test
+++ b/mysql-test/t/trigger-trans.test
@@ -175,3 +175,5 @@ insert into t1 values ( 123, 'a'), ( 123, 'b'), ( 123, 'c'),
 insert into t1 values ( 654, 'a'), ( 654, 'b'), ( 654, 'c'),
  (654, 'd'), (654, 'e'), (654, 'f'), (654, 'g');
 select * from t2 order by b;
+drop trigger t1_after_insert;
+drop table t1,t2;