mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Minor test modifications.
This commit is contained in:
@@ -1,3 +1,5 @@
|
||||
--source include/wait_until_ready.inc
|
||||
|
||||
# ==== Purpose ====
|
||||
#
|
||||
# This test is executed twice for each test case. Before every
|
||||
|
@@ -227,27 +227,6 @@ INSERT INTO global_suppressions VALUES
|
||||
("Slave I/O: Notifying master by SET @master_binlog_checksum= @@global.binlog_checksum failed with error.*"),
|
||||
("Slave I/O: Setting master-side filtering of @@skip_replication failed with error:.*"),
|
||||
("Slave I/O: Setting @mariadb_slave_capability failed with error:.*"),
|
||||
|
||||
/*
|
||||
Galera suppressions
|
||||
*/
|
||||
("WSREP:*down context*"),
|
||||
("WSREP: Failed to send state UUID:*"),
|
||||
("WSREP: wsrep_sst_receive_address is set to '127.0.0.1"),
|
||||
("WSREP: option --wsrep-casual-reads is deprecated"),
|
||||
("WSREP: --wsrep-casual-reads=ON takes precedence over --wsrep-sync-wait=0"),
|
||||
("WSREP: Could not open saved state file for reading: "),
|
||||
("WSREP: access file\\(gvwstate\\.dat\\) failed\\(No such file or directory\\)"),
|
||||
("WSREP: Gap in state sequence\\. Need state transfer\\."),
|
||||
("WSREP: Failed to prepare for incremental state transfer: Local state UUID \\(00000000-0000-0000-0000-000000000000\\) does not match group state UUID"),
|
||||
("WSREP: No existing UUID has been found, so we assume that this is the first time that this server has been started\\. Generating a new UUID: "),
|
||||
("WSREP: last inactive check more than"),
|
||||
("WSREP: binlog cache not empty \\(0 bytes\\) at connection close"),
|
||||
("WSREP: Failed to guess base node address"),
|
||||
("WSREP: Guessing address for incoming client connections failed"),
|
||||
("WSREP: Failed to read output of: '/sbin/ifconfig"),
|
||||
("WSREP: SQL statement was ineffective"),
|
||||
|
||||
("THE_LAST_SUPPRESSION")||
|
||||
|
||||
|
||||
|
@@ -33,8 +33,7 @@
|
||||
--let _WRTF_SERVER_NUMBER= $server_number
|
||||
if (!$server_number)
|
||||
{
|
||||
# Note: 2 extra ports are reserved per server for galera use.
|
||||
--let _WRTF_SERVER_NUMBER= `SELECT 1 + FLOOR((@@PORT - $MASTER_MYPORT) / 3)`
|
||||
--let _WRTF_SERVER_NUMBER= `SELECT 1 + @@PORT - $MASTER_MYPORT`
|
||||
}
|
||||
|
||||
--let $_write_result_msg= [server=$_WRTF_SERVER_NUMBER]
|
||||
|
Reference in New Issue
Block a user