bzr commit into mysql-5.1 branch (kgeorge:2770)

[Georgi Kodinov]

#At file:///home/kgeorge/mysql/bzr/merge-5.1-bugteam/

 2770 Georgi Kodinov	2008-10-07
      fixed test suite failures in 5.1-bugteam
modified:
  mysql-test/r/trigger-trans.result
  mysql-test/suite/rpl/r/rpl_temporary.result
  mysql-test/suite/rpl/t/rpl_temporary.test
  mysql-test/t/trigger-trans.test

=== modified file 'mysql-test/r/trigger-trans.result'
--- a/mysql-test/r/trigger-trans.result	2008-10-06 14:06:59 +0000
+++ b/mysql-test/r/trigger-trans.result	2008-10-07 16:54:12 +0000
@@ -188,3 +188,5 @@ b	val
 12	e
 13	f
 14	g
+drop trigger t1_after_insert;
+drop table t1,t2;

=== modified file 'mysql-test/suite/rpl/r/rpl_temporary.result'
--- a/mysql-test/suite/rpl/r/rpl_temporary.result	2008-07-18 08:20:55 +0000
+++ b/mysql-test/suite/rpl/r/rpl_temporary.result	2008-10-07 16:54:12 +0000
@@ -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);

=== modified file 'mysql-test/suite/rpl/t/rpl_temporary.test'
--- a/mysql-test/suite/rpl/t/rpl_temporary.test	2008-07-18 08:20:55 +0000
+++ b/mysql-test/suite/rpl/t/rpl_temporary.test	2008-10-07 16:54:12 +0000
@@ -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);

=== modified file 'mysql-test/t/trigger-trans.test'
--- a/mysql-test/t/trigger-trans.test	2008-10-06 14:06:59 +0000
+++ b/mysql-test/t/trigger-trans.test	2008-10-07 16:54:12 +0000
@@ -175,3 +175,5 @@ insert into t1 values ( 123, 'a'), ( 123
 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;