MDEV-17507 Make MTR tests work for builds without Aria for temporary tables

Skip tests which expectedly fail when Aria is not used for temporary tables
This commit is contained in:
Elena Stepanova 2018-11-18 17:38:48 +02:00
parent e669e705a1
commit ae96b47f9e
5 changed files with 12 additions and 0 deletions

View file

@ -0,0 +1,4 @@
if (!`SELECT @@aria_used_for_temp_tables`)
{
skip Need Aria to be used for temporary tables;
}

View file

@ -1,5 +1,6 @@
# bool readonly
--source include/have_aria_used_for_temp_tables.inc
--source include/have_maria.inc
#
# show the global and session values;

View file

@ -1,4 +1,5 @@
--source include/have_aria.inc
--source include/have_aria_used_for_temp_tables.inc
--source include/word_size.inc
--vertical_results

View file

@ -1,5 +1,7 @@
###################### tmp_memory_table_size_func.test ########################
--source include/have_aria_used_for_temp_tables.inc
--source include/load_sysvars.inc
--source include/have_sequence.inc

View file

@ -8,6 +8,10 @@
# on the presence of the log tables (which are CSV-based).
--source include/have_csv.inc
# Without aria_used_for_temp_tables some I_S tables will be MyISAM,
# while the test expects them to be Aria
-- source include/have_aria_used_for_temp_tables.inc
-- source include/have_innodb.inc
# Save the initial number of concurrent sessions