diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-08-21 13:35:00 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-08-21 13:35:00 +0300 |
| commit | c23efc7d50530570e6c13207f3c76adcb9237346 (patch) | |
| tree | 7c57ca7a1dc61590019abb5608c2b19327f8ed7c /include | |
| parent | 06106c01481401b6d7ef4309391ca2f66242cc85 (diff) | |
| parent | f1af2114993f884b1a6dc34fb1d972ead08f1966 (diff) | |
| download | mariadb-git-c23efc7d50530570e6c13207f3c76adcb9237346.tar.gz | |
Merge remote-tracking branch 'origin/10.0-galera' into 10.1
Diffstat (limited to 'include')
| -rw-r--r-- | include/wsrep.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/wsrep.h b/include/wsrep.h index 532e4339f10..0c06bb32b31 100644 --- a/include/wsrep.h +++ b/include/wsrep.h @@ -45,6 +45,10 @@ #define WSREP_WARN(...) WSREP_LOG(sql_print_warning, ##__VA_ARGS__) #define WSREP_ERROR(...) WSREP_LOG(sql_print_error, ##__VA_ARGS__) +#define WSREP_SYNC_WAIT(thd_, before_) \ + { if (WSREP_CLIENT(thd_) && \ + wsrep_sync_wait(thd_, before_)) goto error; } + #else #define IF_WSREP(A,B) B #define DBUG_ASSERT_IF_WSREP(A) @@ -55,6 +59,8 @@ #define WSREP_TO_ISOLATION_BEGIN(db_, table_, table_list_) #define WSREP_TO_ISOLATION_END #define WSREP_TO_ISOLATION_BEGIN_WRTCHK(db_, table_, table_list_) -#endif +#define WSREP_SYNC_WAIT(thd_, before_) + +#endif /* WITH_WSREP */ -#endif /* WSERP_INCLUDED */ +#endif /* WSREP_INCLUDED */ |