Commit fd069454 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/bar/mysql-5.0.b22645 

into  mysql.com:/usr/home/bar/mysql-5.1.b22645


mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/t/disabled.def:
  After merge fix
parents 733fb20d 21b9187a

mysql-test/r/rpl_locale.result

0 → 100644
+16 −0
Original line number Diff line number Diff line 
stop slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

create table t1 (s1 char(10));

set lc_time_names= 'de_DE';

insert into t1 values (date_format('2001-01-01','%W'));

select * from t1;

s1

Montag

select * from t1;

s1

Montag

drop table t1;

mysql-test/r/variables.result

+57 −0
Original line number Diff line number Diff line
@@ -697,6 +697,63 @@ set names latin1; 
select @@have_innodb;

@@have_innodb

#

*** Various tests with LC_TIME_NAMES

*** LC_TIME_NAMES: testing case insensitivity

set @@lc_time_names='ru_ru';

select @@lc_time_names;

@@lc_time_names

ru_RU

*** LC_TIME_NAMES: testing with a user variable

set @lc='JA_JP';

set @@lc_time_names=@lc;

select @@lc_time_names;

@@lc_time_names

ja_JP

*** LC_TIME_NAMES: testing with string expressions

set lc_time_names=concat('de','_','DE');

select @@lc_time_names;

@@lc_time_names

de_DE

set lc_time_names=concat('de','+','DE');

ERROR HY000: Unknown locale: 'de+DE'

select @@lc_time_names;

@@lc_time_names

de_DE

LC_TIME_NAMES: testing with numeric expressions

set @@lc_time_names=1+2;

select @@lc_time_names;

@@lc_time_names

sv_SE

set @@lc_time_names=1/0;

ERROR 42000: Incorrect argument type to variable 'lc_time_names'

select @@lc_time_names;

@@lc_time_names

sv_SE

set lc_time_names=en_US;

LC_TIME_NAMES: testing NULL and a negative number:

set lc_time_names=NULL;

ERROR 42000: Variable 'lc_time_names' can't be set to the value of 'NULL'

set lc_time_names=-1;

ERROR HY000: Unknown locale: '-1'

select @@lc_time_names;

@@lc_time_names

en_US

LC_TIME_NAMES: testing locale with the last ID:

set lc_time_names=108;

select @@lc_time_names;

@@lc_time_names

zh_HK

LC_TIME_NAMES: testing a number beyond the valid ID range:

set lc_time_names=109;

ERROR HY000: Unknown locale: '109'

select @@lc_time_names;

@@lc_time_names

zh_HK

LC_TIME_NAMES: testing that 0 is en_US:

set lc_time_names=0;

select @@lc_time_names;

@@lc_time_names

en_US

set @test = @@query_prealloc_size;

set @@query_prealloc_size = @test;

select @@query_prealloc_size = @test;

mysql-test/t/disabled.def

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ ndb_autodiscover2 : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t 
ndb_load                 : BUG#17233 2006-05-04 tomas failed load data from infile causes mysqld dbug_assert, binlog not flushed

partition_03ndb          : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table

ps_7ndb                  : BUG#18950 2006-02-16 jmiller create table like does not obtain LOCK_open

rpl_locale               : Bug#22645 2006-12-05 bar

rpl_ndb_2innodb          : BUG#19227 2006-04-20 pekka pk delete apparently not replicated

rpl_ndb_2myisam          : BUG#19227 Seems to pass currently

rpl_ndb_dd_partitions    : BUG#19259 2006-04-21 rpl_ndb_dd_partitions fails on s/AMD

mysql-test/t/rpl_locale.test

0 → 100644
+22 −0
Original line number Diff line number Diff line 
# Replication of locale variables



source include/master-slave.inc;



#

# Bug#22645 LC_TIME_NAMES: Statement not replicated

#

connection master;

create table t1 (s1 char(10));

set lc_time_names= 'de_DE';

insert into t1 values (date_format('2001-01-01','%W'));

select * from t1;

sync_slave_with_master;

connection slave;

select * from t1;

connection master;

drop table t1;

sync_slave_with_master;



# End of 4.1 tests

mysql-test/t/variables.test

+44 −0
Original line number Diff line number Diff line
@@ -496,6 +496,50 @@ set names latin1; 
--replace_column 1 #

select @@have_innodb;



#

# Tests for lc_time_names

# Note, when adding new locales, please fix ID accordingly:

# - to test the last ID (currently 108)

# - and the next after the last (currently 109)

#

--echo *** Various tests with LC_TIME_NAMES

--echo *** LC_TIME_NAMES: testing case insensitivity

set @@lc_time_names='ru_ru';

select @@lc_time_names;

--echo *** LC_TIME_NAMES: testing with a user variable

set @lc='JA_JP';

set @@lc_time_names=@lc;

select @@lc_time_names;

--echo *** LC_TIME_NAMES: testing with string expressions

set lc_time_names=concat('de','_','DE');

select @@lc_time_names;

--error 1105

set lc_time_names=concat('de','+','DE');

select @@lc_time_names;

--echo LC_TIME_NAMES: testing with numeric expressions

set @@lc_time_names=1+2;

select @@lc_time_names;

--error 1232

set @@lc_time_names=1/0;

select @@lc_time_names;

set lc_time_names=en_US;

--echo LC_TIME_NAMES: testing NULL and a negative number:

--error 1231

set lc_time_names=NULL;

--error 1105

set lc_time_names=-1;

select @@lc_time_names;

--echo LC_TIME_NAMES: testing locale with the last ID:

set lc_time_names=108;

select @@lc_time_names;

--echo LC_TIME_NAMES: testing a number beyond the valid ID range:

--error 1105

set lc_time_names=109;

select @@lc_time_names;

--echo LC_TIME_NAMES: testing that 0 is en_US:

set lc_time_names=0;

select @@lc_time_names;



#

# Bug #13334: query_prealloc_size default less than minimum

#