summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2018-03-15 10:23:42 +0400
committerAlexander Barkov <bar@mariadb.org>2018-03-15 10:23:42 +0400
commitefb9dec2b9f7dc60b2b45bf9d368c665c9132795 (patch)
treeb595e570988b7cc9cdd146f1b5a81d3b93c03878
parent8152c52e1af608da5d288a4e6fc82e2d804e64cd (diff)
downloadmariadb-git-efb9dec2b9f7dc60b2b45bf9d368c665c9132795.tar.gz
A 32bit cleanup for MDEV-14452 Precision in INTERVAL xxx DAY_MICROSECOND parsed wrong?
"mtr func_date_add" failed on 32-bit platforms. Removing a wrong case to "long". Both values[] and log_10_int[] are arrays of "ulonglong", no cast is needed.
-rw-r--r--sql/item_timefunc.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index d7506026c62..44105bd4a12 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -732,9 +732,9 @@ static bool get_interval_info(const char *str,uint length,CHARSET_INFO *cs,
if (transform_msec && field_length > 0)
{
if (field_length < 6)
- values[count - 1] *= (long) log_10_int[6 - field_length];
+ values[count - 1] *= log_10_int[6 - field_length];
else if (field_length > 6)
- values[count - 1] /= (long) log_10_int[field_length - 6];
+ values[count - 1] /= log_10_int[field_length - 6];
}
return (str != end);