diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 13:39:13 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 13:39:13 +0000 |
| commit | 86fbb58c3ac0865482819c10a3e81f2eea001c36 (patch) | |
| tree | 28c9e526ea739c6f9b89e36115e1e2698bddf981 /sql/service_wsrep.cc | |
| parent | Releasing progress-linux version 1:10.11.6-2~progress7.99u1. (diff) | |
| download | mariadb-86fbb58c3ac0865482819c10a3e81f2eea001c36.tar.xz mariadb-86fbb58c3ac0865482819c10a3e81f2eea001c36.zip | |
Merging upstream version 1:10.11.7.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | sql/service_wsrep.cc | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/sql/service_wsrep.cc b/sql/service_wsrep.cc index e1a4a25b..17240fd4 100644 --- a/sql/service_wsrep.cc +++ b/sql/service_wsrep.cc @@ -395,17 +395,9 @@ extern "C" void wsrep_thd_set_PA_unsafe(THD *thd) } } -extern "C" int wsrep_thd_append_table_key(MYSQL_THD thd, - const char* db, - const char* table, - enum Wsrep_service_key_type key_type) +extern "C" uint32 wsrep_get_domain_id() { - wsrep_key_arr_t key_arr = {0, 0}; - int ret = wsrep_prepare_keys_for_isolation(thd, db, table, NULL, &key_arr); - ret = ret || wsrep_thd_append_key(thd, key_arr.keys, - (int)key_arr.keys_len, key_type); - wsrep_keys_free(&key_arr); - return ret; + return wsrep_gtid_domain_id; } extern "C" my_bool wsrep_thd_is_local_transaction(const THD *thd) @@ -413,4 +405,3 @@ extern "C" my_bool wsrep_thd_is_local_transaction(const THD *thd) return (wsrep_thd_is_local(thd) && thd->wsrep_cs().transaction().active()); } - |