diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-01-04 09:55:58 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-01-04 09:55:58 +0200 |
| commit | 7dfaded9625e832fade4ef1678bcb21c445dad2b (patch) | |
| tree | 4cefbfb728619b80fc34163a8f142b365f3558e0 /include | |
| parent | 9f2a6bbe6ba03ca5297cd37b75301d05eb44e044 (diff) | |
| parent | 3f5726768f17342fd6dfec1be1e4d71814bc8564 (diff) | |
| download | mariadb-git-7dfaded9625e832fade4ef1678bcb21c445dad2b.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql/service_wsrep.h | 4 | ||||
| -rw-r--r-- | include/wsrep.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/mysql/service_wsrep.h b/include/mysql/service_wsrep.h index 0831326a36e..42b758c03f3 100644 --- a/include/mysql/service_wsrep.h +++ b/include/mysql/service_wsrep.h @@ -91,6 +91,7 @@ extern struct wsrep_service_st { unsigned long long trx_id); void (*wsrep_thd_kill_LOCK_func)(const MYSQL_THD thd); void (*wsrep_thd_kill_UNLOCK_func)(const MYSQL_THD thd); + void (*wsrep_thd_set_wsrep_PA_unsafe_func)(MYSQL_THD thd); } *wsrep_service; #define MYSQL_SERVICE_WSREP_INCLUDED @@ -137,6 +138,7 @@ extern struct wsrep_service_st { #define wsrep_thd_set_ignored_error(T,V) wsrep_service->wsrep_thd_set_ignored_error_func(T,V) #define wsrep_thd_set_wsrep_aborter(T) wsrep_service->wsrep_thd_set_wsrep_aborter_func(T1, T2) #define wsrep_report_bf_lock_wait(T,I) wsrep_service->wsrep_report_bf_lock_wait(T,I) +#define wsrep_thd_set_PA_unsafe(T) wsrep_service->wsrep_thd_set_PA_unsafe_func(T) #else #define MYSQL_SERVICE_WSREP_STATIC_INCLUDED @@ -238,5 +240,7 @@ extern "C" void wsrep_thd_set_ignored_error(MYSQL_THD thd, my_bool val); extern "C" bool wsrep_thd_set_wsrep_aborter(MYSQL_THD bf_thd, MYSQL_THD victim_thd); extern "C" void wsrep_report_bf_lock_wait(const THD *thd, unsigned long long trx_id); +/* declare parallel applying unsafety for the THD */ +extern "C" void wsrep_thd_set_PA_unsafe(MYSQL_THD thd); #endif #endif /* MYSQL_SERVICE_WSREP_INCLUDED */ diff --git a/include/wsrep.h b/include/wsrep.h index 20159048442..e68b14f4a17 100644 --- a/include/wsrep.h +++ b/include/wsrep.h @@ -41,8 +41,7 @@ if (WSREP(thd) && \ wsrep_to_isolation_begin(thd, db_, table_, \ table_list_, alter_info_, \ - fk_tables_, create_info_)) \ - goto wsrep_error_label; + fk_tables_, create_info_)) /* Checks if lex->no_write_to_binlog is set for statements that use LOCAL or |