manual merge 5.0-5.1.29-rc --> 5.1-5.1.29-rc
This commit is contained in:
commit
5898c53c54
@ -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)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user