summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorElena Stepanova <elenst@montyprogram.com>2014-07-28 13:31:46 +0400
committerElena Stepanova <elenst@montyprogram.com>2014-07-28 13:31:46 +0400
commit0aa40c35ca50f06a4baa9c8bfb6ba9e402bd773b (patch)
tree84f82a16b907d097e55e062acea7575d43a2a3b8 /mysql-test
parentc57c5be12a2d7d066cc508043da87cf51eb75cd3 (diff)
downloadmariadb-git-0aa40c35ca50f06a4baa9c8bfb6ba9e402bd773b.tar.gz
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
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/suite/engines/iuds/r/insert_time.result4
-rw-r--r--mysql-test/suite/engines/iuds/suite.opt2
2 files changed, 4 insertions, 2 deletions
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
+