diff options
author | Sergei Golubchik <sergii@pisem.net> | 2011-11-03 23:39:53 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-03 23:39:53 +0100 |
commit | 6edd76785c2fff55f1869ef816da13a8bab6151d (patch) | |
tree | c987eb9a81d19b6544fc6688632bedd80f7622d1 /sql/item_func.cc | |
parent | 0e007344eae972b9be7d88ca43373cb33662ac1c (diff) | |
parent | 11400de10cdfa9047904539fb9e7fbff611d9391 (diff) | |
download | mariadb-git-6edd76785c2fff55f1869ef816da13a8bab6151d.tar.gz |
merge
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r-- | sql/item_func.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index c765d142285..1c6a9c23b26 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -2730,7 +2730,7 @@ void Item_func_min_max::fix_length_and_dec() 0 Otherwise */ -bool Item_func_min_max::get_date(MYSQL_TIME *ltime, uint fuzzy_date) +bool Item_func_min_max::get_date(MYSQL_TIME *ltime, ulonglong fuzzy_date) { longlong UNINIT_VAR(min_max); DBUG_ASSERT(fixed == 1); |