database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +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

22
mysql-test/suite/sys_vars/r/collation_server_basic.result
View File

@@ -1,7 +1,5 @@
SET @global_start_value = @@global.collation_server;
SELECT @global_start_value;
@global_start_value
latin1_swedish_ci
SET @@global.collation_server= @@collation_server;
SET @session_start_value = @@collation_server;
SELECT @session_start_value;
@session_start_value
@@ -30,14 +28,14 @@ ERROR 42S22: Unknown column 'global' in 'field list'
'#--------------------FN_DYNVARS_014_02-------------------------#'
SET @@collation_server = latin1_bin;
SET @@collation_server = DEFAULT;
SELECT @@collation_server AS DEFAULT_VALUE;
DEFAULT_VALUE
utf8_unicode_ci
SELECT @@collation_server= @@global.collation_server;
@@collation_server= @@global.collation_server
1
SET @@global.collation_server = latin1_bin;
SET @@global.collation_server = DEFAULT;
SELECT @@global.collation_server;
@@global.collation_server
latin1_swedish_ci
SELECT @@global.collation_server = @global_start_value;
@@global.collation_server = @global_start_value
1
'#--------------------FN_DYNVARS_014_03-------------------------#'
SET @@session.collation_server = utf8_polish_ci;
SELECT @@session.collation_server;
@@ -1221,10 +1219,4 @@ WHERE VARIABLE_NAME='collation_server') AS res;
res
1
SET @@global.collation_server = @global_start_value;
SELECT @@global.collation_server;
@@global.collation_server
latin1_swedish_ci
SET @@session.collation_server = @session_start_value;
SELECT @@session.collation_server;
@@session.collation_server
latin1_swedish_ci