From 1f8126190b6b77336859ed04a165e1f737d66a80 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 16 Oct 2007 14:42:42 +0200 Subject: 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. --- mysql-test/t/query_cache.test | 39 --------------------------------------- 1 file changed, 39 deletions(-) (limited to 'mysql-test/t/query_cache.test') diff --git a/mysql-test/t/query_cache.test b/mysql-test/t/query_cache.test index 2cfe1ff4ccc..b3b5d08d23d 100644 --- a/mysql-test/t/query_cache.test +++ b/mysql-test/t/query_cache.test @@ -1,10 +1,5 @@ -- source include/have_query_cache.inc -# Disabled on embedded due to bug #30710, "query_cache.test fails on -# embedded w/ per-column privs test". Please re-enable when that bug -# is resolved. --- source include/not_embedded.inc - # # Tests with query cache # @@ -1255,40 +1250,6 @@ disconnect user1; disconnect user2; disconnect user3; -# -# Bug #30269 Query cache eats memory -# ---disable_warnings -DROP DATABASE IF EXISTS bug30269; ---enable_warnings -FLUSH STATUS; -CREATE DATABASE bug30269; -USE bug30269; -CREATE TABLE test1 (id int, name varchar(23)); -CREATE VIEW view1 AS SELECT * FROM test1; -INSERT INTO test1 VALUES (5, 'testit'); -GRANT SELECT (id) ON TABLE bug30269.test1 TO 'bug30269'@'localhost'; -GRANT SELECT ON TABLE bug30269.view1 TO 'bug30269'@'localhost'; -set global query_cache_size= 81920; -connect (bug30269, localhost, bug30269,,); -connection bug30269; -USE bug30269; -show status like 'Qcache_queries_in_cache'; ---echo # Select statement not stored in query cache because of column privileges. -SELECT id FROM test1 WHERE id>2; -show status like 'Qcache_queries_in_cache'; -SELECT id FROM view1 WHERE id>2; -show status like 'Qcache_queries_in_cache'; - -connection default; -DROP DATABASE bug30269; -disconnect bug30269; -DROP USER 'bug30269'@'localhost'; - -set GLOBAL query_cache_type=default; -set GLOBAL query_cache_limit=default; -set GLOBAL query_cache_min_res_unit=default; -set GLOBAL query_cache_size=default; --echo End of 5.0 tests # -- cgit v1.2.1