revision-id: 71be1731fe2f6546da2e0775904a6a7f9f0d7416 (mariadb-10.5.2-477-g71be1731fe2) parent(s): b1b756021476a8b2069dee574a1df12e848f9232 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2021-03-15 14:58:04 +0300 message: tmp --- mysql-test/main/query_cache.result | 8 ++++---- mysql-test/main/query_cache.test | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/mysql-test/main/query_cache.result b/mysql-test/main/query_cache.result index cc53791cb14..849e58d7464 100644 --- a/mysql-test/main/query_cache.result +++ b/mysql-test/main/query_cache.result @@ -2208,10 +2208,6 @@ Qcache_queries_in_cache 0 DROP FUNCTION foo; drop table t1; # -# MDEV-24858 SIGABRT in DbugExit from my_malloc in Query_cache::init_cache Regression -# -set global Query_cache_size=18446744073709547520; -# # MDEV-22301 JSON_TABLE: Queries are not inserted into query cache. # create table t1 (a text); @@ -2227,6 +2223,10 @@ SHOW STATUS LIKE 'Qcache_inserts'; Variable_name Value Qcache_inserts 1 drop table t1; +# +# MDEV-24858 SIGABRT in DbugExit from my_malloc in Query_cache::init_cache Regression +# +set global Query_cache_size=18446744073709547520; restore defaults SET GLOBAL query_cache_type= default; SET GLOBAL query_cache_size=@save_query_cache_size; diff --git a/mysql-test/main/query_cache.test b/mysql-test/main/query_cache.test index 0d747b97acc..49c069da653 100644 --- a/mysql-test/main/query_cache.test +++ b/mysql-test/main/query_cache.test @@ -1800,13 +1800,6 @@ show status like "Qcache_queries_in_cache"; DROP FUNCTION foo; drop table t1; ---echo # ---echo # MDEV-24858 SIGABRT in DbugExit from my_malloc in Query_cache::init_cache Regression ---echo # ---disable_warnings -set global Query_cache_size=18446744073709547520; ---enable_warnings - --echo # --echo # MDEV-22301 JSON_TABLE: Queries are not inserted into query cache. --echo # @@ -1818,6 +1811,13 @@ select * from t1, json_table(t1.a, '$' columns (f varchar(20) path '$.a')) as jt SHOW STATUS LIKE 'Qcache_inserts'; drop table t1; +--echo # +--echo # MDEV-24858 SIGABRT in DbugExit from my_malloc in Query_cache::init_cache Regression +--echo # +--disable_warnings +set global Query_cache_size=18446744073709547520; +--enable_warnings + --echo restore defaults SET GLOBAL query_cache_type= default; SET GLOBAL query_cache_size=@save_query_cache_size;