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

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

Browse Source
This commit is contained in:
Sergey Petrunya
2009-09-15 14:46:35 +04:00
parent 2083b7ddfd b495b3db23
commit 151e5d586c
190 changed files with 9597 additions and 3548 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_cache.cc
View File

@@ -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
}