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
MariaDB · Nov 19, 2018 · ae96b47 · ae96b47
1 parent e669e70
commit ae96b47
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 0 deletions.
diff --git a/mysql-test/include/have_aria_used_for_temp_tables.inc b/mysql-test/include/have_aria_used_for_temp_tables.inc
@@ -0,0 +1,4 @@
+if (!`SELECT @@aria_used_for_temp_tables`)
+{
+  skip Need Aria to be used for temporary tables;
+}
diff --git a/mysql-test/suite/sys_vars/t/aria_used_for_temp_tables_basic.test b/mysql-test/suite/sys_vars/t/aria_used_for_temp_tables_basic.test
@@ -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;

diff --git a/mysql-test/suite/sys_vars/t/sysvars_aria.test b/mysql-test/suite/sys_vars/t/sysvars_aria.test
@@ -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

diff --git a/mysql-test/suite/sys_vars/t/tmp_disk_table_size_func.test b/mysql-test/suite/sys_vars/t/tmp_disk_table_size_func.test
@@ -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
 

diff --git a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test
@@ -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