diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-23 22:36:21 -0300 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-23 22:36:21 -0300 |
| commit | d6415dc8cd013b636bff3a69a903abd2da16886b (patch) | |
| tree | 1b0b99de278ce9cb5a458afc12e6cc2280a885b6 /sql/sql_cache.cc | |
| parent | a66465a09123b2b43637202c3e44b8bfc283e9d8 (diff) | |
| parent | 25c849dbd3617d2c2b1ae84a2086d3067e95fd09 (diff) | |
| download | mariadb-git-d6415dc8cd013b636bff3a69a903abd2da16886b.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index b73de320ef5..d6dc9edc502 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -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); |