diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-03-17 13:06:41 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-03-17 13:06:41 +0100 |
| commit | b64fde8f38515dc39e019de26db7624cc0ea7046 (patch) | |
| tree | 0478ea4c3ddeee290f6d381a47efa4f9aded9c0b /include/wsrep.h | |
| parent | a89ee3cd154a67df2231f034fd8339f9225dbe64 (diff) | |
| parent | 1f020299f816263e347c852eb2a494b5ef1cbf0d (diff) | |
| download | mariadb-git-b64fde8f38515dc39e019de26db7624cc0ea7046.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'include/wsrep.h')
| -rw-r--r-- | include/wsrep.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/wsrep.h b/include/wsrep.h index 843b9c51198..dc85670d60e 100644 --- a/include/wsrep.h +++ b/include/wsrep.h @@ -50,9 +50,9 @@ #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 wsrep_error_label; } +#define WSREP_SYNC_WAIT(thd_, before_) \ + do { if (WSREP_CLIENT(thd_) && \ + wsrep_sync_wait(thd_, before_)) goto wsrep_error_label; } while(0) #define WSREP_ERROR_LABEL wsrep_error_label #else #define IF_WSREP(A,B) B @@ -65,7 +65,7 @@ #define WSREP_TO_ISOLATION_BEGIN_ALTER(db_, table_, table_list_, alter_info_) #define WSREP_TO_ISOLATION_END #define WSREP_TO_ISOLATION_BEGIN_WRTCHK(db_, table_, table_list_) -#define WSREP_SYNC_WAIT(thd_, before_) +#define WSREP_SYNC_WAIT(thd_, before_) do { } while(0) #define WSREP_ERROR_LABEL goto wsrep_error_label; wsrep_error_label #endif /* WITH_WSREP */ |