diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-02-12 17:44:22 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-02-12 17:44:22 +0100 |
| commit | 00a313ecf329098d4b31a42030b9b5c6f80a6031 (patch) | |
| tree | f4983a6629b04563c48fa7276686dfc2187efb5f /sql/wsrep_dummy.cc | |
| parent | ef5adf520760536c7396bdfe884fc509ac065694 (diff) | |
| parent | 691f93d6d17603f11a0c90f64e94b7ce9d187db4 (diff) | |
| download | mariadb-git-00a313ecf329098d4b31a42030b9b5c6f80a6031.tar.gz | |
Merge branch 'bb-10.3-release' into bb-10.4-release
Note, the fix for "MDEV-23328 Server hang due to Galera lock conflict resolution"
was null-merged. 10.4 version of the fix is coming up separately
Diffstat (limited to 'sql/wsrep_dummy.cc')
| -rw-r--r-- | sql/wsrep_dummy.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/wsrep_dummy.cc b/sql/wsrep_dummy.cc index c4dbd8c450f..2503a97590b 100644 --- a/sql/wsrep_dummy.cc +++ b/sql/wsrep_dummy.cc @@ -59,6 +59,12 @@ void wsrep_thd_LOCK(const THD *) void wsrep_thd_UNLOCK(const THD *) { } +void wsrep_thd_kill_LOCK(const THD *) +{ } + +void wsrep_thd_kill_UNLOCK(const THD *) +{ } + const char *wsrep_thd_conflict_state_str(THD *) { return 0; } |