diff options
| author | msvensson@neptunus.(none) <> | 2006-11-15 10:31:23 +0100 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-11-15 10:31:23 +0100 |
| commit | 9f22fecf723c04c895d924404e2faab3d865b39f (patch) | |
| tree | 3cf80a037e826309a697cf8b347a929f0d8290bf /mysql-test/r/rpl_timezone.result | |
| parent | 460e90a1c130657f325dc6c3dc416dd4c34cbb35 (diff) | |
| parent | 15c3ed7517aeb7cc89277afc8beaf3d610cf02f8 (diff) | |
| download | mariadb-git-9f22fecf723c04c895d924404e2faab3d865b39f.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
Diffstat (limited to 'mysql-test/r/rpl_timezone.result')
| -rw-r--r-- | mysql-test/r/rpl_timezone.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/rpl_timezone.result b/mysql-test/r/rpl_timezone.result index 4ad6afa8c94..47ef16b9d49 100644 --- a/mysql-test/r/rpl_timezone.result +++ b/mysql-test/r/rpl_timezone.result @@ -4,6 +4,7 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; +set @my_time_zone= @@global.time_zone; set timestamp=100000000; create table t1 (t timestamp, n int not null auto_increment, PRIMARY KEY(n)); create table t2 (t char(32), n int not null auto_increment, PRIMARY KEY(n)); @@ -103,3 +104,4 @@ t n 2003-12-31 23:00:00 16 2005-01-01 08:00:00 17 drop table t1, t2; +set global time_zone= @my_time_zone; |