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
082eec14
Commit
082eec14
authored
Jun 21, 2018
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SET wsrep_on=1 - only check innodb_lock_schedule_algorithm if innodb is enabled
parent
b942aa34
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
sql/wsrep_var.cc
sql/wsrep_var.cc
+2
-1
No files found.
sql/wsrep_var.cc
View file @
082eec14
...
...
@@ -47,6 +47,7 @@ int wsrep_init_vars()
linking will succeed even if the server is built with a dynamically
linked InnoDB. */
ulong
innodb_lock_schedule_algorithm
__attribute__
((
weak
));
struct
handlerton
*
innodb_hton_ptr
__attribute__
((
weak
));
bool
wsrep_on_update
(
sys_var
*
self
,
THD
*
thd
,
enum_var_type
var_type
)
{
...
...
@@ -65,7 +66,7 @@ bool wsrep_on_check(sys_var *self, THD* thd, set_var* var)
if
(
check_has_super
(
self
,
thd
,
var
))
return
true
;
if
(
new_wsrep_on
&&
innodb_lock_schedule_algorithm
!=
0
)
{
if
(
new_wsrep_on
&&
innodb_
hton_ptr
&&
innodb_
lock_schedule_algorithm
!=
0
)
{
my_message
(
ER_WRONG_ARGUMENTS
,
" WSREP (galera) can't be enabled "
"if innodb_lock_schedule_algorithm=VATS. Please configure"
" innodb_lock_schedule_algorithm=FCFS and restart."
,
MYF
(
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