diff options
Diffstat (limited to 'mysql-test/suite/rpl/r/rpl_timezone.result')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_timezone.result | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_timezone.result b/mysql-test/suite/rpl/r/rpl_timezone.result index b9b890443eb..076f0ff20f1 100644 --- a/mysql-test/suite/rpl/r/rpl_timezone.result +++ b/mysql-test/suite/rpl/r/rpl_timezone.result @@ -45,7 +45,7 @@ connection master; connection master; delete from t1; set time_zone='UTC'; -load data infile '../../std_data/rpl_timezone2.dat' into table t1; +load data infile '../../std_data/rpl_timezone2.dat' ignore into table t1; Warnings: Warning 1265 Data truncated for column 't' at row 1 Warning 1261 Row 1 doesn't contain data for all columns @@ -125,6 +125,7 @@ connection master; CREATE TABLE t1 (a INT, b TIMESTAMP); INSERT INTO t1 VALUES (1, NOW()); SET @@session.time_zone='Japan'; +SET STATEMENT sql_mode = '' FOR UPDATE t1 SET b= '1970-01-01 08:59:59' WHERE a= 1; Warnings: Warning 1264 Out of range value for column 'b' at row 1 |