diff options
author | unknown <jimw@rama.(none)> | 2007-06-07 15:21:52 -0700 |
---|---|---|
committer | unknown <jimw@rama.(none)> | 2007-06-07 15:21:52 -0700 |
commit | d7579018523ab8214fd6f544d8f167c13f2c757f (patch) | |
tree | c87ed6b29f88299e93a33cb0a25c08900bc69ad4 /mysql-test/t/innodb.test | |
parent | 0f6047e455b82e0246317be5ec49ffc4fccceb42 (diff) | |
parent | e92dcb38f1331000ba47488088e869f7b8b688b2 (diff) | |
download | mariadb-git-d7579018523ab8214fd6f544d8f167c13f2c757f.tar.gz |
Merge bk-internal:/home/bk/mysql-5.1-new-maint
into rama.(none):/home/jimw/my/mysql-5.1-clean
mysql-test/extra/binlog_tests/insert_select-binlog.test:
Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/sp_trans.test:
Auto merged
Diffstat (limited to 'mysql-test/t/innodb.test')
-rw-r--r-- | mysql-test/t/innodb.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test index 7af9cf09f79..92714492dcf 100644 --- a/mysql-test/t/innodb.test +++ b/mysql-test/t/innodb.test @@ -13,6 +13,7 @@ -- source include/not_embedded.inc -- source include/have_innodb.inc +-- source include/have_log_bin.inc # # Small basic test with ignore |