diff options
| author | unknown <jmiller@mysql.com> | 2006-02-13 17:07:14 +0100 |
|---|---|---|
| committer | unknown <jmiller@mysql.com> | 2006-02-13 17:07:14 +0100 |
| commit | 6b82778d8c36499ffed74337046d14951108fa79 (patch) | |
| tree | 3ab39237ce85084f0292ed77bba1f2a66bf80d61 /mysql-test/extra | |
| parent | 5e11016e878128a5ebd5b00a4ad08e95738e5a57 (diff) | |
| parent | 43dab66aafaffdf34a367e63e8814fc758daa566 (diff) | |
| download | mariadb-git-6b82778d8c36499ffed74337046d14951108fa79.tar.gz | |
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
mysql-test/t/disabled.def:
manual merge
Diffstat (limited to 'mysql-test/extra')
| -rw-r--r-- | mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test | 2 |
1 files changed, 1 insertions, 1 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 a9612b831f1..0de20ed8be8 100644 --- a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test +++ b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test @@ -197,7 +197,7 @@ connection con3; delete from t1; delete from t2; --disable_warnings -alter table t2 type=MyISAM; +alter table t2 engine=MyISAM; --enable_warnings insert into t1 values (1); begin; |