diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-10-03 08:17:14 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-10-03 08:17:14 +0000 |
| commit | c3a44c27017949aadbd27788562402f6cf7f0aa6 (patch) | |
| tree | 5fe94a2e6f7f446bb42cd7fbec700c1580f78099 /sql/item_func.h | |
| parent | fcf631eafb7455bafde3847b4ab13a6ff245a703 (diff) | |
| download | mariadb-git-c3a44c27017949aadbd27788562402f6cf7f0aa6.tar.gz | |
Fix compiler error on Win64 - do not truncate pointer in DBUG
Fix truncation warning on Windows, in a populart header, with a cast.
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 1d96c0d024e..46e8562b268 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -489,8 +489,8 @@ public: bool get_date_from_date_op(MYSQL_TIME *ltime, ulonglong fuzzydate) { return date_op(ltime, - fuzzydate | - (field_type() == MYSQL_TYPE_TIME ? TIME_TIME_ONLY : 0)); + (uint)(fuzzydate | + (field_type() == MYSQL_TYPE_TIME ? TIME_TIME_ONLY : 0))); } // Value methods that involve conversion |