diff options
| author | unknown <guilhem@mysql.com> | 2004-07-15 23:34:41 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-07-15 23:34:41 +0200 |
| commit | 898ceb0f968166a83ef04b1db3f88f2e817f8a53 (patch) | |
| tree | c1ac1b5a0edb3b81c331aae90572d39f9ccfcde2 /mysql-test/r/rpl_timezone.result | |
| parent | a96bb92f4a6542409e801c1410d58fa36eb55cad (diff) | |
| download | mariadb-git-898ceb0f968166a83ef04b1db3f88f2e817f8a53.tar.gz | |
after merge fixes (making rpl_charset and rpl_timezone pass).
Replication of charsets and timezones should shortly be changed to not need ONE_SHOT
(but 5.0 should still be able to read it, to be able to replicate 4.1 masters).
mysql-test/r/rpl_charset.result:
result update after the merge (only binlog positions differ from 4.1)
mysql-test/r/rpl_timezone.result:
result update after the merge (only binlog positions differ from 4.1)
sql/log.cc:
use ONE_SHOT to save charset and TZ info in the binlog (until I rewrite this soon)
sql/set_var.cc:
Even if in the future, 5.0 will not use ONE_SHOT in ITS binlog, it must still be able to interpret it, to make 4.1->5.0 replication possible
sql/set_var.h:
Even if in the future, 5.0 will not use ONE_SHOT in ITS binlog, it must still be able to interpret it, to make 4.1->5.0 replication possible
Diffstat (limited to 'mysql-test/r/rpl_timezone.result')
| -rw-r--r-- | mysql-test/r/rpl_timezone.result | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mysql-test/r/rpl_timezone.result b/mysql-test/r/rpl_timezone.result index f5ecf474a1a..6dc8f87393c 100644 --- a/mysql-test/r/rpl_timezone.result +++ b/mysql-test/r/rpl_timezone.result @@ -35,9 +35,10 @@ Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 4 Format_desc 1 95 Server ver: VERSION, Binlog ver: 4 master-bin.000001 95 Query 1 181 use `test`; create table t1 (t timestamp) master-bin.000001 181 Query 1 266 use `test`; create table t2 (t char(32)) -master-bin.000001 266 Query 1 383 use `test`; insert into t1 values ('20040101000000'), ('20040611093902') -master-bin.000001 383 Query 1 454 use `test`; delete from t1 -master-bin.000001 454 Query 1 571 use `test`; insert into t1 values ('20040101000000'), ('20040611093902') +master-bin.000001 266 Query 1 351 use `test`; SET ONE_SHOT TIME_ZONE='UTC' +master-bin.000001 351 Query 1 468 use `test`; insert into t1 values ('20040101000000'), ('20040611093902') +master-bin.000001 468 Query 1 539 use `test`; delete from t1 +master-bin.000001 539 Query 1 656 use `test`; insert into t1 values ('20040101000000'), ('20040611093902') set time_zone='MET'; insert into t2 (select t from t1); select * from t1; @@ -72,4 +73,5 @@ t 2001-09-09 03:46:40 1000000000 set global time_zone='MET'; +ERROR HY000: Binary logging and replication forbid changing of the global server time zone drop table t1, t2; |