From 9741017b1fdee99e1334fdd52ddbefbcb5feb10f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= Date: Sun, 5 Mar 2017 15:17:23 +0200 Subject: [PATCH] Disable 2 tokudb tests dir_per_db_rename_to_nenexisting_schema: mysqltest fails with no output percona_kill_idle_trx_tokudb: MariaDB doesn't support kill_idle_trx var for all SE. --- .../tokudb/t/dir_per_db_rename_to_nonexisting_schema.test | 3 ++- .../mysql-test/tokudb/t/percona_kill_idle_trx_tokudb.test | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/storage/tokudb/mysql-test/tokudb/t/dir_per_db_rename_to_nonexisting_schema.test b/storage/tokudb/mysql-test/tokudb/t/dir_per_db_rename_to_nonexisting_schema.test index 634c1442f25..0974534f360 100644 --- a/storage/tokudb/mysql-test/tokudb/t/dir_per_db_rename_to_nonexisting_schema.test +++ b/storage/tokudb/mysql-test/tokudb/t/dir_per_db_rename_to_nonexisting_schema.test @@ -1,4 +1,5 @@ --source include/have_tokudb.inc +--skip MariaDB mysqltest fails for this test providing no output. SET GLOBAL tokudb_dir_per_db=true; --let DATADIR=`SELECT @@datadir` @@ -59,7 +60,7 @@ DROP DATABASE new_db; --echo ### CREATE TABLE t1 (id INT AUTO_INCREMENT PRIMARY KEY NOT NULL) ENGINE=tokudb; CALL mtr.add_suppression("because destination db does not exist"); ---error ER_ERROR_ON_RENAME +--error 192 ALTER TABLE test.t1 RENAME foo.t1; DROP TABLE t1; diff --git a/storage/tokudb/mysql-test/tokudb/t/percona_kill_idle_trx_tokudb.test b/storage/tokudb/mysql-test/tokudb/t/percona_kill_idle_trx_tokudb.test index 22b4a538681..743fb9a55a7 100644 --- a/storage/tokudb/mysql-test/tokudb/t/percona_kill_idle_trx_tokudb.test +++ b/storage/tokudb/mysql-test/tokudb/t/percona_kill_idle_trx_tokudb.test @@ -1,4 +1,5 @@ --source include/have_tokudb.inc +--skip MariaDB doesn't support kill_idle_trx variable for all SE SET default_storage_engine=TokuDB; --source include/percona_kill_idle_trx.inc