diff options
| author | hf@deer.(none) <> | 2003-09-26 15:40:26 +0500 |
|---|---|---|
| committer | hf@deer.(none) <> | 2003-09-26 15:40:26 +0500 |
| commit | 5f8e7fef2746ece1973116db739c6604cc156b21 (patch) | |
| tree | b80c6147c3a9929ec4e00bac55883c6d575ac2a4 /sql/sql_cache.cc | |
| parent | d5d4923107a2f8d3455debfe6ab8b22b5793f6cf (diff) | |
| parent | ba8fa76fa20f400d8adfe2aa14231a682df9ba79 (diff) | |
| download | mariadb-git-5f8e7fef2746ece1973116db739c6604cc156b21.tar.gz | |
Merge
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index fb86f52ab6e..9460b6cf577 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -1002,6 +1002,7 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length) Query_cache_table *table = block_table->parent; table_list.db = table->db(); table_list.alias= table_list.real_name= table->table(); +#ifndef NO_EMBEDDED_ACCESS_CHECKS if (check_table_access(thd,SELECT_ACL,&table_list,1)) { DBUG_PRINT("qcache", @@ -1021,6 +1022,7 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length) thd->lex.safe_to_cache_query= 0; // Don't try to cache this goto err_unlock; // Parse query } +#endif /*!NO_EMBEDDED_ACCESS_CHECKS*/ if (check_tables && !handler::caching_allowed(thd, table->db(), table->key_length(), table->type())) |