Commit 01f8be17 authored by Gleb Shchepa's avatar Gleb Shchepa
Browse files

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

parents 80505cc9 eaa10e76

sql/sp_head.cc

+1 −2
Original line number Diff line number Diff line
@@ -1949,8 +1949,7 @@ sp_head::execute_procedure(THD *thd, List<Item> *args) 
      thd->rollback_item_tree_changes();

    }



    DBUG_PRINT("info",(" %.*s: eval args done",

                       (int) m_name.length, m_name.str));

    DBUG_PRINT("info",(" %.*s: eval args done", m_name.length, m_name.str));

  }

  if (!(m_flags & LOG_SLOW_STATEMENTS) && thd->enable_slow_log)

  {