diff options
| author | unknown <df@pippilotta.erinye.com> | 2007-05-31 10:00:49 +0200 |
|---|---|---|
| committer | unknown <df@pippilotta.erinye.com> | 2007-05-31 10:00:49 +0200 |
| commit | 0f7300fd79de856976ca80300ab0eb6de90967a5 (patch) | |
| tree | ce59edae754b62827440b33540b9eb66192d34b6 /mysql-test/t/sp_trans.test | |
| parent | 556a67cccc92bff6496e56d7b4ba2d6fc74f1365 (diff) | |
| parent | c063a677ac7207ed1139059330a98cbd3917e7b4 (diff) | |
| download | mariadb-git-0f7300fd79de856976ca80300ab0eb6de90967a5.tar.gz | |
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-nn
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-nn
mysql-test/t/mysqlbinlog.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/sp_trans.test:
Auto merged
mysql-test/t/user_var-binlog.test:
Auto merged
BitKeeper/deleted/.del-ctype_cp932_notembedded.test~3047e508460cef42:
Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
Auto merged
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
Auto merged
mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
Auto merged
mysql-test/extra/binlog_tests/drop_temp_table.test:
Auto merged
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/extra/binlog_tests/binlog.test:
needs no change in 5.1 as it is in a separate folder
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
needs regeneration
mysql-test/t/mysqlbinlog-cp932.test:
needs no change because already has dependency on binlog format
mysql-test/t/mysqlbinlog2.test:
needs no change because already has dependency on binlog format
Diffstat (limited to 'mysql-test/t/sp_trans.test')
| -rw-r--r-- | mysql-test/t/sp_trans.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/sp_trans.test b/mysql-test/t/sp_trans.test index a79f6c7e7e0..bd5e6e33cf7 100644 --- a/mysql-test/t/sp_trans.test +++ b/mysql-test/t/sp_trans.test @@ -2,6 +2,7 @@ # tests that require InnoDB... # +-- source include/have_log_bin.inc -- source include/have_innodb.inc --disable_warnings |