diff options
| -rw-r--r-- | sql/item_func.h | 4 | ||||
| -rw-r--r-- | sql/sp_head.cc | 4 |
2 files changed, 4 insertions, 4 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 diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 83884502342..645703d78a4 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -2343,8 +2343,8 @@ sp_head::backpatch_goto(THD *thd, sp_label *lab,sp_label *lab_begin_block) if (bp->instr_type == GOTO) { DBUG_PRINT("info", - ("backpatch_goto: (m_ip %d, label 0x%lx <%s>) to dest %d", - bp->instr->m_ip, (ulong) lab, lab->name.str, dest)); + ("backpatch_goto: (m_ip %d, label %p <%s>) to dest %d", + bp->instr->m_ip, lab, lab->name.str, dest)); bp->instr->backpatch(dest, lab->ctx); // Jump resolved, remove from the list li.remove(); |