diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
| commit | b4a0b2c2f862ab0de853dc34e1e56f6159043e45 (patch) | |
| tree | 18a0c25fdc9ac0076da19247666414a46434b85e /mysql-test/suite/binlog/t | |
| parent | 9809f05199aeb0b67991fac41bd86f38730768dc (diff) | |
| download | mariadb-git-b4a0b2c2f862ab0de853dc34e1e56f6159043e45.tar.gz | |
post-merge fixes.
most tests pass.
5.3 merge is next
Diffstat (limited to 'mysql-test/suite/binlog/t')
| -rw-r--r-- | mysql-test/suite/binlog/t/binlog_database.test | 3 | ||||
| -rw-r--r-- | mysql-test/suite/binlog/t/binlog_spurious_ddl_errors-master.opt | 2 | ||||
| -rw-r--r-- | mysql-test/suite/binlog/t/binlog_unsafe-master.opt | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/mysql-test/suite/binlog/t/binlog_database.test b/mysql-test/suite/binlog/t/binlog_database.test index ee236b4e5ea..9c2a43575fc 100644 --- a/mysql-test/suite/binlog/t/binlog_database.test +++ b/mysql-test/suite/binlog/t/binlog_database.test @@ -2,6 +2,9 @@ # correctly. We test all three modes in the same file to avoid # unecessary server restarts. +--source include/have_innodb.inc +--source include/have_binlog_format_statement.inc + set binlog_format=statement; source extra/binlog_tests/database.test; set binlog_format=mixed; diff --git a/mysql-test/suite/binlog/t/binlog_spurious_ddl_errors-master.opt b/mysql-test/suite/binlog/t/binlog_spurious_ddl_errors-master.opt index ffa981152ea..627becdbfb5 100644 --- a/mysql-test/suite/binlog/t/binlog_spurious_ddl_errors-master.opt +++ b/mysql-test/suite/binlog/t/binlog_spurious_ddl_errors-master.opt @@ -1 +1 @@ ---innodb $EXAMPLE_PLUGIN_OPT +--innodb diff --git a/mysql-test/suite/binlog/t/binlog_unsafe-master.opt b/mysql-test/suite/binlog/t/binlog_unsafe-master.opt index 78bcdd89270..50fc48d277b 100644 --- a/mysql-test/suite/binlog/t/binlog_unsafe-master.opt +++ b/mysql-test/suite/binlog/t/binlog_unsafe-master.opt @@ -1 +1 @@ -$UDF_EXAMPLE_LIB_OPT --log-output=file,table +--log-output=file,table |