database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge of mysql-5.1-bugteam into mysql-trunk-merge.

Browse Source
This commit is contained in:
Davi Arnaut
2010-07-23 22:36:21 -03:00
parent 936217aac9 32372a756f
commit bba8d5ca9b
4 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_cache.cc
View File

@ -1673,7 +1673,8 @@ 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->stmt_da->disable_status();
if (!thd->stmt_da->is_set())
thd->stmt_da->disable_status();
BLOCK_UNLOCK_RD(query_block);
MYSQL_QUERY_CACHE_HIT(thd->query(), (ulong) thd->limit_found_rows);