diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-18 16:51:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-18 16:51:52 +0300 |
| commit | f84e28c119b495da77e197f7cd18af4048fc3126 (patch) | |
| tree | 5957008a7725e23cc6331b1251ff5d3f6b725076 /sql/wsrep_thd.h | |
| parent | ac2857a5fbf851d90171ac55f23385869ee6ba83 (diff) | |
| parent | e4901d9523ab838ea13bb0278980f8707aa2c581 (diff) | |
| download | mariadb-git-f84e28c119b495da77e197f7cd18af4048fc3126.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/wsrep_thd.h')
| -rw-r--r-- | sql/wsrep_thd.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/wsrep_thd.h b/sql/wsrep_thd.h index 560dbbdab44..d24d8e6358f 100644 --- a/sql/wsrep_thd.h +++ b/sql/wsrep_thd.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2013-2021 Codership Oy <info@codership.com> +/* Copyright (C) 2013 Codership Oy <info@codership.com> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -87,7 +87,7 @@ int wsrep_show_bf_aborts (THD *thd, SHOW_VAR *var, char *buff, bool wsrep_create_appliers(long threads, bool mutex_protected=false); void wsrep_create_rollbacker(); -bool wsrep_bf_abort(THD* bf_thd, THD* victim_thd); +bool wsrep_bf_abort(const THD*, THD*); int wsrep_abort_thd(THD *bf_thd_ptr, THD *victim_thd_ptr, my_bool signal); extern void wsrep_thd_set_PA_safe(void *thd_ptr, my_bool safe); @@ -292,7 +292,7 @@ static inline void wsrep_log_thd(const THD *thd, (thd->get_stmt_da()->is_error() ? thd->get_stmt_da()->message() : "") #ifdef WSREP_THD_LOG_QUERIES , thd->lex->sql_command, - wsrep_thd_query(thd) + WSREP_QUERY(thd) #endif /* WSREP_OBSERVER_LOG_QUERIES */ ); } |