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

11
mysql-test/suite/sys_vars/r/character_set_database_basic.result
View File

@ -1,6 +1,7 @@
SET @global_start_value = @@global.character_set_database;
SELECT @global_start_value;
@global_start_value
SET @@global.character_set_database=@@character_set_client;
SELECT @@global.character_set_database;
@@global.character_set_database
latin1
SET @session_start_value = @@character_set_database;
SELECT @session_start_value;
@ -494,10 +495,4 @@ WHERE VARIABLE_NAME='character_set_database') AS res;
res
1
SET @@global.character_set_database = @global_start_value;
SELECT @@global.character_set_database;
@@global.character_set_database
latin1
SET @@session.character_set_database = @session_start_value;
SELECT @@session.character_set_database;
@@session.character_set_database
latin1