database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-25228 JSON_TABLE: Server crashes in Query_cache::unlink_table.

Browse Source 
JSON_TABLE shojldn't be counted in the query_cache.
This commit is contained in:
Alexey Botchkov
2021-03-24 15:05:24 +04:00
parent 7075955f4e
commit 707d8653c4
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/main/query_cache.result
View File

@ -2227,6 +2227,13 @@ SHOW STATUS LIKE 'Qcache_inserts';
Variable_name Value Variable_name Value
Qcache_inserts 0 Qcache_inserts 0
drop table t1; drop table t1;
#
# MDEV-25228 JSON_TABLE: Server crashes in Query_cache::unlink_table.
#
CREATE TABLE t (a INT);
SELECT * FROM t JOIN JSON_TABLE('{}' , '$' COLUMNS(b FOR ORDINALITY)) AS jt;
a b
DROP TABLE t;
restore defaults restore defaults
SET GLOBAL query_cache_type= default; SET GLOBAL query_cache_type= default;
SET GLOBAL query_cache_size=@save_query_cache_size; SET GLOBAL query_cache_size=@save_query_cache_size;

7
mysql-test/main/query_cache.test
View File

@ -1818,6 +1818,13 @@ select * from t1, json_table(t1.a, '$' columns (f varchar(20) path '$.a')) as jt
SHOW STATUS LIKE 'Qcache_inserts'; SHOW STATUS LIKE 'Qcache_inserts';
drop table t1; drop table t1;
--echo #
--echo # MDEV-25228 JSON_TABLE: Server crashes in Query_cache::unlink_table.
--echo #
CREATE TABLE t (a INT);
SELECT * FROM t JOIN JSON_TABLE('{}' , '$' COLUMNS(b FOR ORDINALITY)) AS jt;
DROP TABLE t;
--echo restore defaults --echo restore defaults
SET GLOBAL query_cache_type= default; SET GLOBAL query_cache_type= default;
SET GLOBAL query_cache_size=@save_query_cache_size; SET GLOBAL query_cache_size=@save_query_cache_size;

6
sql/sql_cache.cc
View File

@ -4094,11 +4094,13 @@ Query_cache::process_and_count_tables(THD *thd, TABLE_LIST *tables_used,
*tables_type|= HA_CACHE_TBL_NONTRANSACT; *tables_type|= HA_CACHE_TBL_NONTRANSACT;
continue; continue;
} }
if (tables_used->derived) if (tables_used->derived || tables_used->table_function)
{ {
DBUG_PRINT("qcache", ("table: %s", tables_used->alias.str)); DBUG_PRINT("qcache", ("table: %s", tables_used->alias.str));
table_count--; table_count--;
DBUG_PRINT("qcache", ("derived table skipped")); DBUG_PRINT("qcache", (tables_used->table_function ?
"table function skipped" :
"derived table skipped"));
continue; continue;
} }