1 files changed, 9 insertions, 14 deletions
diff --git a/mysql-test/suite/sys_vars/r/collation_connection_basic.result b/mysql-test/suite/sys_vars/r/collation_connection_basic.result
index eeab4885790..31c15a68f1c 100644
--- a/mysql-test/suite/sys_vars/r/collation_connection_basic.result
+++ b/mysql-test/suite/sys_vars/r/collation_connection_basic.result
@@ -1,6 +1,7 @@
 SET @global_start_value = @@global.collation_connection;
-SELECT @global_start_value;
-@global_start_value
+SET @@global.collation_connection=@@collation_connection;
+SELECT @@global.collation_connection;
+@@global.collation_connection
 latin1_swedish_ci
 SET @session_start_value = @@collation_connection;
 SELECT @session_start_value;
@@ -30,14 +31,14 @@ ERROR 42S22: Unknown column 'global' in 'field list'
 '#--------------------FN_DYNVARS_015_02-------------------------#'
 SET @@collation_connection = latin1_bin;
 SET @@collation_connection = DEFAULT;
-SELECT @@collation_connection AS DEFAULT_VALUE;
-DEFAULT_VALUE
-utf8_unicode_ci
+SELECT @@collation_connection = @@global.collation_connection;
+@@collation_connection = @@global.collation_connection
+1
 SET @@global.collation_connection = latin1_bin;
 SET @@global.collation_connection = DEFAULT;
-SELECT @@global.collation_connection;
-@@global.collation_connection
-latin1_swedish_ci
+SELECT @@global.collation_connection = @global_start_value;
+@@global.collation_connection = @global_start_value
+1
 '#--------------------FN_DYNVARS_015_03-------------------------#'
 SET @@session.collation_connection = utf8_polish_ci;
 SELECT @@session.collation_connection;
@@ -1222,10 +1223,4 @@ WHERE VARIABLE_NAME='collation_connection') AS res;
 res
 1
 SET @@global.collation_connection = @global_start_value;
-SELECT @@global.collation_connection;
-@@global.collation_connection
-latin1_swedish_ci
 SET @@session.collation_connection = @session_start_value;
-SELECT @@session.collation_connection;
-@@session.collation_connection
-latin1_swedish_ci