database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +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/include/commit.inc
View File

@@ -6,6 +6,7 @@
## - $engine_type should be set
##
--disable_ps2_protocol
set sql_mode=no_engine_substitution;
eval set default_storage_engine = $engine_type;
set autocommit=1;
@@ -787,3 +788,4 @@ call p_verify_status_increment(2, 0, 2, 0);
drop table t1, t2, t3;
drop procedure p_verify_status_increment;
drop function f1;
--enable_ps2_protocol