diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-18 13:07:31 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-18 13:07:31 +0200 |
| commit | 4ec2e9d7eda78d409d1b017ef4d8928fe9055438 (patch) | |
| tree | 6c3a74a740d3c1c5f3a7d1f8154d8a791b435b3f /mysql-test/suite/engines | |
| parent | 1a2a9d74fe1256554eceb09bbc6752a6376df87d (diff) | |
| parent | 197bdbae4db78ba65f3668803bebd3c4a4509ae5 (diff) | |
| download | mariadb-git-4ec2e9d7eda78d409d1b017ef4d8928fe9055438.tar.gz | |
5.5 merge and fixes for compiler/test errors
Diffstat (limited to 'mysql-test/suite/engines')
| -rw-r--r-- | mysql-test/suite/engines/rr_trx/include/check_repeatable_read_all_columns.inc | 2 | ||||
| -rw-r--r-- | mysql-test/suite/engines/rr_trx/include/rr_init.test | 8 |
2 files changed, 0 insertions, 10 deletions
diff --git a/mysql-test/suite/engines/rr_trx/include/check_repeatable_read_all_columns.inc b/mysql-test/suite/engines/rr_trx/include/check_repeatable_read_all_columns.inc index 95bbc35de72..e8e21a6be7b 100644 --- a/mysql-test/suite/engines/rr_trx/include/check_repeatable_read_all_columns.inc +++ b/mysql-test/suite/engines/rr_trx/include/check_repeatable_read_all_columns.inc @@ -104,8 +104,6 @@ if (`SELECT IF($query_count > 1, 1, 0)`) # Detect extra rows: # Allow phantoms in some configurations: # - InnoDB default settings - # - Falcon's falcon_consistent_read=0 (non-default setting) - # (TODO: What about PBXT?) # ########################### # TODO: Execute a query against tmp1 and tmp2 which selects new rows (rows diff --git a/mysql-test/suite/engines/rr_trx/include/rr_init.test b/mysql-test/suite/engines/rr_trx/include/rr_init.test index b98905791b0..05769bf70eb 100644 --- a/mysql-test/suite/engines/rr_trx/include/rr_init.test +++ b/mysql-test/suite/engines/rr_trx/include/rr_init.test @@ -13,14 +13,6 @@ if (`SELECT @@storage_engine LIKE 'InnoDB' AND @@version LIKE '%6.%'`) --enable_query_log } -if (`SELECT @@storage_engine LIKE 'PBXT' AND @@version LIKE '%5.1%'`) -{ - --disable_query_log - SET SESSION binlog_format = 'MIXED'; - SET GLOBAL binlog_format = 'MIXED'; - --enable_query_log -} - # Verify default storage engine. SHOW VARIABLES LIKE 'storage_engine'; |