diff options
| author | unknown <guilhem@mysql.com> | 2006-02-18 21:10:44 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2006-02-18 21:10:44 +0100 |
| commit | b3621ef6ad1e6a22c7c7617cd5ebb8bad39e05ac (patch) | |
| tree | 23533006ed5763aec65a57c30003575b5478f433 /mysql-test/extra | |
| parent | 16bc37632ce546704116a1e09388a709c7b13fca (diff) | |
| parent | 34d8c572086ca203fb113e6c1d3a56e009ce43d3 (diff) | |
| download | mariadb-git-b3621ef6ad1e6a22c7c7617cd5ebb8bad39e05ac.tar.gz | |
Merge mysql.com:/home/mysql_src/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.1-new
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
Auto merged
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
Auto merged
Diffstat (limited to 'mysql-test/extra')
| -rw-r--r-- | mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test index 3329e1d53e0..99c207e31a0 100644 --- a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test +++ b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test @@ -283,3 +283,4 @@ is not null; eval select @a like "%#%error_code=0%ROLLBACK;%ROLLBACK /* added by mysqlbinlog */;%", @a not like "%#%error_code=%error_code=%"; +drop table t1, t2; |