Merge 10.4 into 10.5

8 files changed, 30 insertions, 25 deletions

diff --git a/mysql-test/suite/maria/icp.test b/mysql-test/suite/maria/icp.test
index d8af34daf2e..83d770dd8fd 100644
--- a/mysql-test/suite/maria/icp.test
+++ b/mysql-test/suite/maria/icp.test
@@ -3,6 +3,7 @@
 #
 
 --source include/have_maria.inc
+--source include/default_optimizer_switch.inc
 
 set @save_storage_engine= @@storage_engine;
 set storage_engine=Maria;
diff --git a/mysql-test/suite/maria/maria-big.test b/mysql-test/suite/maria/maria-big.test
index 5b4b6c4defe..6dc56756cf7 100644
--- a/mysql-test/suite/maria/maria-big.test
+++ b/mysql-test/suite/maria/maria-big.test
@@ -69,6 +69,6 @@ drop table t1;
 --disable_result_log
 --disable_query_log
 set global aria_log_file_size=default;
-set global max_allowed_packet=default;
+eval set global max_allowed_packet= $default_max_allowed_packet;
 --enable_result_log
 --enable_query_log
diff --git a/mysql-test/suite/maria/maria-gis-recovery.test b/mysql-test/suite/maria/maria-gis-recovery.test
index c40cc3788de..61e1e8362dc 100644
--- a/mysql-test/suite/maria/maria-gis-recovery.test
+++ b/mysql-test/suite/maria/maria-gis-recovery.test
@@ -5,6 +5,7 @@
 --source include/have_debug.inc
 --source include/have_maria.inc
 --source include/have_geometry.inc
+--source include/default_charset.inc
 
 set global aria_log_file_size=4294967295;
 let $MARIA_LOG=../../tmp;
diff --git a/mysql-test/suite/maria/maria-no-logging.test b/mysql-test/suite/maria/maria-no-logging.test
index 7055a842510..fb2f34f7708 100644
--- a/mysql-test/suite/maria/maria-no-logging.test
+++ b/mysql-test/suite/maria/maria-no-logging.test
@@ -3,6 +3,7 @@
 --source include/have_maria.inc
 # can't restart server in embedded
 --source include/not_embedded.inc
+--source include/default_charset.inc
 
 set global aria_log_file_size=4294959104;
 
diff --git a/mysql-test/suite/maria/maria-recover.test b/mysql-test/suite/maria/maria-recover.test
index 893cd5e601d..36fa41d9adb 100644
--- a/mysql-test/suite/maria/maria-recover.test
+++ b/mysql-test/suite/maria/maria-recover.test
@@ -1,6 +1,7 @@
 # Test of the --aria-recover-options option.
 
 --source include/have_maria.inc
+--source include/default_charset.inc
 
 #
 # Ensure that we don't get warnings from mysql.proc (used by check_mysqld)
diff --git a/mysql-test/suite/maria/maria-recovery.test b/mysql-test/suite/maria/maria-recovery.test
index a1671a56d53..04f5f665bb7 100644
--- a/mysql-test/suite/maria/maria-recovery.test
+++ b/mysql-test/suite/maria/maria-recovery.test
@@ -4,6 +4,7 @@
 # Binary must be compiled with debug for crash to occur
 --source include/have_debug.inc
 --source include/have_maria.inc
+--source include/default_charset.inc
 
 set global aria_log_file_size=4294959104;
 let $MARIA_LOG=../../tmp;
diff --git a/mysql-test/suite/maria/maria3.result b/mysql-test/suite/maria/maria3.result
index 09ce22411eb..3c0b8f28800 100644
--- a/mysql-test/suite/maria/maria3.result
+++ b/mysql-test/suite/maria/maria3.result
@@ -302,28 +302,29 @@ check table t1 extended;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 drop table t1;
-select lower(variable_name) as Variable_name, Variable_value as Value from information_schema.session_variables where variable_name like "aria%" and variable_name not like "aria_used_for_temp_tables" order by 1;
+select lower(variable_name) as Variable_name, Variable_value as Value from information_schema.session_variables where variable_name like "aria%" order by 1;
 Variable_name	Value
-aria_block_size	8192
-aria_checkpoint_interval	30
-aria_checkpoint_log_activity	1048576
-aria_encrypt_tables	OFF
-aria_force_start_after_recovery_failures	0
-aria_group_commit	none
-aria_group_commit_interval	0
-aria_log_file_size	4294959104
-aria_log_purge_type	immediate
-aria_max_sort_file_size	9223372036853727232
-aria_pagecache_age_threshold	300
-aria_pagecache_buffer_size	8388608
-aria_pagecache_division_limit	100
-aria_pagecache_file_hash_size	512
-aria_page_checksum	OFF
-aria_recover_options	BACKUP,QUICK
-aria_repair_threads	1
-aria_sort_buffer_size	268434432
-aria_stats_method	nulls_unequal
-aria_sync_log_dir	NEWFILE
+aria_block_size	#
+aria_checkpoint_interval	#
+aria_checkpoint_log_activity	#
+aria_encrypt_tables	#
+aria_force_start_after_recovery_failures	#
+aria_group_commit	#
+aria_group_commit_interval	#
+aria_log_file_size	#
+aria_log_purge_type	#
+aria_max_sort_file_size	#
+aria_pagecache_age_threshold	#
+aria_pagecache_buffer_size	#
+aria_pagecache_division_limit	#
+aria_pagecache_file_hash_size	#
+aria_page_checksum	#
+aria_recover_options	#
+aria_repair_threads	#
+aria_sort_buffer_size	#
+aria_stats_method	#
+aria_sync_log_dir	#
+aria_used_for_temp_tables	#
 show status like 'aria%';
 Variable_name	Value
 Aria_pagecache_blocks_not_flushed	#
diff --git a/mysql-test/suite/maria/maria3.test b/mysql-test/suite/maria/maria3.test
index b4e3e30d63f..fd0d5c67a57 100644
--- a/mysql-test/suite/maria/maria3.test
+++ b/mysql-test/suite/maria/maria3.test
@@ -258,9 +258,8 @@ update t1 set s1=2 where seq=1;
 check table t1 extended;
 drop table t1;
 
-# Fix if we are using safemalloc
---replace_result 8388572 8388600 134217692 134217720
-select lower(variable_name) as Variable_name, Variable_value as Value from information_schema.session_variables where variable_name like "aria%" and variable_name not like "aria_used_for_temp_tables" order by 1;
+--replace_column 2 #
+select lower(variable_name) as Variable_name, Variable_value as Value from information_schema.session_variables where variable_name like "aria%" order by 1;
 --replace_column 2 #
 show status like 'aria%';