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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
71848585
Commit
71848585
authored
Apr 10, 2019
by
Jan Lindström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix InnoDB dynamic plugin compile errors on wsrep patch.
parent
304ae942
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
2 deletions
+9
-2
include/mysql/service_wsrep.h
include/mysql/service_wsrep.h
+4
-1
sql/sql_plugin_services.ic
sql/sql_plugin_services.ic
+2
-1
sql/wsrep_dummy.cc
sql/wsrep_dummy.cc
+3
-0
No files found.
include/mysql/service_wsrep.h
View file @
71848585
...
@@ -83,6 +83,7 @@ extern struct wsrep_service_st {
...
@@ -83,6 +83,7 @@ extern struct wsrep_service_st {
const
char
*
(
*
wsrep_get_sr_table_name_func
)();
const
char
*
(
*
wsrep_get_sr_table_name_func
)();
my_bool
(
*
wsrep_get_debug_func
)();
my_bool
(
*
wsrep_get_debug_func
)();
void
(
*
wsrep_commit_ordered_func
)(
MYSQL_THD
thd
);
void
(
*
wsrep_commit_ordered_func
)(
MYSQL_THD
thd
);
my_bool
(
*
wsrep_thd_is_applying_func
)(
const
MYSQL_THD
thd
);
}
*
wsrep_service
;
}
*
wsrep_service
;
#define MYSQL_SERVICE_WSREP_INCLUDED
#define MYSQL_SERVICE_WSREP_INCLUDED
...
@@ -121,7 +122,8 @@ extern struct wsrep_service_st {
...
@@ -121,7 +122,8 @@ extern struct wsrep_service_st {
#define wsrep_thd_skip_locking(T) wsrep_service->wsrep_thd_skip_locking_func(T)
#define wsrep_thd_skip_locking(T) wsrep_service->wsrep_thd_skip_locking_func(T)
#define wsrep_get_sr_table_name() wsrep_service->wsrep_get_sr_table_name_func()
#define wsrep_get_sr_table_name() wsrep_service->wsrep_get_sr_table_name_func()
#define wsrep_get_debug() wsrep_service->wsrep_get_debug_func()
#define wsrep_get_debug() wsrep_service->wsrep_get_debug_func()
#define wsrep_commit_ordered(T) wsrep_service->wsrep_commit_ordered(T)
#define wsrep_commit_ordered(T) wsrep_service->wsrep_commit_ordered_func(T)
#define wsrep_thd_is_applying(T) wsrep_service->wsrep_thd_is_applying_func(T)
#else
#else
...
@@ -213,6 +215,7 @@ extern "C" const char* wsrep_get_sr_table_name();
...
@@ -213,6 +215,7 @@ extern "C" const char* wsrep_get_sr_table_name();
extern
"C"
my_bool
wsrep_get_debug
();
extern
"C"
my_bool
wsrep_get_debug
();
extern
"C"
void
wsrep_commit_ordered
(
MYSQL_THD
thd
);
extern
"C"
void
wsrep_commit_ordered
(
MYSQL_THD
thd
);
extern
"C"
my_bool
wsrep_thd_is_applying
(
const
MYSQL_THD
thd
);
#endif
#endif
#endif
/* MYSQL_SERVICE_WSREP_INCLUDED */
#endif
/* MYSQL_SERVICE_WSREP_INCLUDED */
sql/sql_plugin_services.ic
View file @
71848585
...
@@ -172,7 +172,8 @@ static struct wsrep_service_st wsrep_handler = {
...
@@ -172,7 +172,8 @@ static struct wsrep_service_st wsrep_handler = {
wsrep_thd_skip_locking,
wsrep_thd_skip_locking,
wsrep_get_sr_table_name,
wsrep_get_sr_table_name,
wsrep_get_debug,
wsrep_get_debug,
wsrep_commit_ordered
wsrep_commit_ordered,
wsrep_thd_is_applying
};
};
static struct thd_specifics_service_st thd_specifics_handler=
static struct thd_specifics_service_st thd_specifics_handler=
...
...
sql/wsrep_dummy.cc
View file @
71848585
...
@@ -135,3 +135,6 @@ my_bool wsrep_get_debug()
...
@@ -135,3 +135,6 @@ my_bool wsrep_get_debug()
void
wsrep_commit_ordered
(
THD
*
)
void
wsrep_commit_ordered
(
THD
*
)
{
}
{
}
my_bool
wsrep_thd_is_applying
(
const
THD
*
)
{
return
0
;}
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