Skip to content

Commit 54ab281

Browse files
committed
MDEV-34915 track session variables - test adjust
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.
1 parent 74331a4 commit 54ab281

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

mysql-test/suite/sys_vars/r/session_track_system_variables_basic.result

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,17 +154,15 @@ SET @@global.session_track_system_variables = @global_saved_tmp;
154154
#
155155
# MDEV-31609 Send initial values of system variables in first OK packet
156156
#
157-
set @old_session_track_system_variables=@@global.session_track_system_variables;
158-
set global session_track_system_variables="autocommit,character_set_client,character_set_connection,redirect_url,time_zone";
159157
connect foo,localhost,root;
160158
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
161159
-- autocommit: ON
162160
-- character_set_client: latin1
163161
-- character_set_connection: latin1
162+
-- character_set_results: latin1
164163
-- redirect_url:
165164
-- time_zone: SYSTEM
166165

167166
connection default;
168167
disconnect foo;
169-
set global session_track_system_variables=@old_session_track_system_variables;
170168
# End of tests 11.5

mysql-test/suite/sys_vars/t/session_track_system_variables_basic.test

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,18 +129,12 @@ SET @@global.session_track_system_variables = @global_saved_tmp;
129129
--echo # MDEV-31609 Send initial values of system variables in first OK packet
130130
--echo #
131131

132-
set @old_session_track_system_variables=@@global.session_track_system_variables;
133-
# We set the session_track_system_variables to exclude
134-
# character_set_results as it can appear out of order in the CI
135-
# builder x86-debian-sid.
136-
set global session_track_system_variables="autocommit,character_set_client,character_set_connection,redirect_url,time_zone";
137132
enable_session_track_info;
138133

139134
connect foo,localhost,root;
140135

141136
disable_session_track_info;
142137
connection default;
143138
disconnect foo;
144-
set global session_track_system_variables=@old_session_track_system_variables;
145139

146140
--echo # End of tests 11.5

0 commit comments

Comments
 (0)