diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2021-02-16 14:56:59 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-02-16 14:56:59 +0100 |
| commit | e0072fadcb00edae74e748aee3148075b9cddae2 (patch) | |
| tree | 625d5c0869cfbb322a2b4cdaab453e17fd5d31bf /storage/innobase/include | |
| parent | 1146e98b3af3e2b15df0598a860f4571663a98d0 (diff) | |
| parent | ae7989ca2059869f81c837509e5ff554f7f63562 (diff) | |
| download | mariadb-git-10.6-halfmerge.tar.gz | |
Merge branch 'bb-10.5-release' into bb-10.6-release10.6-halfmerge
Diffstat (limited to 'storage/innobase/include')
| -rw-r--r-- | storage/innobase/include/ha_prototypes.h | 2 | ||||
| -rw-r--r-- | storage/innobase/include/trx0trx.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/storage/innobase/include/ha_prototypes.h b/storage/innobase/include/ha_prototypes.h index 9463c2e45e8..76d01679ddf 100644 --- a/storage/innobase/include/ha_prototypes.h +++ b/storage/innobase/include/ha_prototypes.h @@ -209,7 +209,7 @@ innobase_casedn_str( char* a); /*!< in/out: string to put in lower case */ #ifdef WITH_WSREP -int wsrep_innobase_kill_one_trx(THD *bf_thd, trx_t *victim_trx, bool signal); +void wsrep_innobase_kill_one_trx(THD *bf_thd, trx_t *victim_trx, bool signal); ulint wsrep_innobase_mysql_sort(int mysql_type, uint charset_number, unsigned char* str, ulint str_length, unsigned int buf_length); diff --git a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h index 1028611e88e..685d9031b28 100644 --- a/storage/innobase/include/trx0trx.h +++ b/storage/innobase/include/trx0trx.h @@ -771,6 +771,9 @@ public: /** whether wsrep_on(mysql_thd) held at the start of transaction */ bool wsrep; bool is_wsrep() const { return UNIV_UNLIKELY(wsrep); } + /** true, if BF thread is performing unique secondary index scanning */ + bool wsrep_UK_scan; + bool is_wsrep_UK_scan() const { return UNIV_UNLIKELY(wsrep_UK_scan); } #else /* WITH_WSREP */ bool is_wsrep() const { return false; } #endif /* WITH_WSREP */ |