summaryrefslogtreecommitdiff
path: root/mysql-test/t/variables.test
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2010-06-04 17:10:22 +0300
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2010-06-04 17:10:22 +0300
commitac738d8265b665dc90be0a7977468096ee463c78 (patch)
treee36c07742e17423e4748490721378b3ed78f54cf /mysql-test/t/variables.test
parent517f586762a5c775f46668fedfa10c3c802e7f18 (diff)
parent121e04732ea3b5edf36335f827cc5bcb08fb7665 (diff)
downloadmariadb-git-ac738d8265b665dc90be0a7977468096ee463c78.tar.gz
merge
Diffstat (limited to 'mysql-test/t/variables.test')
-rw-r--r--mysql-test/t/variables.test15
1 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index 7b3ea599b9e..d5929041e8a 100644
--- a/mysql-test/t/variables.test
+++ b/mysql-test/t/variables.test
@@ -785,6 +785,21 @@ show variables like 'hostname';
--echo # Test 'myisam_mmap_size' option is not dynamic
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
SET @@myisam_mmap_size= 500M;
+
+
+--echo #
+--echo # Bug #52315: utc_date() crashes when system time > year 2037
+--echo #
+
+--error 0, ER_UNKNOWN_ERROR
+SET TIMESTAMP=2*1024*1024*1024;
+--echo #Should not crash
+--disable_result_log
+SELECT UTC_DATE();
+--enable_result_log
+SET TIMESTAMP=DEFAULT;
+
+
--echo End of 5.0 tests
#