diff options
| author | monty@mysql.com <> | 2004-07-15 04:19:07 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-07-15 04:19:07 +0300 |
| commit | 5b3c418b4835c688b0859a3e82d0280cd177e52a (patch) | |
| tree | e83d5aa4118851b076ed870c7e9c5fd8b5bb53ef /mysql-test/r/rpl_timezone.result | |
| parent | 31fe2837f9c0579454cba635ee127536a6ac55ce (diff) | |
| download | mariadb-git-5b3c418b4835c688b0859a3e82d0280cd177e52a.tar.gz | |
After merge fixes
Note: The following tests fails
- fulltext (Sergei has promised to fix)
- rpl_charset (Guilhem should fix)
- rpl_timezone (Dimitray has promised to fix)
Sanja needs to check out the calling of close_thread_tables() in sp_head.cc
Diffstat (limited to 'mysql-test/r/rpl_timezone.result')
| -rw-r--r-- | mysql-test/r/rpl_timezone.result | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/mysql-test/r/rpl_timezone.result b/mysql-test/r/rpl_timezone.result index c7be3324533..f5ecf474a1a 100644 --- a/mysql-test/r/rpl_timezone.result +++ b/mysql-test/r/rpl_timezone.result @@ -31,14 +31,13 @@ t 2004-01-01 00:00:00 2004-06-11 09:39:02 show binlog events; -Log_name Pos Event_type Server_id Orig_log_pos Info -master-bin.000001 4 Start 1 4 Server ver: VERSION, Binlog ver: 3 -master-bin.000001 79 Query 1 79 use `test`; create table t1 (t timestamp) -master-bin.000001 143 Query 1 143 use `test`; create table t2 (t char(32)) -master-bin.000001 206 Query 1 206 use `test`; SET ONE_SHOT TIME_ZONE='UTC' -master-bin.000001 269 Query 1 269 use `test`; insert into t1 values ('20040101000000'), ('20040611093902') -master-bin.000001 364 Query 1 364 use `test`; delete from t1 -master-bin.000001 413 Query 1 413 use `test`; insert into t1 values ('20040101000000'), ('20040611093902') +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') set time_zone='MET'; insert into t2 (select t from t1); select * from t1; @@ -73,5 +72,4 @@ 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; |