diff options
| author | unknown <msvensson@pilot.(none)> | 2007-06-07 19:19:29 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-06-07 19:19:29 +0200 |
| commit | e8116aebdfd3bd5bf78f10eadfaea930fd350980 (patch) | |
| tree | 7d6867f26830fff26b68c431444c1aaa752a6f32 /mysql-test/t/mysqlbinlog2.test | |
| parent | 288a7fc0c9f145f1d27c0b2bd101f61c54c1d4c1 (diff) | |
| parent | 33df97dfa42ee5f7c502789565a070007401436b (diff) | |
| download | mariadb-git-e8116aebdfd3bd5bf78f10eadfaea930fd350980.tar.gz | |
Merge pilot.(none):/data/msvensson/mysql/bug28369/my50-bug28369
into pilot.(none):/data/msvensson/mysql/bug28369/my51-bug28369
mysql-test/include/master-slave.inc:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/mysqlbinlog-cp932.test:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
mysql-test/t/sp_trans.test:
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
BitKeeper/deleted/.del-sp_trans_log.test:
Delete: mysql-test/t/sp_trans_log.test
BitKeeper/deleted/.del-sp_trans_log.result:
Delete: mysql-test/r/sp_trans_log.result
BitKeeper/deleted/.del-ctype_cp932_notembedded.result~f8bc6ad0446e82e3:
SCCS merged
BitKeeper/deleted/.del-ctype_cp932_notembedded.test~3047e508460cef42:
SCCS merged
mysql-test/extra/binlog_tests/binlog.test:
Merge 5.0->5.1
mysql-test/lib/mtr_cases.pl:
Merge 5.0->5.1
mysql-test/r/sp_trans.result:
Merge 5.0->5.1
mysql-test/t/mysqlbinlog2.test:
Merge 5.0->5.1
mysql-test/t/rpl000017.test:
Merge 5.0->5.1
mysql-test/t/rpl_000015.test:
Merge 5.0->5.1
mysql-test/t/user_var-binlog.test:
Merge 5.0->5.1
Diffstat (limited to 'mysql-test/t/mysqlbinlog2.test')
| -rw-r--r-- | mysql-test/t/mysqlbinlog2.test | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/t/mysqlbinlog2.test b/mysql-test/t/mysqlbinlog2.test index ac647f772b1..9e56b7a07c7 100644 --- a/mysql-test/t/mysqlbinlog2.test +++ b/mysql-test/t/mysqlbinlog2.test @@ -4,8 +4,6 @@ # TODO: Need to look at making row based version once new binlog client is complete. -- source include/have_binlog_format_mixed_or_statement.inc -# Embedded server doesn't support binlogging --- source include/not_embedded.inc --disable_warnings drop table if exists t1; |