summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2019-03-14 14:40:33 +0400
committerAlexander Barkov <bar@mariadb.com>2019-03-14 14:40:33 +0400
commitddfa722a03ab3649783f8798df02d94a8a8ef6e3 (patch)
tree480cab3ac089873f8339102983358f374df386e0 /mysql-test
parent49c49e630bdc5fc57dd534b23d8c59b603d36ad0 (diff)
downloadmariadb-git-ddfa722a03ab3649783f8798df02d94a8a8ef6e3.tar.gz
MDEV-18626 ASAN stack-buffer-overflow in int10_to_str / make_date_time upon DATE_FORMAT
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/func_time.result6
-rw-r--r--mysql-test/t/func_time.test7
2 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result
index 19877b17901..25f3484b718 100644
--- a/mysql-test/r/func_time.result
+++ b/mysql-test/r/func_time.result
@@ -3444,5 +3444,11 @@ foo
Warnings:
Warning 1292 Truncated incorrect DECIMAL value: '2012-12-12 12:12:12'
#
+# MDEV-18626 ASAN stack-buffer-overflow in int10_to_str / make_date_time upon DATE_FORMAT
+#
+SELECT DATE_FORMAT(100000000000, '%j');
+DATE_FORMAT(100000000000, '%j')
+NULL
+#
# End of 10.1 tests
#
diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test
index 05c19a9730a..eabff67ca62 100644
--- a/mysql-test/t/func_time.test
+++ b/mysql-test/t/func_time.test
@@ -1930,5 +1930,12 @@ DROP TABLE t1;
SELECT NULLIF('foo', FROM_UNIXTIME('2012-12-12 12:12:12', TRIM(0)));
--echo #
+--echo # MDEV-18626 ASAN stack-buffer-overflow in int10_to_str / make_date_time upon DATE_FORMAT
+--echo #
+
+SELECT DATE_FORMAT(100000000000, '%j');
+
+
+--echo #
--echo # End of 10.1 tests
--echo #