diff options
author | Sergei Golubchik <sergii@pisem.net> | 2012-03-01 17:04:57 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2012-03-01 17:04:57 +0100 |
commit | 29b0b0b5de46c6950b8b53314c74f6f458ba1a98 (patch) | |
tree | d096cfb9abb31601e06395efd1d095d644254063 /mysql-test/suite | |
parent | 6eccf8b828bfdbed620a37d0da4b09943dfafb45 (diff) | |
download | mariadb-git-29b0b0b5de46c6950b8b53314c74f6f458ba1a98.tar.gz |
misc test/result fixes
mysql-test/include/have_xtradb.combinations:
xtradb tests need this I_S table
mysql-test/lib/mtr_cases.pm:
fix for .deb and .rpm installations
Diffstat (limited to 'mysql-test/suite')
-rw-r--r-- | mysql-test/suite/percona/percona_flush_contiguous_neighbors.test | 2 | ||||
-rw-r--r-- | mysql-test/suite/percona/percona_sync_flush.test | 2 | ||||
-rw-r--r-- | mysql-test/suite/rpl/t/rpl_udf.test | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/mysql-test/suite/percona/percona_flush_contiguous_neighbors.test b/mysql-test/suite/percona/percona_flush_contiguous_neighbors.test index 4eb967fcd16..728081fc493 100644 --- a/mysql-test/suite/percona/percona_flush_contiguous_neighbors.test +++ b/mysql-test/suite/percona/percona_flush_contiguous_neighbors.test @@ -2,7 +2,7 @@ # The test is very crude: we simply overflow the buffer pool with such a number of # new/modified pages that some flushing is bound to happen. ---source include/have_innodb.inc +--source include/have_xtradb.inc --source include/big_test.inc --disable_warnings diff --git a/mysql-test/suite/percona/percona_sync_flush.test b/mysql-test/suite/percona/percona_sync_flush.test index 35e8d8f92d2..4252bf03e7f 100644 --- a/mysql-test/suite/percona/percona_sync_flush.test +++ b/mysql-test/suite/percona/percona_sync_flush.test @@ -1,6 +1,6 @@ # Test for InnoDB sync state flushing. ---source include/have_innodb.inc +--source include/have_xtradb.inc --source include/have_debug.inc --disable_warnings diff --git a/mysql-test/suite/rpl/t/rpl_udf.test b/mysql-test/suite/rpl/t/rpl_udf.test index 8643654f2a1..cc9c49a5dfe 100644 --- a/mysql-test/suite/rpl/t/rpl_udf.test +++ b/mysql-test/suite/rpl/t/rpl_udf.test @@ -5,8 +5,6 @@ # statement based format. This tests work completed in WL#3629. # ################################################################### ---source include/master-slave.inc - disable_query_log; call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); enable_query_log; |