Commit c3a44c27 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

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

Fix truncation warning on Windows, in a populart header, with a cast.
parent fcf631ea
...@@ -489,8 +489,8 @@ class Item_func_hybrid_field_type: public Item_hybrid_func ...@@ -489,8 +489,8 @@ class Item_func_hybrid_field_type: public Item_hybrid_func
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
......
...@@ -2343,8 +2343,8 @@ sp_head::backpatch_goto(THD *thd, sp_label *lab,sp_label *lab_begin_block) ...@@ -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();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment