1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge branch '10.4' into 10.5

This commit is contained in:
Sergei Golubchik
2020-05-09 20:43:36 +02:00
100 changed files with 1571 additions and 289 deletions

View File

@ -2,6 +2,9 @@
--source include/no_protocol.inc
--source include/not_embedded.inc
set @save_session_track_system_variables=@@session_track_system_variables;
SELECT @@session.character_set_connection;
SET @@session.session_track_system_variables='character_set_connection';
@ -22,7 +25,26 @@ SET NAMES 'utf8';
SET NAMES 'big5';
--disable_session_track_info
SET @@session.session_track_system_variables= default;
SET @@session.session_track_system_variables= @save_session_track_system_variables;
--echo #
--echo # MDEV-22504: session tracking return incorrectly long traking data
--echo #
set @save_optimizer_switch=@@optimizer_switch;
SET @@session.session_track_system_variables='optimizer_switch';
--enable_session_track_info
set optimizer_switch='index_merge=off,index_merge_union=off,index_merge_sort_union=off,index_merge_intersection=off,index_merge_sort_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=on,mrr_cost_based=on,mrr_sort_keys=on,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=on,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off';
--disable_session_track_info
set @@optimizer_switch=@save_optimizer_switch;
SET @@session.session_track_system_variables= @save_session_track_system_variables;
--echo # End of 10.2 tests
--echo #
--echo # MDEV-16470 - Session user variables tracker
@ -46,3 +68,5 @@ set @@session.session_track_user_variables=1;
set @a=repeat('X', 1029);
--disable_session_track_info
set @@session.session_track_user_variables=0;
--echo # End of 10.5 tests