Commit 79180d87 authored by Jan Lindström's avatar Jan Lindström

Fix Windows compiler errors.

parent 21b4dec0
......@@ -1936,9 +1936,9 @@ 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;
}
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment