diff options
| author | unknown <thek@adventure.(none)> | 2007-10-16 14:42:42 +0200 |
|---|---|---|
| committer | unknown <thek@adventure.(none)> | 2007-10-16 14:42:42 +0200 |
| commit | 1f8126190b6b77336859ed04a165e1f737d66a80 (patch) | |
| tree | 864c1ee3099f0312b727ad1106b91824414486b4 /sql/sql_cache.cc | |
| parent | ded7fe7fd16d35b0a63a7a417b67fdd31df5033d (diff) | |
| download | mariadb-git-1f8126190b6b77336859ed04a165e1f737d66a80.tar.gz | |
Bug#30710 query_cache.test fails on embedded - per-column privs test
The embedded version of the server doesn't use column level grants, and
the compile directive NO_EMBEDDED_ACCESS_CHECKS should be checked instead of
the redundant HAVE_QUERY_CACHE (which is always the case) to determine if
column level grants should be compiled or not.
mysql-test/r/query_cache.result:
Updated result file
mysql-test/r/query_cache_notembedded.result:
Updated result file
mysql-test/t/query_cache.test:
Moved test with GRANT to query_cache_notembedded test.
mysql-test/t/query_cache_notembedded.test:
Moved test with GRANT to query_cache_notembedded test.
sql/sql_cache.cc:
Changed the conditional compilation directive to only compile column level grant
checks if NO_EMBEDDED_ACCESS_CHECKS isn't defined.
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index ada927fa467..56b048a4f9d 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -3240,7 +3240,7 @@ Query_cache::process_and_count_tables(THD *thd, TABLE_LIST *tables_used, for (; tables_used; tables_used= tables_used->next_global) { table_count++; -#ifdef HAVE_QUERY_CACHE +#ifndef NO_EMBEDDED_ACCESS_CHECKS /* Disable any attempt to store this statement if there are column level grants on any referenced tables. |