1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge

This commit is contained in:
Sergey Petrunya
2009-09-15 14:46:35 +04:00
190 changed files with 9597 additions and 3548 deletions

View File

@@ -1450,8 +1450,7 @@ Event_job_data::execute(THD *thd, bool drop)
DBUG_ASSERT(sphead);
if (thd->enable_slow_log)
sphead->m_flags|= sp_head::LOG_SLOW_STATEMENTS;
sphead->m_flags|= sp_head::LOG_SLOW_STATEMENTS;
sphead->m_flags|= sp_head::LOG_GENERAL_LOG;
sphead->set_info(0, 0, &thd->lex->sp_chistics, sql_mode);