diff options
| author | msvensson@neptunus.(none) <> | 2006-12-04 19:28:38 +0100 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-12-04 19:28:38 +0100 |
| commit | 128b73fc36c858e457bf29ed44cb08f16677a9b5 (patch) | |
| tree | 4709d201720e18f147c369d52ae2cde47bec6b24 /sql/item_timefunc.cc | |
| parent | 544d0c909bd634c73e04cb018617c8cc9099147c (diff) | |
| parent | d253588c699ef2e589fb2d38aff7f78c8e25063c (diff) | |
| download | mariadb-git-128b73fc36c858e457bf29ed44cb08f16677a9b5.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 26a6b3f2009..8504434aed5 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; @@ -1646,7 +1645,7 @@ double Item_func_sysdate_local::val_real() { DBUG_ASSERT(fixed == 1); store_now_in_TIME(<ime); - return (longlong) TIME_to_ulonglong_datetime(<ime); + return (double) TIME_to_ulonglong_datetime(<ime); } |