From 0aa40c35ca50f06a4baa9c8bfb6ba9e402bd773b Mon Sep 17 00:00:00 2001 From: Elena Stepanova Date: Mon, 28 Jul 2014 13:31:46 +0400 Subject: [PATCH] MDEV-6378 mtr engines iuds time tests fail - adjusted a test result according to the change made for MDEV-6100; - added explicit timezone for engines/iuds, since MTR in MariaDB does not set it like MySQL's, and tests with constant TIMESTAMP can have different outcome --- mysql-test/suite/engines/iuds/r/insert_time.result | 4 ++-- mysql-test/suite/engines/iuds/suite.opt | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 mysql-test/suite/engines/iuds/suite.opt diff --git a/mysql-test/suite/engines/iuds/r/insert_time.result b/mysql-test/suite/engines/iuds/r/insert_time.result index 0f588274fc1..f67f721b4fc 100644 --- a/mysql-test/suite/engines/iuds/r/insert_time.result +++ b/mysql-test/suite/engines/iuds/r/insert_time.result @@ -5035,9 +5035,9 @@ CAST(0.2359591234567e6 AS TIME) 23:59:59 SELECT CAST(0.2359591234567e+30 AS TIME); CAST(0.2359591234567e+30 AS TIME) -NULL +838:59:59 Warnings: -Warning 1292 Incorrect datetime value: '2.359591234567e29' +Warning 1292 Truncated incorrect time value: '2.359591234567e29' select cast('100:55:50' as time) < cast('24:00:00' as time); cast('100:55:50' as time) < cast('24:00:00' as time) 0 diff --git a/mysql-test/suite/engines/iuds/suite.opt b/mysql-test/suite/engines/iuds/suite.opt new file mode 100644 index 00000000000..e5648163418 --- /dev/null +++ b/mysql-test/suite/engines/iuds/suite.opt @@ -0,0 +1,2 @@ +--timezone=GMT-3 +