bk commit into 5.0 tree (aelkin:1.2497) BUG#27417

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.0 repository of elkin. When elkin does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-08-22 10:40:38+03:00, aelkin@stripped +2 -0
  bug#27417
  
  refining of cleanup of the tests.

  mysql-test/r/mix_innodb_myisam_binlog.result@stripped, 2007-08-22 10:40:35+03:00, aelkin@stripped +1 -1
    results changed.

  mysql-test/t/mix_innodb_myisam_binlog.test@stripped, 2007-08-22 10:40:35+03:00, aelkin@stripped +1 -1
    proper cleanup.

diff -Nrup a/mysql-test/r/mix_innodb_myisam_binlog.result b/mysql-test/r/mix_innodb_myisam_binlog.result
--- a/mysql-test/r/mix_innodb_myisam_binlog.result	2007-08-21 15:16:51 +03:00
+++ b/mysql-test/r/mix_innodb_myisam_binlog.result	2007-08-22 10:40:35 +03:00
@@ -459,6 +459,6 @@ show master status /* the offset must de
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
 master-bin.000001	376		
 drop trigger trg_del;
-drop table t1,t2,t3;
+drop table t1,t2,t3,t4;
 drop function bug27417;
 end of tests
diff -Nrup a/mysql-test/t/mix_innodb_myisam_binlog.test b/mysql-test/t/mix_innodb_myisam_binlog.test
--- a/mysql-test/t/mix_innodb_myisam_binlog.test	2007-08-21 15:16:51 +03:00
+++ b/mysql-test/t/mix_innodb_myisam_binlog.test	2007-08-22 10:40:35 +03:00
@@ -497,7 +497,7 @@ CREATE TABLE t3 (a int, PRIMARY KEY (a),
 
 
 drop trigger trg_del;
-drop table t1,t2,t3;
+drop table t1,t2,t3,t4;
 drop function bug27417;