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

galera: synchronization between branches and editions

Browse Source
This commit is contained in:
Julius Goryavsky
2025-03-04 03:22:19 +01:00
parent 7544fd4cae
commit 3a4c0295ae
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/galera/r/galera_nonPK_and_PA.result
View File

@@ -8,7 +8,7 @@ connection node_2;
SET SESSION wsrep_sync_wait = 0; SET SESSION wsrep_sync_wait = 0;
SET GLOBAL wsrep_slave_threads = 2; SET GLOBAL wsrep_slave_threads = 2;
*************************************************************** ***************************************************************
scenario 1, conflicting UPDATE scenario 1, conflicting UPDATE
*************************************************************** ***************************************************************
SET GLOBAL wsrep_provider_options = 'dbug=d,commit_monitor_slave_enter_sync'; SET GLOBAL wsrep_provider_options = 'dbug=d,commit_monitor_slave_enter_sync';
connection node_1; connection node_1;
@@ -31,7 +31,7 @@ SET SESSION wsrep_on = 1;
SET GLOBAL wsrep_provider_options = 'signal=commit_monitor_slave_enter_sync'; SET GLOBAL wsrep_provider_options = 'signal=commit_monitor_slave_enter_sync';
SET GLOBAL wsrep_provider_options = 'dbug='; SET GLOBAL wsrep_provider_options = 'dbug=';
*************************************************************** ***************************************************************
scenario 2, conflicting DELETE scenario 2, conflicting DELETE
*************************************************************** ***************************************************************
SET GLOBAL wsrep_provider_options = 'dbug=d,commit_monitor_slave_enter_sync'; SET GLOBAL wsrep_provider_options = 'dbug=d,commit_monitor_slave_enter_sync';
connection node_1; connection node_1;

6
mysql-test/suite/galera/t/galera_nonPK_and_PA.test
View File

@@ -26,7 +26,6 @@
--source include/have_debug_sync.inc --source include/have_debug_sync.inc
--source include/galera_have_debug_sync.inc --source include/galera_have_debug_sync.inc
# Setup # Setup
CREATE TABLE t1 (f1 VARCHAR(32) NOT NULL) ENGINE=InnoDB; CREATE TABLE t1 (f1 VARCHAR(32) NOT NULL) ENGINE=InnoDB;
@@ -44,7 +43,7 @@ SET SESSION wsrep_sync_wait = 0;
SET GLOBAL wsrep_slave_threads = 2; SET GLOBAL wsrep_slave_threads = 2;
--echo *************************************************************** --echo ***************************************************************
--echo scenario 1, conflicting UPDATE --echo scenario 1, conflicting UPDATE
--echo *************************************************************** --echo ***************************************************************
# Set up a synchronization point to catch the first transaction # Set up a synchronization point to catch the first transaction
@@ -99,9 +98,8 @@ COMMIT;
--source include/galera_signal_sync_point.inc --source include/galera_signal_sync_point.inc
--source include/galera_clear_sync_point.inc --source include/galera_clear_sync_point.inc
--echo *************************************************************** --echo ***************************************************************
--echo scenario 2, conflicting DELETE --echo scenario 2, conflicting DELETE
--echo *************************************************************** --echo ***************************************************************
# Set up a synchronization point to catch the first transaction # Set up a synchronization point to catch the first transaction

2
mysql-test/suite/galera/t/galera_sync_wait_upto.test
View File

@@ -4,7 +4,6 @@
--source include/galera_cluster.inc --source include/galera_cluster.inc
--source include/have_debug.inc --source include/have_debug.inc
--source include/have_debug_sync.inc
CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
INSERT INTO t1 VALUES (1); INSERT INTO t1 VALUES (1);
@@ -44,7 +43,6 @@ SELECT WSREP_SYNC_WAIT_UPTO_GTID('1-1-1,1-1-2');
--eval SELECT WSREP_SYNC_WAIT_UPTO_GTID('$wsrep_last_committed_gtid') AS WSREP_SYNC_WAIT_UPTO; --eval SELECT WSREP_SYNC_WAIT_UPTO_GTID('$wsrep_last_committed_gtid') AS WSREP_SYNC_WAIT_UPTO;
--enable_query_log --enable_query_log
# Timeout if GTID is not received on time # Timeout if GTID is not received on time
--disable_query_log --disable_query_log

6
sql/handler.cc
View File

@@ -668,6 +668,8 @@ int ha_initialize_handlerton(void *plugin_)
DBUG_EXECUTE_IF("unstable_db_type", { DBUG_EXECUTE_IF("unstable_db_type", {
static int i= (int) DB_TYPE_FIRST_DYNAMIC; static int i= (int) DB_TYPE_FIRST_DYNAMIC;
while (installed_htons[i])
i++;
hton->db_type= (enum legacy_db_type)++i; hton->db_type= (enum legacy_db_type)++i;
}); });
@@ -2164,7 +2166,7 @@ int ha_rollback_trans(THD *thd, bool all)
"conf %d wsrep_err %s SQL %s", "conf %d wsrep_err %s SQL %s",
thd->thread_id, thd->query_id, thd->wsrep_trx().state(), thd->thread_id, thd->query_id, thd->wsrep_trx().state(),
wsrep::to_c_string(thd->wsrep_cs().current_error()), wsrep::to_c_string(thd->wsrep_cs().current_error()),
thd->query()); wsrep_thd_query(thd));
} }
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
} }
@@ -2180,7 +2182,7 @@ int ha_rollback_trans(THD *thd, bool all)
if (WSREP(thd) && thd->is_error()) if (WSREP(thd) && thd->is_error())
{ {
WSREP_DEBUG("ha_rollback_trans(%lld, %s) rolled back: msg %s is_real %d wsrep_err %s", WSREP_DEBUG("ha_rollback_trans(%lld, %s) rolled back: msg %s is_real %d wsrep_err %s",
thd->thread_id, all? "TRUE" : "FALSE", thd->thread_id, all ? "TRUE" : "FALSE",
thd->get_stmt_da()->message(), is_real_trans, thd->get_stmt_da()->message(), is_real_trans,
wsrep::to_c_string(thd->wsrep_cs().current_error())); wsrep::to_c_string(thd->wsrep_cs().current_error()));
} }