------------------------------------------------------------
revno: 8782
committer: Laurynas Biveinis <laurynas.biveinis@percona.com>
branch nick: mysql-5.7-percona-patches
timestamp: Fri 2015-01-30 14:40:05 +0200
message:
  Fix bug http://bugs.mysql.com/bug.php?id=75699 (Unstable testcase
  sys_vars.session_track_system_variables_basic).
  
  Fix by adding ORDER BY to INFORMATION_SCHEMA.GLOBAL_VARIABLES and
  SESSION_VARIABLES queries.
diff:
=== modified file 'mysql-test/suite/sys_vars/r/session_track_system_variables_basic.result'
--- mysql-test/suite/sys_vars/r/session_track_system_variables_basic.result	2014-08-18 07:31:23 +0000
+++ mysql-test/suite/sys_vars/r/session_track_system_variables_basic.result	2015-01-30 12:40:05 +0000
@@ -12,17 +12,17 @@
 time_zone,autocommit,character_set_client,character_set_results,character_set_connection
 
 # via INFORMATION_SCHEMA.GLOBAL_VARIABLES
-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'session_track%';
+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'session_track%' ORDER BY VARIABLE_NAME;
 VARIABLE_NAME	VARIABLE_VALUE
 SESSION_TRACK_SCHEMA	ON
+SESSION_TRACK_STATE_CHANGE	OFF
 SESSION_TRACK_SYSTEM_VARIABLES	time_zone,autocommit,character_set_client,character_set_results,character_set_connection
-SESSION_TRACK_STATE_CHANGE	OFF
 # via INFORMATION_SCHEMA.SESSION_VARIABLES
-SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME LIKE 'session_track%';
+SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME LIKE 'session_track%' ORDER BY VARIABLE_NAME;
 VARIABLE_NAME	VARIABLE_VALUE
 SESSION_TRACK_SCHEMA	ON
+SESSION_TRACK_STATE_CHANGE	OFF
 SESSION_TRACK_SYSTEM_VARIABLES	time_zone,autocommit,character_set_client,character_set_results,character_set_connection
-SESSION_TRACK_STATE_CHANGE	OFF
 SET @global_saved_tmp =  @@global.session_track_system_variables;
 
 # Altering global variable's value

=== modified file 'mysql-test/suite/sys_vars/t/session_track_system_variables_basic.test'
--- mysql-test/suite/sys_vars/t/session_track_system_variables_basic.test	2014-02-28 10:32:39 +0000
+++ mysql-test/suite/sys_vars/t/session_track_system_variables_basic.test	2015-01-30 12:40:05 +0000
@@ -12,10 +12,10 @@
 --echo
 
 --echo # via INFORMATION_SCHEMA.GLOBAL_VARIABLES
-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'session_track%';
+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'session_track%' ORDER BY VARIABLE_NAME;
 
 --echo # via INFORMATION_SCHEMA.SESSION_VARIABLES
-SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME LIKE 'session_track%';
+SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME LIKE 'session_track%' ORDER BY VARIABLE_NAME;
 
 # Save the global value to be used to restore the original value.
 SET @global_saved_tmp =  @@global.session_track_system_variables;