From 79180d87bb43374bcecb323aca5a811c6f5cec6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Thu, 21 Aug 2014 19:35:13 +0300 Subject: [PATCH] Fix Windows compiler errors. --- sql/mdl.cc | 2 +- sql/sql_class.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/mdl.cc b/sql/mdl.cc index e5e906ae5d0..86e893db14e 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -1936,8 +1936,8 @@ MDL_lock::can_grant_lock(enum_mdl_type type_arg, else can_grant= TRUE; /* Continue loop */ - } #endif /* WITH_WSREP */ + } } if ((ticket == NULL) && IF_WSREP(wsrep_can_grant, 1)) can_grant= TRUE; diff --git a/sql/sql_class.h b/sql/sql_class.h index b2f7b459cb4..d6433d6fcf8 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -2751,7 +2751,6 @@ public: Relay_log_info* wsrep_rli; rpl_group_info* wsrep_rgi; wsrep_ws_handle_t wsrep_ws_handle; - char wsrep_info[128]; /* string for dynamic proc info */ ulong wsrep_retry_counter; // of autocommit char* wsrep_retry_query; size_t wsrep_retry_query_len; @@ -2770,6 +2769,7 @@ public: #endif /* GTID_SUPPORT */ void* wsrep_apply_format; #endif /* WITH_WSREP */ + char wsrep_info[128]; /* string for dynamic proc info */ /** Internal parser state. Note that since the parser is not re-entrant, we keep only one parser