database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Monty
2019-09-02 14:06:56 +03:00
parent b0ff5a6a73 9cba6c5aa3
commit a071e0e029
671 changed files with 11116 additions and 14190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mysql-test/suite/sys_vars/r/collation_connection_basic.result
View File

@ -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