Fix tokudb test failures post merge

cvicentiu · cvicentiu · commit 3670d167a626 · 2017-05-17T16:19:22.000+03:00
diff --git a/storage/tokudb/mysql-test/tokudb/t/background_job_manager.opt b/storage/tokudb/mysql-test/tokudb/t/background_job_manager.opt
diff --git a/storage/tokudb/mysql-test/tokudb/t/background_job_manager.test b/storage/tokudb/mysql-test/tokudb/t/background_job_manager.test
@@ -1,3 +1,4 @@
+skip Background Job Manager not supported in MariaDB;
 # This is a comprehensive test for the background job manager and
 # the information_schema.tokudb_background_job_status table
 #
diff --git a/storage/tokudb/mysql-test/tokudb/t/bug-1657908.test b/storage/tokudb/mysql-test/tokudb/t/bug-1657908.test
@@ -1,3 +1,4 @@
+--source include/have_partition.inc
 # See https://bugs.launchpad.net/percona-server/+bug/1657908
 
 source include/have_tokudb.inc;
diff --git a/storage/tokudb/mysql-test/tokudb/t/card_auto_analyze_lots.test b/storage/tokudb/mysql-test/tokudb/t/card_auto_analyze_lots.test
@@ -1,3 +1,4 @@
+skip Background Job Manager not supported in MariaDB;
 # Test the auto analyze on lots of tables
 -- source include/have_tokudb.inc
 
diff --git a/storage/tokudb/mysql-test/tokudb/t/dir_cmd.test b/storage/tokudb/mysql-test/tokudb/t/dir_cmd.test
@@ -1,3 +1,4 @@
+skip TokuDB dir CMD disabled in MariaDB;
 source include/have_tokudb.inc;
 
 --let $MYSQL_DATADIR=`select @@datadir`
diff --git a/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_timeout.test b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_timeout.test
@@ -1,3 +1,4 @@
+skip Tokudb Lock Waits not in I_S in MariaDB;
 # verify that tokudb_locks and tokudb_lock_waits contents for 2 conflicting transactions with a lock timeout
 
 source include/have_tokudb.inc;
diff --git a/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_locks.test b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_locks.test
@@ -1,3 +1,4 @@
+skip Tokudb Lock Waits not in I_S in MariaDB;
 # verify that information_schema.tokudb_locks gets populated with locks for 2 clients
 
 source include/have_tokudb.inc;
diff --git a/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_trx.test b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_trx.test
@@ -1,3 +1,4 @@
+skip Tokudb trx not in I_S in MariaDB;
 # verify that information_schema.tokudb_trx gets populated with transactions
 
 source include/have_tokudb.inc;
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/db397_delete_trigger.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db397_delete_trigger.test
@@ -1,3 +1,4 @@
+skip Tokudb Lock Waits not in I_S in MariaDB;
 # check for any locking weirdness on DELETE triggers
 source include/have_tokudb.inc;
 set default_storage_engine='tokudb';
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/db397_insert_trigger.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db397_insert_trigger.test
@@ -1,3 +1,4 @@
+skip Tokudb Lock Waits not in I_S in MariaDB;
 # check for any locking weirdness on INSERT triggers
 source include/have_tokudb.inc;
 set default_storage_engine='tokudb';
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/db397_update_trigger.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db397_update_trigger.test
@@ -1,3 +1,4 @@
+skip Tokudb Lock Waits not in I_S in MariaDB;
 # check for any locking weirdness on UPDATE triggers
 source include/have_tokudb.inc;
 set default_storage_engine='tokudb';
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/db938.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db938.test
@@ -1,3 +1,4 @@
+skip Background Job Manager not supported in MariaDB;
 # This test for DB-938 tests a race condition where a scheduled background job
 # (analyze) ends up operating on a set of DB* key_file[] in TOKUDB_SHARE that
 # were set to NULL during a TRUNCATE TABLE operation.
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/db945.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db945.test
@@ -1,3 +1,4 @@
+skip Background Job Manager not supported in MariaDB;
 source include/have_tokudb.inc;
 set default_storage_engine='tokudb';
 disable_warnings;
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/tokudb718.test b/storage/tokudb/mysql-test/tokudb_bugs/t/tokudb718.test
@@ -1,3 +1,4 @@
+skip Tokudb Fractal Tree info not in I_S in MariaDB;
 # test DB-718, a crash caused by broken error handling in tokudb's fractal_tree_info information schema
 source include/have_tokudb.inc;
 set default_storage_engine='tokudb';

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+skip Background Job Manager not supported in MariaDB;`
`1`	`2`	`# This is a comprehensive test for the background job manager and`
`2`	`3`	`# the information_schema.tokudb_background_job_status table`
`3`	`4`	`#`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+--source include/have_partition.inc`
`1`	`2`	`# See https://bugs.launchpad.net/percona-server/+bug/1657908`
`2`	`3`
`3`	`4`	`source include/have_tokudb.inc;`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+skip Background Job Manager not supported in MariaDB;`
`1`	`2`	`# Test the auto analyze on lots of tables`
`2`	`3`	`-- source include/have_tokudb.inc`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+skip TokuDB dir CMD disabled in MariaDB;`
`1`	`2`	`source include/have_tokudb.inc;`
`2`	`3`
`3`	`4`	--let $MYSQL_DATADIR=`select @@datadir`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+skip Tokudb Lock Waits not in I_S in MariaDB;`
`1`	`2`	`# verify that tokudb_locks and tokudb_lock_waits contents for 2 conflicting transactions with a lock timeout`
`2`	`3`
`3`	`4`	`source include/have_tokudb.inc;`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+skip Tokudb Lock Waits not in I_S in MariaDB;`
`1`	`2`	`# verify that information_schema.tokudb_locks gets populated with locks for 2 clients`
`2`	`3`
`3`	`4`	`source include/have_tokudb.inc;`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+skip Tokudb trx not in I_S in MariaDB;`
`1`	`2`	`# verify that information_schema.tokudb_trx gets populated with transactions`
`2`	`3`
`3`	`4`	`source include/have_tokudb.inc;`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+skip Tokudb Lock Waits not in I_S in MariaDB;`
`1`	`2`	`# check for any locking weirdness on DELETE triggers`
`2`	`3`	`source include/have_tokudb.inc;`
`3`	`4`	`set default_storage_engine='tokudb';`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+skip Tokudb Lock Waits not in I_S in MariaDB;`
`1`	`2`	`# check for any locking weirdness on INSERT triggers`
`2`	`3`	`source include/have_tokudb.inc;`
`3`	`4`	`set default_storage_engine='tokudb';`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+skip Tokudb Lock Waits not in I_S in MariaDB;`
`1`	`2`	`# check for any locking weirdness on UPDATE triggers`
`2`	`3`	`source include/have_tokudb.inc;`
`3`	`4`	`set default_storage_engine='tokudb';`