summaryrefslogtreecommitdiff
path: root/sql/item_timefunc.cc
diff options
context:
space:
mode:
authormonty@mysql.com/narttu.mysql.fi <>2006-11-30 18:25:05 +0200
committermonty@mysql.com/narttu.mysql.fi <>2006-11-30 18:25:05 +0200
commit3d4095603952aca95892d55fb1ef435132de1197 (patch)
tree66e16346c4fdfa20f915fdf53ea1f9419c07331c /sql/item_timefunc.cc
parent0bee93e038edf9a70ffe9d10cd93883a3288802f (diff)
downloadmariadb-git-3d4095603952aca95892d55fb1ef435132de1197.tar.gz
Fixed portability issue in my_thr_init.c (was added in my last push)
Fixed compiler warnings (detected by VC++): - Removed not used variables - Added casts - Fixed wrong assignments to bool - Fixed wrong calls with bool arguments - Added missing argument to store(longlong), which caused wrong store method to be called.
Diffstat (limited to 'sql/item_timefunc.cc')
-rw-r--r--sql/item_timefunc.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index 9d9108dd301..ca593664299 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -110,7 +110,6 @@ static bool make_datetime_with_warn(date_time_format_types format, TIME *ltime,
String *str)
{
int warning= 0;
- bool rc;
if (make_datetime(format, ltime, str))
return 1;
@@ -1645,7 +1644,7 @@ double Item_func_sysdate_local::val_real()
{
DBUG_ASSERT(fixed == 1);
store_now_in_TIME(&ltime);
- return (longlong) TIME_to_ulonglong_datetime(&ltime);
+ return (double) TIME_to_ulonglong_datetime(&ltime);
}