diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2009-09-15 14:46:35 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2009-09-15 14:46:35 +0400 |
| commit | 151e5d586cc59afb3c664d56d47265c964fe7fb1 (patch) | |
| tree | 1972ed60ad937e632cf111e7beafb2148a87efeb /sql/sql_cache.cc | |
| parent | 2083b7ddfd85b2bab837b73cb8357afcc2e893d8 (diff) | |
| parent | b495b3db2346a98650946ad5907ba3fe164eadc7 (diff) | |
| download | mariadb-git-151e5d586cc59afb3c664d56d47265c964fe7fb1.tar.gz | |
Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 66e5775b534..a97dcab0b55 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -1627,6 +1627,7 @@ def_week_frmt: %lu, in_trans: %d, autocommit: %d", thd->limit_found_rows = query->found_rows(); thd->status_var.last_query_cost= 0.0; + thd->query_plan_flags= (thd->query_plan_flags & ~QPLAN_QC_NO) | QPLAN_QC; thd->main_da.disable_status(); BLOCK_UNLOCK_RD(query_block); @@ -1635,6 +1636,10 @@ def_week_frmt: %lu, in_trans: %d, autocommit: %d", err_unlock: unlock(); err: + /* + query_plan_flags doesn't have to be changed here as it contains + QPLAN_QC_NO by default + */ DBUG_RETURN(0); // Query was not cached } |