diff options
| author | unknown <bar@bar.intranet.mysql.r18.ru> | 2006-12-22 11:20:55 +0400 |
|---|---|---|
| committer | unknown <bar@bar.intranet.mysql.r18.ru> | 2006-12-22 11:20:55 +0400 |
| commit | 432e1327a287c12a34b4c26616448084dd33f912 (patch) | |
| tree | 73f6bb04fd1faec28ef859aa8aac880e7052a14d /mysql-test/t/mysqlbinlog.test | |
| parent | 3ff0a0d55661f0c5de13c2dc69549e46dc4bce4f (diff) | |
| parent | c59669607e93dca9a7ab3f1d7790685dc56a7184 (diff) | |
| download | mariadb-git-432e1327a287c12a34b4c26616448084dd33f912.tar.gz | |
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
Diffstat (limited to 'mysql-test/t/mysqlbinlog.test')
| -rw-r--r-- | mysql-test/t/mysqlbinlog.test | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test index dc9a58c222d..db5c4efe8ad 100644 --- a/mysql-test/t/mysqlbinlog.test +++ b/mysql-test/t/mysqlbinlog.test @@ -138,6 +138,24 @@ flush logs; 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 # --disable_warnings @@ -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; |