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.6' into 10.11

Browse Source
This commit is contained in:
Sergei Golubchik
2025-07-28 18:06:31 +02:00
parent cbcb080a1f fe8047caf2
commit 053f9bcb5b
113 changed files with 2937 additions and 832 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/wsrep/r/variables_debug.result
View File

@@ -140,7 +140,11 @@ WSREP_SST_DONOR_REJECTS_QUERIES
WSREP_SST_METHOD
WSREP_SST_RECEIVE_ADDRESS
WSREP_START_POSITION
<<<<<<< HEAD
WSREP_STATUS_FILE
=======
WSREP_STRICT_DDL
>>>>>>> bb-10.6-serg
WSREP_SYNC_WAIT
WSREP_TRX_FRAGMENT_SIZE
WSREP_TRX_FRAGMENT_UNIT