1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge 10.4 into 10.5

This commit is contained in:
Marko Mäkelä
2020-11-17 18:15:13 +02:00
5 changed files with 23 additions and 1 deletions

View File

@ -9,6 +9,8 @@
# event, which changes the test output.
--source include/not_windows.inc
--source include/no_protocol.inc
# Work around MDEV-24232: WSREP causes extra operations on LOCK_thd_data etc.
--source include/have_wsrep.inc
--source ../include/wait_for_pfs_thread_count.inc
--disable_query_log