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

2
mysql-test/suite/wsrep/r/plugin.result
View File

@@ -1,3 +1,3 @@
SELECT plugin_name,plugin_version,plugin_maturity FROM information_schema.plugins where plugin_name like 'wsrep' ORDER BY plugin_maturity,plugin_name;
SELECT plugin_name,plugin_version,plugin_maturity FROM information_schema.plugins WHERE plugin_name like 'wsrep' ORDER BY plugin_maturity,plugin_name;
plugin_name plugin_version plugin_maturity
wsrep 1.0 Stable

18
mysql-test/suite/wsrep/r/wsrep-recover-gtid-nobinlog.result Normal file
View File

@@ -0,0 +1,18 @@
CREATE TABLE t1 (f1 INT PRIMARY KEY) ENGINE=InnoDB;
# Case 1: Server goes through graceful shutdown and is restarted
connection default;
INSERT INTO t1 VALUES (1);
Expect 100-10-2
SELECT WSREP_LAST_SEEN_GTID();
WSREP_LAST_SEEN_GTID()
100-10-2
Performing --wsrep-recover ...
Using --wsrep-start-position when starting mysqld ...
Expect 100-10-2
SELECT WSREP_LAST_SEEN_GTID();
WSREP_LAST_SEEN_GTID()
100-10-2
SELECT * FROM t1;
f1
1
DROP TABLE t1;

65
mysql-test/suite/wsrep/r/wsrep-recover-gtid.result Normal file
View File

@@ -0,0 +1,65 @@
CREATE TABLE t1 (f1 INT PRIMARY KEY) ENGINE=InnoDB;
# Case 1: Server goes through graceful shutdown and is restarted
connection default;
INSERT INTO t1 VALUES (1);
Performing --wsrep-recover ...
Using --wsrep-start-position when starting mysqld ...
Expect 100-10-2
SELECT WSREP_LAST_SEEN_GTID();
WSREP_LAST_SEEN_GTID()
100-10-2
SELECT @@GLOBAL.gtid_binlog_pos;
@@GLOBAL.gtid_binlog_pos
100-10-2
SELECT * FROM t1;
f1
1
# Case 2: Server is killed after the transaction gets prepared
# but before it is written into binlog. As there is not GTID assigned,
# the transaction must be rolled back during recovery.
connect con, localhost, root;
SET DEBUG_SYNC = "ha_commit_trans_after_prepare SIGNAL reached WAIT_FOR continue";
INSERT INTO t1 VALUES (2);
connection default;
SET DEBUG_SYNC = "now WAIT_FOR reached";
# Kill the server
Performing --wsrep-recover ...
Using --wsrep-start-position when starting mysqld ...
Expect 100-10-2
SELECT WSREP_LAST_SEEN_GTID();
WSREP_LAST_SEEN_GTID()
100-10-2
SELECT @@GLOBAL.gtid_binlog_pos;
@@GLOBAL.gtid_binlog_pos
100-10-2
Expect 1
SELECT * FROM t1;
f1
1
disconnect con;
# Case 3: Server is killed after the transaction gets written into binlog
# but before it is committed in storage engine. In this case the
# transaction must be committed during recovery as it had a valid
# GTID assigned.
connect con, localhost, root;
SET DEBUG_SYNC = "commit_before_get_LOCK_commit_ordered SIGNAL reached WAIT_FOR continue";
INSERT INTO t1 VALUES (3);
connection default;
SET DEBUG_SYNC = "now WAIT_FOR reached";
# Kill the server
Performing --wsrep-recover ...
Using --wsrep-start-position when starting mysqld ...
Expect 100-10-3
SELECT WSREP_LAST_SEEN_GTID();
WSREP_LAST_SEEN_GTID()
100-10-3
SELECT @@GLOBAL.gtid_binlog_pos;
@@GLOBAL.gtid_binlog_pos
100-10-3
Expect 1 3
SELECT * FROM t1;
f1
1
3
disconnect con;
DROP TABLE t1;

8
mysql-test/suite/wsrep/r/wsrep_mixed_case_cmd_arg.result Normal file
View File

@@ -0,0 +1,8 @@
#
# MDEV-27126: my_getopt compares option names case sensitively
#
# Check if the variable is set correctly from options
SELECT @@GLOBAL.wsrep_slave_uk_checks;
@@GLOBAL.wsrep_slave_uk_checks
1
# End of test.