diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-05 17:51:00 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-05 17:51:00 +0300 |
| commit | 120425ccfda32bb439c3f510f41532cfe3aa79de (patch) | |
| tree | 66fdd703f7b1920dc0393b84b8a70c46922bc43a /sql/sql_cache.cc | |
| parent | 45c2de8ffdae93625bdcbdf2f82d0207253d61b9 (diff) | |
| download | mariadb-git-120425ccfda32bb439c3f510f41532cfe3aa79de.tar.gz | |
Fix automerge: use 'thd->query()' instead of 'thd->query'.
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 0bb255ee123..7190c63d057 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -1630,13 +1630,13 @@ def_week_frmt: %lu, in_trans: %d, autocommit: %d", thd->main_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 } |