revision-id: 0c693dc0c5f3933f559d61e32896586841a969e3 (mariadb-10.2.15-100-g0c693dc0c5f) parent(s): cb784e17512588242c953a9f5362b82f1226891a author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2018-06-25 19:01:25 +0200 message: Make test stable (order of tracking variables is guaratied) --- mysql-test/r/mysqltest_tracking_info.result | 24 ++++-------------------- mysql-test/t/mysqltest_tracking_info.test | 4 ++-- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/mysql-test/r/mysqltest_tracking_info.result b/mysql-test/r/mysqltest_tracking_info.result index b5885a37cde..df966ae1d39 100644 --- a/mysql-test/r/mysqltest_tracking_info.result +++ b/mysql-test/r/mysqltest_tracking_info.result @@ -1,46 +1,30 @@ -SELECT @@session.character_set_client, @@session.character_set_results, @@session.character_set_connection; -@@session.character_set_client @@session.character_set_results @@session.character_set_connection -latin1 latin1 latin1 -SET @@session.session_track_system_variables='character_set_client,character_set_results,character_set_connection'; +SELECT @@session.character_set_connection; +@@session.character_set_connection +latin1 +SET @@session.session_track_system_variables='character_set_connection'; # tracking info on SET NAMES 'utf8'; -- Tracker : SESSION_TRACK_SYSTEM_VARIABLES --- character_set_client --- utf8 -- character_set_connection -- utf8 --- character_set_results --- utf8 SET NAMES 'big5'; -- Tracker : SESSION_TRACK_SYSTEM_VARIABLES --- character_set_client --- big5 -- character_set_connection -- big5 --- character_set_results --- big5 # tracking info on once SET NAMES 'utf8'; -- Tracker : SESSION_TRACK_SYSTEM_VARIABLES --- character_set_client --- utf8 -- character_set_connection -- utf8 --- character_set_results --- utf8 SET NAMES 'big5'; # tracking info on SET NAMES 'utf8'; -- Tracker : SESSION_TRACK_SYSTEM_VARIABLES --- character_set_client --- utf8 -- character_set_connection -- utf8 --- character_set_results --- utf8 # tracking info off once SET NAMES 'big5'; diff --git a/mysql-test/t/mysqltest_tracking_info.test b/mysql-test/t/mysqltest_tracking_info.test index c32e20703a5..d31f68b3cbd 100644 --- a/mysql-test/t/mysqltest_tracking_info.test +++ b/mysql-test/t/mysqltest_tracking_info.test @@ -2,8 +2,8 @@ --source include/no_protocol.inc --source include/not_embedded.inc -SELECT @@session.character_set_client, @@session.character_set_results, @@session.character_set_connection; -SET @@session.session_track_system_variables='character_set_client,character_set_results,character_set_connection'; +SELECT @@session.character_set_connection; +SET @@session.session_track_system_variables='character_set_connection'; --echo # tracking info on --enable_session_track_info