diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
| commit | 0accbd0364e0333e0b119aa9ce93e34ded9df6cb (patch) | |
| tree | bdf0738c29dc1f57fbfba3a1754524e238f15b52 /sql/sql_cache.cc | |
| parent | 37f87d73ae8dc6c30594867b40a5d70159acf63c (diff) | |
| download | mariadb-git-0accbd0364e0333e0b119aa9ce93e34ded9df6cb.tar.gz | |
lots of post-merge changes
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index a536c5b35b4..30dd835e9eb 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -341,6 +341,7 @@ TODO list: #include "../storage/myisammrg/ha_myisammrg.h" #include "../storage/myisammrg/myrg_def.h" #include "probes_mysql.h" +#include "log_slow.h" #ifdef EMBEDDED_LIBRARY #include "emb_qcache.h" @@ -945,7 +946,6 @@ Query_cache::abort(Query_cache_tls *query_cache_tls) if (try_lock()) DBUG_VOID_RETURN; - } /* While we were waiting another thread might have changed the status @@ -997,7 +997,6 @@ void Query_cache::end_of_result(THD *thd) if (try_lock()) DBUG_VOID_RETURN; - } query_block= query_cache_tls->first_query_block; if (query_block) |