bk commit into 5.0 tree (guilhem:1.2064)

[guilhem]

Below is the list of changes that have just been committed into a local
5.0 repository of guilhem. When guilhem 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
  1.2064 06/02/18 21:08:41 guilhem@stripped +2 -0
  In previous push, a DROP TABLE at the end of test was missing.

  mysql-test/t/mix_innodb_myisam_binlog.test
    1.22 06/02/18 21:08:37 guilhem@stripped +1 -0
    cleanup in the end

  mysql-test/r/mix_innodb_myisam_binlog.result
    1.26 06/02/18 21:08:37 guilhem@stripped +1 -0
    result update

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	guilhem
# Host:	gbichot3.local
# Root:	/home/mysql_src/mysql-5.0

--- 1.25/mysql-test/r/mix_innodb_myisam_binlog.result	2006-02-18 17:19:10 +01:00
+++ 1.26/mysql-test/r/mix_innodb_myisam_binlog.result	2006-02-18 21:08:37 +01:00
@@ -279,3 +279,4 @@
 @a not like "%#%error_code=%error_code=%";
 @a like "%#%error_code=0%ROLLBACK;%ROLLBACK /* added by mysqlbinlog */;%"	@a not like "%#%error_code=%error_code=%"
 1	1
+drop table t1, t2;

--- 1.21/mysql-test/t/mix_innodb_myisam_binlog.test	2006-02-18 17:19:10 +01:00
+++ 1.22/mysql-test/t/mix_innodb_myisam_binlog.test	2006-02-18 21:08:37 +01:00
@@ -292,3 +292,4 @@
 eval select
 @a like "%#%error_code=0%ROLLBACK;%ROLLBACK /* added by mysqlbinlog */;%",
 @a not like "%#%error_code=%error_code=%";
+drop table t1, t2;