Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
79180d87
Commit
79180d87
authored
Aug 21, 2014
by
Jan Lindström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Windows compiler errors.
parent
21b4dec0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
sql/mdl.cc
sql/mdl.cc
+1
-1
sql/sql_class.h
sql/sql_class.h
+1
-1
No files found.
sql/mdl.cc
View file @
79180d87
...
@@ -1936,9 +1936,9 @@ MDL_lock::can_grant_lock(enum_mdl_type type_arg,
...
@@ -1936,9 +1936,9 @@ MDL_lock::can_grant_lock(enum_mdl_type type_arg,
else
else
can_grant
=
TRUE
;
can_grant
=
TRUE
;
/* Continue loop */
/* Continue loop */
}
#endif
/* WITH_WSREP */
#endif
/* WITH_WSREP */
}
}
}
if
((
ticket
==
NULL
)
&&
IF_WSREP
(
wsrep_can_grant
,
1
))
if
((
ticket
==
NULL
)
&&
IF_WSREP
(
wsrep_can_grant
,
1
))
can_grant
=
TRUE
;
can_grant
=
TRUE
;
}
}
...
...
sql/sql_class.h
View file @
79180d87
...
@@ -2751,7 +2751,6 @@ public:
...
@@ -2751,7 +2751,6 @@ public:
Relay_log_info
*
wsrep_rli
;
Relay_log_info
*
wsrep_rli
;
rpl_group_info
*
wsrep_rgi
;
rpl_group_info
*
wsrep_rgi
;
wsrep_ws_handle_t
wsrep_ws_handle
;
wsrep_ws_handle_t
wsrep_ws_handle
;
char
wsrep_info
[
128
];
/* string for dynamic proc info */
ulong
wsrep_retry_counter
;
// of autocommit
ulong
wsrep_retry_counter
;
// of autocommit
char
*
wsrep_retry_query
;
char
*
wsrep_retry_query
;
size_t
wsrep_retry_query_len
;
size_t
wsrep_retry_query_len
;
...
@@ -2770,6 +2769,7 @@ public:
...
@@ -2770,6 +2769,7 @@ public:
#endif
/* GTID_SUPPORT */
#endif
/* GTID_SUPPORT */
void
*
wsrep_apply_format
;
void
*
wsrep_apply_format
;
#endif
/* WITH_WSREP */
#endif
/* WITH_WSREP */
char
wsrep_info
[
128
];
/* string for dynamic proc info */
/**
/**
Internal parser state.
Internal parser state.
Note that since the parser is not re-entrant, we keep only one parser
Note that since the parser is not re-entrant, we keep only one parser
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment