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.
This commit is contained in:
parent
ded7fe7fd1
commit
1f8126190b
@ -1650,37 +1650,4 @@ a (select count(*) from t2)
|
|||||||
3 0
|
3 0
|
||||||
4 0
|
4 0
|
||||||
drop table t1,t2;
|
drop table t1,t2;
|
||||||
DROP DATABASE IF EXISTS bug30269;
|
|
||||||
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;
|
|
||||||
USE bug30269;
|
|
||||||
show status like 'Qcache_queries_in_cache';
|
|
||||||
Variable_name Value
|
|
||||||
Qcache_queries_in_cache 0
|
|
||||||
# Select statement not stored in query cache because of column privileges.
|
|
||||||
SELECT id FROM test1 WHERE id>2;
|
|
||||||
id
|
|
||||||
5
|
|
||||||
show status like 'Qcache_queries_in_cache';
|
|
||||||
Variable_name Value
|
|
||||||
Qcache_queries_in_cache 0
|
|
||||||
SELECT id FROM view1 WHERE id>2;
|
|
||||||
id
|
|
||||||
5
|
|
||||||
show status like 'Qcache_queries_in_cache';
|
|
||||||
Variable_name Value
|
|
||||||
Qcache_queries_in_cache 1
|
|
||||||
DROP DATABASE 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;
|
|
||||||
End of 5.0 tests
|
End of 5.0 tests
|
||||||
|
@ -347,3 +347,36 @@ drop table t1;
|
|||||||
drop function f1;
|
drop function f1;
|
||||||
set GLOBAL query_cache_size=0;
|
set GLOBAL query_cache_size=0;
|
||||||
SET GLOBAL log_bin_trust_function_creators = 0;
|
SET GLOBAL log_bin_trust_function_creators = 0;
|
||||||
|
DROP DATABASE IF EXISTS bug30269;
|
||||||
|
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;
|
||||||
|
USE bug30269;
|
||||||
|
show status like 'Qcache_queries_in_cache';
|
||||||
|
Variable_name Value
|
||||||
|
Qcache_queries_in_cache 0
|
||||||
|
# Select statement not stored in query cache because of column privileges.
|
||||||
|
SELECT id FROM test1 WHERE id>2;
|
||||||
|
id
|
||||||
|
5
|
||||||
|
show status like 'Qcache_queries_in_cache';
|
||||||
|
Variable_name Value
|
||||||
|
Qcache_queries_in_cache 0
|
||||||
|
SELECT id FROM view1 WHERE id>2;
|
||||||
|
id
|
||||||
|
5
|
||||||
|
show status like 'Qcache_queries_in_cache';
|
||||||
|
Variable_name Value
|
||||||
|
Qcache_queries_in_cache 1
|
||||||
|
DROP DATABASE 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;
|
||||||
|
@ -1,10 +1,5 @@
|
|||||||
-- source include/have_query_cache.inc
|
-- 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
|
# Tests with query cache
|
||||||
#
|
#
|
||||||
@ -1255,40 +1250,6 @@ disconnect user1;
|
|||||||
disconnect user2;
|
disconnect user2;
|
||||||
disconnect user3;
|
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
|
--echo End of 5.0 tests
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -225,3 +225,39 @@ connection default;
|
|||||||
|
|
||||||
set GLOBAL query_cache_size=0;
|
set GLOBAL query_cache_size=0;
|
||||||
SET GLOBAL log_bin_trust_function_creators = 0;
|
SET GLOBAL log_bin_trust_function_creators = 0;
|
||||||
|
|
||||||
|
#
|
||||||
|
# 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;
|
||||||
|
|
||||||
|
@ -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)
|
for (; tables_used; tables_used= tables_used->next_global)
|
||||||
{
|
{
|
||||||
table_count++;
|
table_count++;
|
||||||
#ifdef HAVE_QUERY_CACHE
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
||||||
/*
|
/*
|
||||||
Disable any attempt to store this statement if there are
|
Disable any attempt to store this statement if there are
|
||||||
column level grants on any referenced tables.
|
column level grants on any referenced tables.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user