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
6e492016
Commit
6e492016
authored
May 11, 2015
by
Kristian Nielsen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compilation warnings in -DWITH_WSREP=OFF build.
parent
8bedb638
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
0 deletions
+6
-0
sql/event_data_objects.cc
sql/event_data_objects.cc
+2
-0
sql/mysqld.cc
sql/mysqld.cc
+2
-0
sql/slave.cc
sql/slave.cc
+2
-0
No files found.
sql/event_data_objects.cc
View file @
6e492016
...
@@ -1482,7 +1482,9 @@ end:
...
@@ -1482,7 +1482,9 @@ end:
WSREP_TO_ISOLATION_END
;
WSREP_TO_ISOLATION_END
;
#ifdef WITH_WSREP
error:
error:
#endif
thd
->
tx_read_only
=
save_tx_read_only
;
thd
->
tx_read_only
=
save_tx_read_only
;
thd
->
security_ctx
->
master_access
=
saved_master_access
;
thd
->
security_ctx
->
master_access
=
saved_master_access
;
}
}
...
...
sql/mysqld.cc
View file @
6e492016
...
@@ -5730,7 +5730,9 @@ int mysqld_main(int argc, char **argv)
...
@@ -5730,7 +5730,9 @@ int mysqld_main(int argc, char **argv)
}
}
}
}
else
else
{
wsrep_init_startup
(
false
);
wsrep_init_startup
(
false
);
}
if
(
opt_bootstrap
)
if
(
opt_bootstrap
)
{
{
...
...
sql/slave.cc
View file @
6e492016
...
@@ -4406,7 +4406,9 @@ pthread_handler_t handle_slave_sql(void *arg)
...
@@ -4406,7 +4406,9 @@ pthread_handler_t handle_slave_sql(void *arg)
my_thread_init
();
my_thread_init
();
DBUG_ENTER
(
"handle_slave_sql"
);
DBUG_ENTER
(
"handle_slave_sql"
);
#ifdef WITH_WSREP
wsrep_restart_point:
wsrep_restart_point:
#endif
serial_rgi
=
new
rpl_group_info
(
rli
);
serial_rgi
=
new
rpl_group_info
(
rli
);
thd
=
new
THD
;
// note that contructor of THD uses DBUG_ !
thd
=
new
THD
;
// note that contructor of THD uses DBUG_ !
...
...
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