revision-id: 5421e1c42972cf80d6a6bdc7eba7f5c5a5dbb04e (mariadb-10.3.6-189-g5421e1c4297) parent(s): 2b8888bed528b97b38580a6bcd8fb335e97e545a author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-14 11:27:28 +0200 message: Fix compiler warning. --- include/wsrep.h | 5 ----- sql/sql_parse.cc | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/include/wsrep.h b/include/wsrep.h index ce085ababb4..03dd8f4fd0e 100644 --- a/include/wsrep.h +++ b/include/wsrep.h @@ -47,11 +47,6 @@ if (WSREP(thd) && !thd->lex->no_write_to_binlog \ && wsrep_to_isolation_begin(thd, db_, table_, table_list_)) goto wsrep_error_label; -#define WSREP_SYNC_WAIT(thd_, before_) \ - { if (WSREP_CLIENT(thd_) && \ - wsrep_sync_wait(thd_, before_)) goto error; } - - #define WSREP_DEBUG(...) \ if (wsrep_debug) WSREP_LOG(sql_print_information, ##__VA_ARGS__) #define WSREP_INFO(...) WSREP_LOG(sql_print_information, ##__VA_ARGS__) diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index cde1af33d82..3de97c8d9d8 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -6653,7 +6653,7 @@ static bool execute_show_status(THD *thd, TABLE_LIST *all_tables) mysql_mutex_unlock(&LOCK_status); return res; #ifdef WITH_WSREP - error: /* see WSREP_SYNC_WAIT() macro above */ +wsrep_error_label: /* see WSREP_SYNC_WAIT() macro above */ return true; #endif /* WITH_WSREP */ }