From 9095a69edabd655618f70bda73ffbde2bb131c70 Mon Sep 17 00:00:00 2001 From: Leonard Zhou Date: Wed, 25 Mar 2009 14:19:42 +0800 Subject: [PATCH] Fix test case erro in sles10-ia64-a. Reset master before next test. --- mysql-test/suite/rpl/r/rpl_timezone.result | 1 + mysql-test/suite/rpl/t/rpl_timezone.test | 1 + 2 files changed, 2 insertions(+) diff --git a/mysql-test/suite/rpl/r/rpl_timezone.result b/mysql-test/suite/rpl/r/rpl_timezone.result index f5e05bcb759..0b5c03b5300 100644 --- a/mysql-test/suite/rpl/r/rpl_timezone.result +++ b/mysql-test/suite/rpl/r/rpl_timezone.result @@ -122,6 +122,7 @@ a b SET @@session.time_zone = default; DROP TABLE t1; SET @@session.time_zone = default; +reset master; CREATE TABLE t1 (date timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, a int(11) default NULL); SET @@session.time_zone='+01:00'; insert into t1 values('2008-12-23 19:39:39',1); diff --git a/mysql-test/suite/rpl/t/rpl_timezone.test b/mysql-test/suite/rpl/t/rpl_timezone.test index 85f60ae01cf..40a2a4444b9 100644 --- a/mysql-test/suite/rpl/t/rpl_timezone.test +++ b/mysql-test/suite/rpl/t/rpl_timezone.test @@ -170,6 +170,7 @@ SET @@session.time_zone = default; # Insert 2 values into timestamp col with different time_zone. Check result. --connection master +reset master; CREATE TABLE t1 (date timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, a int(11) default NULL); SET @@session.time_zone='+01:00';