mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Don't force column header to @@session.var_name if @@local.var_name
was used. (Bug #10724) mysql-test/r/key_cache.result: Updated results mysql-test/r/ps_1general.result: Updated results mysql-test/r/user_var.result: Add new results mysql-test/r/variables.result: Update results mysql-test/t/user_var.test: Add new regression test sql/item_func.cc: Don't set name explicitly in get_system_var(), let it get set by the select_item: rule in sql_parse.yy or other callers of get_system_var(). sql/sql_parse.cc: Set the name on the Item returned by get_system_var().
This commit is contained in:
@ -70,7 +70,7 @@ Variable_name Value
|
||||
max_join_size HA_POS_ERROR
|
||||
set @@max_join_size=1000, @@global.max_join_size=2000;
|
||||
select @@local.max_join_size, @@global.max_join_size;
|
||||
@@session.max_join_size @@global.max_join_size
|
||||
@@local.max_join_size @@global.max_join_size
|
||||
1000 2000
|
||||
select @@identity, length(@@version)>0;
|
||||
@@identity length(@@version)>0
|
||||
@ -407,23 +407,23 @@ Variable_name Value
|
||||
myisam_max_sort_file_size MAX_FILE_SIZE
|
||||
set global myisam_max_sort_file_size=default;
|
||||
select @@global.max_user_connections,@@local.max_join_size;
|
||||
@@global.max_user_connections @@session.max_join_size
|
||||
@@global.max_user_connections @@local.max_join_size
|
||||
100 200
|
||||
set @svc=@@global.max_user_connections, @svj=@@local.max_join_size;
|
||||
select @@global.max_user_connections,@@local.max_join_size;
|
||||
@@global.max_user_connections @@session.max_join_size
|
||||
@@global.max_user_connections @@local.max_join_size
|
||||
100 200
|
||||
set @@global.max_user_connections=111,@@local.max_join_size=222;
|
||||
select @@global.max_user_connections,@@local.max_join_size;
|
||||
@@global.max_user_connections @@session.max_join_size
|
||||
@@global.max_user_connections @@local.max_join_size
|
||||
111 222
|
||||
set @@global.max_user_connections=@@local.max_join_size,@@local.max_join_size=@@global.max_user_connections;
|
||||
select @@global.max_user_connections,@@local.max_join_size;
|
||||
@@global.max_user_connections @@session.max_join_size
|
||||
@@global.max_user_connections @@local.max_join_size
|
||||
222 111
|
||||
set @@global.max_user_connections=@svc, @@local.max_join_size=@svj;
|
||||
select @@global.max_user_connections,@@local.max_join_size;
|
||||
@@global.max_user_connections @@session.max_join_size
|
||||
@@global.max_user_connections @@local.max_join_size
|
||||
100 200
|
||||
set @a=1, @b=2;
|
||||
set @a=@b, @b=@a;
|
||||
|
Reference in New Issue
Block a user