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

Browse Source
This commit is contained in:
Marko Mäkelä
2025-03-27 08:01:47 +02:00
parent ba81009f63 191209d8ab
commit ab0f2a00b6
463 changed files with 4278 additions and 1958 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/galera_sr/r/GCF-572.result
View File

@@ -37,6 +37,9 @@ f1 f2
SET SESSION wsrep_trx_fragment_size = 10000;
START TRANSACTION;
INSERT INTO t1 VALUE (10, 'node1');
SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
COUNT(*)
0
connection node_1a;
INSERT INTO t1 VALUES(15, 'node2');
connection node_1;
@@ -45,7 +48,6 @@ f1 f2
1 node1
5 node2
10 node1
15 node2
INSERT INTO t1 VALUES(15, 'node1');
ERROR 23000: Duplicate entry '15' for key 'PRIMARY'
COMMIT;

9
mysql-test/suite/galera_sr/r/MENT-2042.result Normal file
View File

@@ -0,0 +1,9 @@
connection node_2;
connection node_1;
connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
connection node_1;
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY);
XA START 'a';
ERROR 42000: This version of MariaDB doesn't yet support 'XA transactions with Galera replication'
DROP TABLE t1;
disconnect node_1a;

2
mysql-test/suite/galera_sr/r/galera_sr_cc_master.result
View File

@@ -1,6 +1,6 @@
connection node_2;
connection node_1;
CALL mtr.add_suppression("WSREP: discarding established.*");
CALL mtr.add_suppression("WSREP: discarding established");
connection node_1;
connection node_2;
connection node_2;

2
mysql-test/suite/galera_sr/r/mysql-wsrep-features#148.result
View File

@@ -25,7 +25,7 @@ COMMIT;
connection node_1;
Got one of the listed errors
connection node_2;
SET GLOBAL wsrep_slave_threads = 1;
SET GLOBAL wsrep_slave_threads = DEFAULT;
SET GLOBAL debug_dbug = '';
SET DEBUG_SYNC='now SIGNAL signal.wsrep_apply_cb';
SET DEBUG_SYNC='now SIGNAL signal.wsrep_apply_cb';