mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge 10.5 into 10.6
This commit is contained in:
@ -1807,6 +1807,40 @@ show status like "Qcache_queries_in_cache";
|
||||
DROP FUNCTION foo;
|
||||
drop table t1;
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-33861: main.query_cache fails with embedded after
|
||||
--echo # enabling WITH_PROTECT_STATEMENT_MEMROOT
|
||||
--echo #
|
||||
|
||||
create table t1 (s1 int);
|
||||
--delimiter //
|
||||
create procedure f3 () begin
|
||||
select * from t1;
|
||||
end;
|
||||
//
|
||||
create procedure f4 () begin
|
||||
select * from t1;
|
||||
end;
|
||||
//
|
||||
--delimiter ;
|
||||
|
||||
Call f4();
|
||||
|
||||
cAll f3();
|
||||
|
||||
insert into t1 values (2);
|
||||
|
||||
caLl f3();
|
||||
|
||||
drop procedure f3;
|
||||
drop procedure f4;
|
||||
drop table t1;
|
||||
|
||||
|
||||
--echo #
|
||||
--echo # End of 10.4 tests
|
||||
--echo #
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-24858 SIGABRT in DbugExit from my_malloc in Query_cache::init_cache Regression
|
||||
--echo #
|
||||
@ -1816,6 +1850,10 @@ set global Query_cache_size=18446744073709547520;
|
||||
SET GLOBAL query_cache_size= @qc;
|
||||
--enable_warnings
|
||||
|
||||
--echo #
|
||||
--echo # End of 10.5 tests
|
||||
--echo #
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-22301 JSON_TABLE: Queries are not inserted into query cache.
|
||||
--echo #
|
||||
@ -1838,3 +1876,5 @@ DROP TABLE t;
|
||||
SET GLOBAL query_cache_type= default;
|
||||
SET GLOBAL query_cache_size=@save_query_cache_size;
|
||||
--enable_ps2_protocol
|
||||
|
||||
--echo # End of 10.6 tests
|
||||
|
Reference in New Issue
Block a user