summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/main/disabled.def1
-rw-r--r--mysql-test/main/func_time.result15
-rw-r--r--mysql-test/main/func_time.test8
3 files changed, 23 insertions, 1 deletions
diff --git a/mysql-test/main/disabled.def b/mysql-test/main/disabled.def
index 5f8766c8aa3..e83ff00d10b 100644
--- a/mysql-test/main/disabled.def
+++ b/mysql-test/main/disabled.def
@@ -22,4 +22,3 @@ innodb_bug12902967 : broken upstream
file_contents : MDEV-6526 these files are not installed anymore
max_statement_time : cannot possibly work, depends on timing
connect-abstract : waiting for libmariadb update
-func_time : new tests fail on architectures with sizeof(long)=4. Barkov is working on fixing this.
diff --git a/mysql-test/main/func_time.result b/mysql-test/main/func_time.result
index c56d4da956a..8dcb7e36fcd 100644
--- a/mysql-test/main/func_time.result
+++ b/mysql-test/main/func_time.result
@@ -6098,3 +6098,18 @@ Message Truncated incorrect time value: '87648576:59:59.000001'
Level Warning
Code 1292
Message Truncated incorrect time value: '87648576:59:59.000001'
+#
+# MDEV-17400 The result of TIME('42949672965959-01') depends on architecture
+#
+SELECT TIME('42949672955959-01'), TIME('42949672965959-01');
+TIME('42949672955959-01') TIME('42949672965959-01')
+NULL NULL
+Warnings:
+Warning 1292 Truncated incorrect time value: '42949672955959-01'
+Warning 1292 Truncated incorrect time value: '42949672965959-01'
+SELECT TIME('18446744073709551615-01'), TIME('18446744073709551616-01');
+TIME('18446744073709551615-01') TIME('18446744073709551616-01')
+NULL NULL
+Warnings:
+Warning 1292 Truncated incorrect time value: '18446744073709551615-01'
+Warning 1292 Truncated incorrect time value: '18446744073709551616-01'
diff --git a/mysql-test/main/func_time.test b/mysql-test/main/func_time.test
index 2b031dbf3de..da00ff0eb45 100644
--- a/mysql-test/main/func_time.test
+++ b/mysql-test/main/func_time.test
@@ -3006,3 +3006,11 @@ SELECT
--horizontal_results
+
+
+--echo #
+--echo # MDEV-17400 The result of TIME('42949672965959-01') depends on architecture
+--echo #
+
+SELECT TIME('42949672955959-01'), TIME('42949672965959-01');
+SELECT TIME('18446744073709551615-01'), TIME('18446744073709551616-01');