diff options
author | Alexander Nozdrin <alik@sun.com> | 2009-11-06 18:28:25 +0300 |
---|---|---|
committer | Alexander Nozdrin <alik@sun.com> | 2009-11-06 18:28:25 +0300 |
commit | e6d79c2bc99e302a31fc0bbc885e8c6407092eba (patch) | |
tree | 894961090682e834a390c1897a2aa0d5b5a58a9a /sql/sql_cache.cc | |
parent | ea0bbb72480c8ad14370cbe9388e688601fbc6e9 (diff) | |
parent | 120425ccfda32bb439c3f510f41532cfe3aa79de (diff) | |
download | mariadb-git-e6d79c2bc99e302a31fc0bbc885e8c6407092eba.tar.gz |
Auto-merge from mysql-trunk-merge.
Diffstat (limited to 'sql/sql_cache.cc')
-rw-r--r-- | sql/sql_cache.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 8f806679102..35d2c886119 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -1652,13 +1652,13 @@ def_week_frmt: %lu, in_trans: %d, autocommit: %d", thd->stmt_da->disable_status(); BLOCK_UNLOCK_RD(query_block); - MYSQL_QUERY_CACHE_HIT(thd->query, (ulong) thd->limit_found_rows); + MYSQL_QUERY_CACHE_HIT(thd->query(), (ulong) thd->limit_found_rows); DBUG_RETURN(1); // Result sent to client err_unlock: unlock(); err: - MYSQL_QUERY_CACHE_MISS(thd->query); + MYSQL_QUERY_CACHE_MISS(thd->query()); DBUG_RETURN(0); // Query was not cached } |