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

23
mysql-test/main/variables.test
View File

@ -36,7 +36,9 @@ set @my_thread_cache_size =@@global.thread_cache_size;
set @my_max_allowed_packet =@@global.max_allowed_packet;
set @my_delay_key_write =@@global.delay_key_write;
set @my_join_buffer_size =@@global.join_buffer_size;
set @my_log_warnings =@@global.log_warnings;
set @my_log_warnings =@@global.log_warnings;
set @my_local_infile =@@global.local_infile;
# case insensitivity tests (new in 5.0)
set @`test`=1;
select @test, @`test`, @TEST, @`TEST`, @"teSt";
@ -314,7 +316,6 @@ set max_heap_table_size=100;
set max_join_size=100;
set max_sort_length=100;
set global max_user_connections=100;
select @@max_user_connections;
set global max_write_lock_count=100;
set myisam_sort_buffer_size=100;
set global net_buffer_length=100;
@ -423,6 +424,10 @@ set global myisam_max_sort_file_size=default;
#
# swap
#
# set some variables to play with
set @@global.max_user_connections=10, @@local.max_join_size=1000;
select @@global.max_user_connections,@@local.max_join_size;
set @svc=@@global.max_user_connections, @svj=@@local.max_join_size;
select @@global.max_user_connections,@@local.max_join_size;
@ -435,6 +440,7 @@ select @@global.max_user_connections,@@local.max_join_size;
set @a=1, @b=2;
set @a=@b, @b=@a;
select @a, @b;
set @@global.max_user_connections=@my_max_user_connections;
#
# Bug#2586:Disallow global/session/local as structured var. instance names
@ -814,12 +820,13 @@ set global net_write_timeout =@my_net_write_timeout;
set global net_read_timeout =@my_net_read_timeout;
set global server_id =@my_server_id;
set global slow_launch_time =@my_slow_launch_time;
set global default_storage_engine =@my_storage_engine;
set global default_storage_engine =@my_storage_engine;
set global thread_cache_size =@my_thread_cache_size;
set global max_allowed_packet = default;
set global max_allowed_packet =@my_max_allowed_packet;
set global delay_key_write =@my_delay_key_write;
set global join_buffer_size =@my_join_buffer_size;
set global log_warnings =@my_log_warnings;
set global local_infile =@my_local_infile;
#
# Bug#28580 Repeatation of status variables
@ -891,10 +898,11 @@ SET @@global.ft_stopword_file= 'x';
# Additional variables fixed.
#
--echo #
--replace_column 2 #
SHOW VARIABLES like 'back_log';
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
SELECT @@session.back_log;
SELECT @@global.back_log;
SELECT @@global.back_log > 0;
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
SET @@session.back_log= 7;
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
@ -1208,7 +1216,8 @@ SET GLOBAL max_binlog_cache_size = @old_max_binlog_cache_size;
--echo # Bug #37168 : Missing variable - skip_name_resolve
--echo #
SELECT @@skip_name_resolve;
SELECT @@skip_name_resolve >= 0;
--replace_column 2 #
SHOW VARIABLES LIKE 'skip_name_resolve';
--echo #
@ -1258,7 +1267,7 @@ SET @@global.key_cache_block_size=@kcbs;
#
# Bug#56976: added new start-up parameter
#
select @@max_long_data_size;
select @@max_long_data_size > 0;
--echo #
--echo # Bug#11766424 59527: