diff options
| author | unknown <andrey@lmy004.> | 2006-03-01 03:49:31 +0100 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2006-03-01 03:49:31 +0100 |
| commit | b22706e4375d7ec79f1930290b48411638c6e4e9 (patch) | |
| tree | 33c8ec549e474d230dec2bf2cfb46049bf4be52f /sql/sp_head.cc | |
| parent | 3c8432a7b84acde1c35a1a722bab10c962c25136 (diff) | |
| download | mariadb-git-b22706e4375d7ec79f1930290b48411638c6e4e9.tar.gz | |
fix for bug #16426, post fixes
mysql-test/r/events_slow_query.result:
fix result
mysql-test/t/events_slow_query.test:
create different event because the executor is buggy and won't catch the difference if
the memory address does not change (will be reported as bug separately)
sql/sp_head.cc:
this was an error which passed code review. thd->enable_slow_log could be
changed and it should not be relied
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index c0e43e2422e..d5b2fc0d898 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1412,7 +1412,7 @@ sp_head::execute_procedure(THD *thd, List<Item> *args) uint params = m_pcont->context_pvars(); sp_rcontext *save_spcont, *octx; sp_rcontext *nctx = NULL; - bool save_enable_slow_log; + bool save_enable_slow_log= false; DBUG_ENTER("sp_head::execute_procedure"); DBUG_PRINT("info", ("procedure %s", m_name.str)); @@ -1522,7 +1522,7 @@ sp_head::execute_procedure(THD *thd, List<Item> *args) if (!err_status) err_status= execute(thd); - if (thd->enable_slow_log && !(m_flags & LOG_SLOW_STATEMENTS)) + if (save_enable_slow_log && !(m_flags & LOG_SLOW_STATEMENTS)) thd->enable_slow_log= save_enable_slow_log; /* |