summaryrefslogtreecommitdiff
path: root/sql/item_timefunc.h
diff options
context:
space:
mode:
Diffstat (limited to 'sql/item_timefunc.h')
-rw-r--r--sql/item_timefunc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index 36be86cd89c..b28daed202b 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -765,7 +765,7 @@ public:
const char *func_name() const { return "timediff"; }
void fix_length_and_dec()
{
- decimals= NOT_FIXED_DEC;
+ decimals= max(args[0]->decimals, args[1]->decimals);
Item_timefunc::fix_length_and_dec();
maybe_null= 1;
}