mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Bug#22648 LC_TIME_NAMES: Setting GLOBAL has no effect
Problem: setting/displaying @@LC_TIME_NAMES didn't distinguish between GLOBAL and SESSION variable types - always SESSION variable was set/shonw. Fix: set either global or session value. Also, "mysqld --lc-time-names" was added to set "global default" value. mysql-test/r/variables.result: Adding test cases mysql-test/t/variables.test: Adding test cases sql/mysql_priv.h: Declaring variable for global default. sql/mysqld.cc: Adding --lc-time-names sql/set_var.cc: Distinguish between GLOBAL and SESSION variables. sql/sql_class.cc: Don't initialize to en_US, use global_system_variables value instead.
This commit is contained in:
35
mysql-test/r/bdb_notembedded.result
Normal file
35
mysql-test/r/bdb_notembedded.result
Normal file
@ -0,0 +1,35 @@
|
||||
set autocommit=1;
|
||||
reset master;
|
||||
create table bug16206 (a int);
|
||||
insert into bug16206 values(1);
|
||||
start transaction;
|
||||
insert into bug16206 values(2);
|
||||
commit;
|
||||
show binlog events;
|
||||
Log_name Pos Event_type Server_id End_log_pos Info
|
||||
f n Format_desc 1 n Server ver: VERSION, Binlog ver: 4
|
||||
f n Query 1 n use `test`; create table bug16206 (a int)
|
||||
f n Query 1 n use `test`; insert into bug16206 values(1)
|
||||
f n Query 1 n use `test`; insert into bug16206 values(2)
|
||||
drop table bug16206;
|
||||
reset master;
|
||||
create table bug16206 (a int) engine= bdb;
|
||||
insert into bug16206 values(0);
|
||||
insert into bug16206 values(1);
|
||||
start transaction;
|
||||
insert into bug16206 values(2);
|
||||
commit;
|
||||
insert into bug16206 values(3);
|
||||
show binlog events;
|
||||
Log_name Pos Event_type Server_id End_log_pos Info
|
||||
f n Format_desc 1 n Server ver: VERSION, Binlog ver: 4
|
||||
f n Query 1 n use `test`; create table bug16206 (a int) engine= bdb
|
||||
f n Query 1 n use `test`; insert into bug16206 values(0)
|
||||
f n Query 1 n use `test`; insert into bug16206 values(1)
|
||||
f n Query 1 n use `test`; BEGIN
|
||||
f n Query 1 n use `test`; insert into bug16206 values(2)
|
||||
f n Query 1 n use `test`; COMMIT
|
||||
f n Query 1 n use `test`; insert into bug16206 values(3)
|
||||
drop table bug16206;
|
||||
set autocommit=0;
|
||||
End of 5.0 tests
|
@ -637,6 +637,37 @@ set lc_time_names=0;
|
||||
select @@lc_time_names;
|
||||
@@lc_time_names
|
||||
en_US
|
||||
select @@global.lc_time_names, @@lc_time_names;
|
||||
@@global.lc_time_names @@lc_time_names
|
||||
en_US en_US
|
||||
set @@global.lc_time_names=fr_FR;
|
||||
select @@global.lc_time_names, @@lc_time_names;
|
||||
@@global.lc_time_names @@lc_time_names
|
||||
fr_FR en_US
|
||||
New connection
|
||||
select @@global.lc_time_names, @@lc_time_names;
|
||||
@@global.lc_time_names @@lc_time_names
|
||||
fr_FR fr_FR
|
||||
set @@lc_time_names=ru_RU;
|
||||
select @@global.lc_time_names, @@lc_time_names;
|
||||
@@global.lc_time_names @@lc_time_names
|
||||
fr_FR ru_RU
|
||||
Returnung to default connection
|
||||
select @@global.lc_time_names, @@lc_time_names;
|
||||
@@global.lc_time_names @@lc_time_names
|
||||
fr_FR en_US
|
||||
set lc_time_names=default;
|
||||
select @@global.lc_time_names, @@lc_time_names;
|
||||
@@global.lc_time_names @@lc_time_names
|
||||
fr_FR fr_FR
|
||||
set @@global.lc_time_names=default;
|
||||
select @@global.lc_time_names, @@lc_time_names;
|
||||
@@global.lc_time_names @@lc_time_names
|
||||
en_US fr_FR
|
||||
set @@lc_time_names=default;
|
||||
select @@global.lc_time_names, @@lc_time_names;
|
||||
@@global.lc_time_names @@lc_time_names
|
||||
en_US en_US
|
||||
set @test = @@query_prealloc_size;
|
||||
set @@query_prealloc_size = @test;
|
||||
select @@query_prealloc_size = @test;
|
||||
|
38
mysql-test/t/bdb_notembedded.test
Normal file
38
mysql-test/t/bdb_notembedded.test
Normal file
@ -0,0 +1,38 @@
|
||||
-- source include/not_embedded.inc
|
||||
-- source include/have_bdb.inc
|
||||
|
||||
#
|
||||
# Bug #16206: Superfluous COMMIT event in binlog when updating BDB in autocommit mode
|
||||
#
|
||||
set autocommit=1;
|
||||
|
||||
let $VERSION=`select version()`;
|
||||
|
||||
reset master;
|
||||
create table bug16206 (a int);
|
||||
insert into bug16206 values(1);
|
||||
start transaction;
|
||||
insert into bug16206 values(2);
|
||||
commit;
|
||||
--replace_result $VERSION VERSION
|
||||
--replace_column 1 f 2 n 5 n
|
||||
show binlog events;
|
||||
drop table bug16206;
|
||||
|
||||
reset master;
|
||||
create table bug16206 (a int) engine= bdb;
|
||||
insert into bug16206 values(0);
|
||||
insert into bug16206 values(1);
|
||||
start transaction;
|
||||
insert into bug16206 values(2);
|
||||
commit;
|
||||
insert into bug16206 values(3);
|
||||
--replace_result $VERSION VERSION
|
||||
--replace_column 1 f 2 n 5 n
|
||||
show binlog events;
|
||||
drop table bug16206;
|
||||
|
||||
set autocommit=0;
|
||||
|
||||
|
||||
--echo End of 5.0 tests
|
@ -504,6 +504,30 @@ select @@lc_time_names;
|
||||
set lc_time_names=0;
|
||||
select @@lc_time_names;
|
||||
|
||||
#
|
||||
# Bug #22648 LC_TIME_NAMES: Setting GLOBAL has no effect
|
||||
#
|
||||
select @@global.lc_time_names, @@lc_time_names;
|
||||
set @@global.lc_time_names=fr_FR;
|
||||
select @@global.lc_time_names, @@lc_time_names;
|
||||
--echo New connection
|
||||
connect (con1,localhost,root,,);
|
||||
connection con1;
|
||||
select @@global.lc_time_names, @@lc_time_names;
|
||||
set @@lc_time_names=ru_RU;
|
||||
select @@global.lc_time_names, @@lc_time_names;
|
||||
disconnect con1;
|
||||
connection default;
|
||||
--echo Returnung to default connection
|
||||
select @@global.lc_time_names, @@lc_time_names;
|
||||
set lc_time_names=default;
|
||||
select @@global.lc_time_names, @@lc_time_names;
|
||||
set @@global.lc_time_names=default;
|
||||
select @@global.lc_time_names, @@lc_time_names;
|
||||
set @@lc_time_names=default;
|
||||
select @@global.lc_time_names, @@lc_time_names;
|
||||
|
||||
|
||||
#
|
||||
# Bug #13334: query_prealloc_size default less than minimum
|
||||
#
|
||||
|
Reference in New Issue
Block a user