Commit 517e0d31 authored by unknown's avatar unknown
Browse files

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 

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


mysql-test/r/mysqlbinlog.result:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  After merge fix
parents e653222d 6d310813

mysql-test/r/mysqlbinlog.result

+20 −0
Original line number Diff line number Diff line
@@ -215,6 +215,26 @@ select * from t5 /* must be (1),(1) */; 
a

1

1

flush logs;

drop table if exists t5;

create table t5 (c1 int, c2 varchar(128) character set latin1 not null);

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

set lc_time_names=de_DE;

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

set lc_time_names=en_US;

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

select * from t5 order by c1;

c1	c2

1	Monday

2	Montag

3	Monday

flush logs;

drop table t5;

select * from t5 order by c1;

c1	c2

1	Monday

2	Montag

3	Monday

drop procedure if exists p1;

flush logs;

create procedure p1()

mysql-test/r/rpl_locale.result

+4 −0
Original line number Diff line number Diff line
@@ -7,10 +7,14 @@ start slave; 
create table t1 (s1 char(10));

set lc_time_names= 'de_DE';

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

set lc_time_names= 'en_US';

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

select * from t1;

s1

Montag

Monday

select * from t1;

s1

Montag

Monday

drop table t1;

mysql-test/t/disabled.def

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ rpl_ndb_sync : Problem with cluster/def/schema table that is in std_ 


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/mysqlbinlog.test

+20 −2
Original line number Diff line number Diff line
@@ -137,6 +137,24 @@ flush logs; 
--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000006 | $MYSQL

select * from t5  /* must be (1),(1) */;



#

# Bug#22645 LC_TIME_NAMES: Statement not replicated

# Check that a dump created by mysqlbinlog reproduces

# lc_time_names dependent values correctly

#

flush logs;

drop table if exists t5;

create table t5 (c1 int, c2 varchar(128) character set latin1 not null);

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

set lc_time_names=de_DE;

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

set lc_time_names=en_US;

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

select * from t5 order by c1;

flush logs;

drop table t5;

--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000007 | $MYSQL

select * from t5 order by c1;

#

# Bug#20396 Bin Log does not get DELIMETER cmd - Recover StoredProc fails 

#
@@ -156,8 +174,8 @@ call p1(); 
drop procedure p1;

--error 1305

call p1();

--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000008

--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000008 | $MYSQL

--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000009

--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000009 | $MYSQL

call p1();

drop procedure p1;

mysql-test/t/rpl_locale.test

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ connection master; 
create table t1 (s1 char(10));

set lc_time_names= 'de_DE';

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

set lc_time_names= 'en_US';

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

select * from t1;

sync_slave_with_master;

connection slave;