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 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2021-09-30 10:38:44 +03:00
parent 260649de04 be803f037f
commit a49e394399
49 changed files with 819 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/main/lock_sync.test
View File

@ -235,6 +235,8 @@ let $con_aux2= con2;
let $table= t1;
connection con1;
set @save_dbug=@@debug_dbug;
set debug_dbug="+d,cache_sp_in_show_create";
--echo # Cache all functions used in the tests below so statements
--echo # calling them won't need to open and lock mysql.proc table
--echo # and we can assume that each statement locks its tables
@ -260,6 +262,7 @@ show create function f14;
show create function f15;
show create function f16;
show create function f17;
set debug_dbug=@save_dbug;
--enable_result_log
connection default;