summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_sapdb.result
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2005-11-01 15:54:30 +0200
committerunknown <monty@mysql.com>2005-11-01 15:54:30 +0200
commitee380a077782f87d80aae7a8c9c9ead51dfd8e7b (patch)
treea19fa82d4c5fc0f845231b5d75a45a0c36e0494d /mysql-test/r/func_sapdb.result
parentf9dbcd558a52652692c4593c93656431e4cbf043 (diff)
downloadmariadb-git-ee380a077782f87d80aae7a8c9c9ead51dfd8e7b.tar.gz
Reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort
Fix for bug #14536: SELECT @a,@a:=... fails with prepared statements mysql-test/r/func_sapdb.result: Correct tests after reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort) mysql-test/r/type_newdecimal.result: Correct tests after reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort) mysql-test/r/user_var.result: More test with SELECT @a:= mysql-test/t/disabled.def: Enable user_var.test for mysql-test/t/user_var.test: More test with SELECT @a:= sql/item.cc: Simple optimization during review of new code sql/item_func.cc: Reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort) sql/item_timefunc.h: timediff() can return NULL for not NULL arguments sql/sql_base.cc: Remove usage of current_thd() in mysql_make_view() sql/sql_lex.h: Remove usage of current_thd() in mysql_make_view() sql/sql_select.cc: Fix for bug #14536: SELECT @a,@a:=... fails with prepared statements sql/sql_view.cc: Remove usage of current_thd() in mysql_make_view() Simple optimization of new code sql/sql_view.h: Remove usage of current_thd() in mysql_make_view() sql/table.cc: Simple optimization 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 f209866d953..d984eee80fa 100644
--- a/mysql-test/r/func_sapdb.result
+++ b/mysql-test/r/func_sapdb.result
@@ -180,8 +180,8 @@ Field Type Null Key Default Extra
f1 date NO 0000-00-00
f2 datetime YES NULL
f3 time YES NULL
-f4 time NO 00:00:00
-f5 time NO 00:00:00
+f4 time YES NULL
+f5 time YES NULL
f6 time NO 00:00:00
f7 datetime YES NULL
f8 date YES NULL