summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_sapdb.result
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2005-11-01 13:00:02 +0200
committerunknown <monty@mysql.com>2005-11-01 13:00:02 +0200
commitfffe74170576439325ae7b59bf56e55bbeeee5c4 (patch)
tree48f465a2fa16bd4e275d38c29d8c85701e758f58 /mysql-test/r/func_sapdb.result
parentcc953ed32a8cf5245aa1068bc6b7463992d2986c (diff)
downloadmariadb-git-fffe74170576439325ae7b59bf56e55bbeeee5c4.tar.gz
Review of new pushed code
Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort) Mark that add_time(), time_diff() and str_to_date() can return null values myisam/mi_check.c: keyoffset is not a position (no %lx here) mysql-test/r/func_sapdb.result: Fixed test after marking that timediff() can return NULL sql/item_func.cc: Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort) sql/item_timefunc.cc: Mark that add_time and str_to_date() can return null values sql/item_timefunc.h: Mark that time_diff can return 0 sql/spatial.cc: Simple cleanups during review of new code
Diffstat (limited to 'mysql-test/r/func_sapdb.result')
-rw-r--r--mysql-test/r/func_sapdb.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/func_sapdb.result b/mysql-test/r/func_sapdb.result
index 68c3baa7bde..ea40e1559fd 100644
--- a/mysql-test/r/func_sapdb.result
+++ b/mysql-test/r/func_sapdb.result
@@ -170,8 +170,8 @@ Field Type Null Key Default Extra
f1 date 0000-00-00
f2 datetime YES NULL
f3 time YES NULL
-f4 time 00:00:00
-f5 time 00:00:00
+f4 time YES NULL
+f5 time YES NULL
f6 time 00:00:00
f7 datetime YES NULL
f8 date YES NULL