database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

Fix Windows compiler errors.

Browse Source
This commit is contained in:
Jan Lindström
2014-08-21 19:35:13 +03:00
parent 21b4dec072
commit 79180d87bb
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/mdl.cc
View File

@@ -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;

2
sql/sql_class.h
View File

@@ -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