summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-06-10 15:42:55 +0200
committerSergei Golubchik <sergii@pisem.net>2011-06-10 15:42:55 +0200
commitf1a5c49c4e9cee40d884193dd7477aff0cbffc53 (patch)
tree6d9ac661eaa5ed19834691bab35374e609f097ec /sql/item_strfunc.cc
parent10fedf675a1de161aec4ee09026db35400344507 (diff)
downloadmariadb-git-f1a5c49c4e9cee40d884193dd7477aff0cbffc53.tar.gz
various fixes for buildbot failures
Diffstat (limited to 'sql/item_strfunc.cc')
-rw-r--r--sql/item_strfunc.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index c765571a318..453773478d8 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -4186,7 +4186,7 @@ bool Item_dyncol_get::get_date(MYSQL_TIME *ltime, uint fuzzy_date)
return 0;
}
/* let double_to_datetime_with_warn() issue the warning message */
- val.double_value= ULONGLONG_MAX;
+ val.double_value= static_cast<double>(ULONGLONG_MAX);
/* fall_trough */
case DYN_COL_DOUBLE:
if (double_to_datetime_with_warn(val.double_value, ltime, fuzzy_date,