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

Merge branch '10.4' into 10.5

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-07-27 13:12:30 +02:00
parent 7564be1352 9854fb6fa7
commit f291c3df2c
423 changed files with 1551 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/main/query_cache_notembedded.test
View File

@ -113,6 +113,7 @@ disconnect root2;
# query in QC from normal execution and SP (Bug#6897)
# improved to also test Bug#3583 and Bug#12990
#
--disable_ps2_protocol
flush query cache;
reset query cache;
flush status;
@ -191,6 +192,7 @@ drop procedure f2;
drop procedure f3;
drop procedure f4;
drop table t1;
--enable_ps2_protocol
#
# Bug#14767 INSERT in SF + concurrent SELECT with query cache