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

Browse Source
This commit is contained in:
Marko Mäkelä
2024-10-03 09:31:39 +03:00
parent cc70ca7eab 170e4555e2
commit 7e0afb1c73
482 changed files with 4427 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/rpl/t/rpl_bug31076.test
View File

@@ -1,6 +1,6 @@
if (`SELECT $PS_PROTOCOL != 0`)
if (`SELECT $PS_PROTOCOL + $CURSOR_PROTOCOL > 0`)
{
--skip Need regular protocol but ps-protocol was specified
--skip Need regular protocol but ps-protocol and cursor-protocol were specified
}
source include/have_binlog_format_mixed_or_row.inc;