summaryrefslogtreecommitdiff
path: root/mysql-test/suite/percona/disabled.def
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2010-08-04 10:39:53 +0200
committerunknown <knielsen@knielsen-hq.org>2010-08-04 10:39:53 +0200
commit3f1c763a94cd25c4810692983f6e61b528e21268 (patch)
treed8f9632933303f9bdf8cdc875613ca99f51ecbcb /mysql-test/suite/percona/disabled.def
parenta74d04671d23fa65bd610184965cc2974ec41cf9 (diff)
parent0c6afe17dceb926b5c757157308188e540caec1e (diff)
downloadmariadb-git-3f1c763a94cd25c4810692983f6e61b528e21268.tar.gz
Merge XtraDB from Percona-Server-5.1.47-11 into MariaDB.
Diffstat (limited to 'mysql-test/suite/percona/disabled.def')
-rw-r--r--mysql-test/suite/percona/disabled.def13
1 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/suite/percona/disabled.def b/mysql-test/suite/percona/disabled.def
new file mode 100644
index 00000000000..4f35807b7a1
--- /dev/null
+++ b/mysql-test/suite/percona/disabled.def
@@ -0,0 +1,13 @@
+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
+percona_slow_query_log-control_global_slow: Feature not merged into MariaDB
+percona_slow_query_log-microseconds_in_slow_query_log: Feature not merged into MariaDB
+percona_query_cache_with_comments: Feature not merged into MariaDB
+percona_query_cache_with_comments_prepared_statements: Feature not merged into MariaDB
+percona_show_temp_tables: Feature not merged into MariaDB
+percona_slow_query_log-use_global_long_query_time: Feature not merged into MariaDB
+percona_query_cache_with_comments_disable: Feature not merged into MariaDB
+
+percona_slow_query_log-log_slow_verbosity: InnoDB filtering information not fully merged into MariaDB
+