diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2022-09-05 15:59:56 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2022-09-05 15:59:56 +0300 |
| commit | dee24f31555ebbecb0843b34e35ba0ab21a9fe9a (patch) | |
| tree | 7dd6837b9c00bf29a98e8efc33e6ccb24f874d20 /sql/sql_class.h | |
| parent | c8cd162a0a5daa17a8b6ca57f2dce44388b1b333 (diff) | |
| parent | 5fdbb3a72ee5a532676242096aa92c6a3c6e4073 (diff) | |
| download | mariadb-git-dee24f31555ebbecb0843b34e35ba0ab21a9fe9a.tar.gz | |
Merge 10.7 into 10.8
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 0f28084624f..efed7b9bad2 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -66,7 +66,8 @@ void set_thd_stage_info(void *thd, #include "my_apc.h" #include "rpl_gtid.h" -#include "wsrep_mysqld.h" +#include "wsrep.h" +#include "wsrep_on.h" #ifdef WITH_WSREP #include <inttypes.h> /* wsrep-lib */ @@ -76,6 +77,11 @@ void set_thd_stage_info(void *thd, #include "wsrep_condition_variable.h" class Wsrep_applier_service; +enum wsrep_consistency_check_mode { + NO_CONSISTENCY_CHECK, + CONSISTENCY_CHECK_DECLARED, + CONSISTENCY_CHECK_RUNNING, +}; #endif /* WITH_WSREP */ class Reprepare_observer; @@ -7856,7 +7862,9 @@ extern THD_list server_threads; void setup_tmp_table_column_bitmaps(TABLE *table, uchar *bitmaps, uint field_count); - +#ifdef WITH_WSREP +extern void wsrep_to_isolation_end(THD*); +#endif /* RAII utility class to ease binlogging with temporary setting THD etc context and restoring the original one upon logger execution. |