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

7
mysql-test/suite/sys_vars/t/character_set_database_basic.test
View File

@ -30,7 +30,7 @@
--source include/have_utf8mb4.inc
--source include/have_utf16.inc
--source include/have_utf32.inc
--source include/default_charset.inc
--source include/load_sysvars.inc
###################################################
## START OF character_set_database TESTS ##
@ -40,7 +40,8 @@
# Save initial value #
#############################################################
SET @global_start_value = @@global.character_set_database;
SELECT @global_start_value;
SET @@global.character_set_database=@@character_set_client;
SELECT @@global.character_set_database;
# Save initial session value
SET @session_start_value = @@character_set_database;
SELECT @session_start_value;
@ -263,9 +264,7 @@ SELECT @@session.character_set_database =
# Restore initial value #
####################################
SET @@global.character_set_database = @global_start_value;
SELECT @@global.character_set_database;
SET @@session.character_set_database = @session_start_value;
SELECT @@session.character_set_database;
#############################################################
# END OF character_set_database TESTS #