database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

MDEV-34915 track session variables - test adjust

Browse Source 
With MDEV-34915 adjusting the mtr output of session
variables to be in order, the original variable omission for
x86_32 (added by MDEV-31609 - e0b6db2) is no longer required.
This commit is contained in:
Daniel Black
2024-11-12 14:10:58 +11:00
parent 74331a48dd
commit 54ab281de8
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/sys_vars/r/session_track_system_variables_basic.result
View File

@@ -154,17 +154,15 @@ SET @@global.session_track_system_variables = @global_saved_tmp;
#
# MDEV-31609 Send initial values of system variables in first OK packet
#
set @old_session_track_system_variables=@@global.session_track_system_variables;
set global session_track_system_variables="autocommit,character_set_client,character_set_connection,redirect_url,time_zone";
connect foo,localhost,root;
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
-- autocommit: ON
-- character_set_client: latin1
-- character_set_connection: latin1
-- character_set_results: latin1
-- redirect_url:
-- time_zone: SYSTEM
connection default;
disconnect foo;
set global session_track_system_variables=@old_session_track_system_variables;
# End of tests 11.5

6
mysql-test/suite/sys_vars/t/session_track_system_variables_basic.test
View File

@@ -129,11 +129,6 @@ SET @@global.session_track_system_variables = @global_saved_tmp;
--echo # MDEV-31609 Send initial values of system variables in first OK packet
--echo #
set @old_session_track_system_variables=@@global.session_track_system_variables;
# We set the session_track_system_variables to exclude
# character_set_results as it can appear out of order in the CI
# builder x86-debian-sid.
set global session_track_system_variables="autocommit,character_set_client,character_set_connection,redirect_url,time_zone";
enable_session_track_info;
connect foo,localhost,root;
@@ -141,6 +136,5 @@ connect foo,localhost,root;
disable_session_track_info;
connection default;
disconnect foo;
set global session_track_system_variables=@old_session_track_system_variables;
--echo # End of tests 11.5