Commit 5898c53c authored by Gleb Shchepa's avatar Gleb Shchepa

manual merge 5.0-5.1.29-rc --> 5.1-5.1.29-rc

parents b4c5cafe 1ce81aac
...@@ -1949,8 +1949,7 @@ sp_head::execute_procedure(THD *thd, List<Item> *args) ...@@ -1949,8 +1949,7 @@ sp_head::execute_procedure(THD *thd, List<Item> *args)
thd->rollback_item_tree_changes(); thd->rollback_item_tree_changes();
} }
DBUG_PRINT("info",(" %.*s: eval args done", DBUG_PRINT("info",(" %.*s: eval args done", m_name.length, m_name.str));
(int) m_name.length, m_name.str));
} }
if (!(m_flags & LOG_SLOW_STATEMENTS) && thd->enable_slow_log) if (!(m_flags & LOG_SLOW_STATEMENTS) && thd->enable_slow_log)
{ {
......
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