diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-17 20:07:38 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-17 20:07:38 +0300 |
| commit | ae8c8d8874302a86de67f47ed70486e73204504f (patch) | |
| tree | 965336b5dda53eea1ae685d2b912169ae989c9af /include | |
| parent | 1e9c922fa726b22f4522f2a4de0fcb6595404086 (diff) | |
| parent | 699de65d5e1cda0b8c6a994f8513e97804b1a7ad (diff) | |
| download | mariadb-git-ae8c8d8874302a86de67f47ed70486e73204504f.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/wsrep.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/wsrep.h b/include/wsrep.h index 835c8d77c72..20159048442 100644 --- a/include/wsrep.h +++ b/include/wsrep.h @@ -26,10 +26,6 @@ #define WSREP_MYSQL_DB (char *)"mysql" -#define WSREP_TO_ISOLATION_BEGIN_IF(db_, table_, table_list_) \ - if (WSREP_ON && WSREP(thd) && \ - wsrep_to_isolation_begin(thd, db_, table_, table_list_)) - #define WSREP_TO_ISOLATION_BEGIN(db_, table_, table_list_) \ if (WSREP_ON && WSREP(thd) && \ wsrep_to_isolation_begin(thd, db_, table_, table_list_)) \ @@ -57,10 +53,6 @@ wsrep_to_isolation_begin(thd, db_, table_, table_list_)) \ goto wsrep_error_label; -#define WSREP_TO_ISOLATION_BEGIN_FK_TABLES(db_, table_, table_list_, fk_tables) \ - if (WSREP(thd) && !thd->lex->no_write_to_binlog \ - && wsrep_to_isolation_begin(thd, db_, table_, table_list_, NULL, fk_tables)) - #define WSREP_SYNC_WAIT(thd_, before_) \ { if (WSREP_CLIENT(thd_) && \ wsrep_sync_wait(thd_, before_)) goto wsrep_error_label; } @@ -75,7 +67,6 @@ #define WSREP_ERROR(...) #define WSREP_TO_ISOLATION_BEGIN(db_, table_, table_list_) do { } while(0) #define WSREP_TO_ISOLATION_BEGIN_ALTER(db_, table_, table_list_, alter_info_, fk_tables_, create_info_) -#define WSREP_TO_ISOLATION_BEGIN_FK_TABLES(db_, table_, table_list_, fk_tables_) #define WSREP_TO_ISOLATION_BEGIN_CREATE(db_, table_, table_list_, create_info_) #define WSREP_TO_ISOLATION_BEGIN_WRTCHK(db_, table_, table_list_) #define WSREP_SYNC_WAIT(thd_, before_) |