summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_time.result
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2001-11-03 15:18:09 +0200
committermonty@hundin.mysql.fi <>2001-11-03 15:18:09 +0200
commit8cd4c2358de1581b36faa4d197508e232b1390b4 (patch)
treed5d2a601f2e922dce27a5041739103c6468d4cf8 /mysql-test/r/func_time.result
parentdaa4229a3d54f72d1704e38355dacc0a7cbf1547 (diff)
downloadmariadb-git-8cd4c2358de1581b36faa4d197508e232b1390b4.tar.gz
Fix that mysqladmin shutdown can be interrupted with ^C
Fixed bug with BLOB keys in BDB tables Fixed problem with MERGE tables on OS with 32 bit files Fixed that TIME_TO_SEC() works with negative times
Diffstat (limited to 'mysql-test/r/func_time.result')
-rw-r--r--mysql-test/r/func_time.result2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result
index e2e86723e31..71fc7e4b90b 100644
--- a/mysql-test/r/func_time.result
+++ b/mysql-test/r/func_time.result
@@ -8,6 +8,8 @@ from_unixtime(unix_timestamp("1994-03-02 10:11:12")) from_unixtime(unix_timestam
1994-03-02 10:11:12 1994-03-02 10:11:12 19940302101112
sec_to_time(9001) sec_to_time(9001)+0 time_to_sec("15:12:22") sec_to_time(time_to_sec("0:30:47")/6.21)
02:30:01 23001 54742 00:04:57
+sec_to_time(time_to_sec('-838:59:59'))
+-838:59:59
now()-curdate()*1000000-curtime()
0
strcmp(current_timestamp(),concat(current_date()," ",current_time()))