diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-06-27 17:22:23 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-06-27 17:22:23 +0300 |
| commit | aa67a198e8a29f2fdae84846cc1d8e74c2d47a83 (patch) | |
| tree | 47719240f2509a3fa373f54852b54d552ac6e844 /mysql-test/suite/percona | |
| parent | 9ebda8764d2e94096924c0a0181f5773d836114a (diff) | |
| parent | 072097174c8b91299fe74a3cd7c5248e6e3cfc57 (diff) | |
| download | mariadb-git-aa67a198e8a29f2fdae84846cc1d8e74c2d47a83.tar.gz | |
automatic merge with 5.5
Diffstat (limited to 'mysql-test/suite/percona')
| -rw-r--r-- | mysql-test/suite/percona/disabled.def | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/suite/percona/disabled.def b/mysql-test/suite/percona/disabled.def index eb9df7f4118..cd3fd72cc54 100644 --- a/mysql-test/suite/percona/disabled.def +++ b/mysql-test/suite/percona/disabled.def @@ -1,3 +1,5 @@ +percona_sync_flush: removed from XtraDB-26.0 + percona_suppress_log_warning_1592: Feature not merged into MariaDB percona_log_slow_slave_statements: Feature not merged into MariaDB percona_log_slow_slave_statements-and-use_global_long_query_time: Feature not merged into MariaDB |