1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

Merge branch '10.2' into 10.3

This commit is contained in:
Monty
2019-09-02 14:06:56 +03:00
671 changed files with 11116 additions and 14190 deletions

View File

@ -22,12 +22,13 @@
# server-system-variables.html #
# #
###############################################################################
--source include/have_big5.inc
--source include/have_ujis.inc
--source include/have_sjis.inc
--source include/have_utf8.inc
--source include/have_ucs2.inc
--source include/default_charset.inc
--source include/load_sysvars.inc
###################################################
@ -38,7 +39,8 @@
# Save initial value #
#############################################################
SET @global_start_value = @@global.collation_database;
SELECT @global_start_value;
SET @@global.collation_database=@@collation_server;
SELECT @@global.collation_database;
# Save initial session value
SET @session_start_value = @@collation_database;
SELECT @session_start_value;
@ -66,6 +68,7 @@ SET session collation_database=utf8_unicode_ci;
SELECT session collation_database;
# using another syntax for accessing dynamic variable
SET global collation_database=utf8_unicode_ci;
set global collation_database=@@collation_server;
--Error ER_BAD_FIELD_ERROR
SELECT global collation_database;
@ -76,11 +79,13 @@ SELECT global collation_database;
SET @@collation_database = latin1_bin;
SET @@collation_database = DEFAULT;
SELECT DEFAULT_COLLATION_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME=DATABASE();
SELECT @@collation_database AS DEFAULT_VALUE;
SELECT @@collation_database = @@global.collation_database;
SET @@global.collation_database = latin1_bin;
SET @@global.collation_database = DEFAULT;
SELECT @@global.collation_database;
# collation_database is depending on how the 'test' database was created, so
# we can't trust it's value.
SELECT length(@@global.collation_database) > 0;
--echo '#--------------------FN_DYNVARS_016_03-------------------------#'
##############################################################################
@ -253,9 +258,7 @@ SELECT @@session.collation_database =
# Restore initial value #
####################################
SET @@global.collation_database = @global_start_value;
SELECT @@global.collation_database;
SET @@session.collation_database = @session_start_value;
SELECT @@session.collation_database;
###########################################################
# END OF collation_database TESTS #