1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compiler error on Win64 - do not truncate pointer in DBUG

Browse Source 
Fix truncation warning on Windows, in a populart header, with a cast.
This commit is contained in:
Vladislav Vaintroub 2017-10-03 08:17:14 +00:00
parent fcf631eafb
commit c3a44c2701
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/item_func.h
View File

@ -489,8 +489,8 @@ public:
bool get_date_from_date_op(MYSQL_TIME *ltime, ulonglong fuzzydate) bool get_date_from_date_op(MYSQL_TIME *ltime, ulonglong fuzzydate)
{ {
return date_op(ltime, return date_op(ltime,
fuzzydate | (uint)(fuzzydate |
(field_type() == MYSQL_TYPE_TIME ? TIME_TIME_ONLY : 0)); (field_type() == MYSQL_TYPE_TIME ? TIME_TIME_ONLY : 0)));
} }
// Value methods that involve conversion // Value methods that involve conversion

4
sql/sp_head.cc
View File

@ -2343,8 +2343,8 @@ sp_head::backpatch_goto(THD *thd, sp_label *lab,sp_label *lab_begin_block)
if (bp->instr_type == GOTO) if (bp->instr_type == GOTO)
{ {
DBUG_PRINT("info", DBUG_PRINT("info",
("backpatch_goto: (m_ip %d, label 0x%lx <%s>) to dest %d", ("backpatch_goto: (m_ip %d, label %p <%s>) to dest %d",
bp->instr->m_ip, (ulong) lab, lab->name.str, dest)); bp->instr->m_ip, lab, lab->name.str, dest));
bp->instr->backpatch(dest, lab->ctx); bp->instr->backpatch(dest, lab->ctx);
// Jump resolved, remove from the list // Jump resolved, remove from the list
li.remove(); li.remove();