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
09f7889b
Commit
09f7889b
authored
Oct 06, 2022
by
Jan Lindström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-29706 : SIGSEGV in wsrep_TOI_begin on non-Galera builds
Do not allow setting wsrep_on=ON if no provider is set.
parent
074e3582
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
45 deletions
+20
-45
mysql-test/suite/sys_vars/r/wsrep_on_without_provider.result
mysql-test/suite/sys_vars/r/wsrep_on_without_provider.result
+5
-0
mysql-test/suite/sys_vars/t/wsrep_on_basic.test
mysql-test/suite/sys_vars/t/wsrep_on_basic.test
+0
-45
mysql-test/suite/sys_vars/t/wsrep_on_without_provider.test
mysql-test/suite/sys_vars/t/wsrep_on_without_provider.test
+9
-0
sql/wsrep_var.cc
sql/wsrep_var.cc
+6
-0
No files found.
mysql-test/suite/sys_vars/r/wsrep_on_without_provider.result
0 → 100644
View file @
09f7889b
SET GLOBAL wsrep_on=ON;
ERROR HY000: WSREP (galera) can't be enabled if the wsrep_provider is unset or set to 'none'
SELECT @@global.wsrep_on;
@@global.wsrep_on
0
mysql-test/suite/sys_vars/t/wsrep_on_basic.test
deleted
100644 → 0
View file @
074e3582
--
source
include
/
have_wsrep
.
inc
--
echo
#
--
echo
# wsrep_on
--
echo
#
--
echo
# save the initial values
SET
@
wsrep_on_global_saved
=
@@
global
.
wsrep_on
;
SET
@
wsrep_on_session_saved
=
@@
session
.
wsrep_on
;
--
echo
# default
SELECT
@@
global
.
wsrep_on
;
SELECT
@@
session
.
wsrep_on
;
--
echo
--
echo
# scope and valid values
SET
@@
global
.
wsrep_on
=
OFF
;
SELECT
@@
global
.
wsrep_on
;
SET
@@
global
.
wsrep_on
=
ON
;
SELECT
@@
global
.
wsrep_on
;
SET
@@
session
.
wsrep_on
=
OFF
;
SELECT
@@
session
.
wsrep_on
;
SET
@@
session
.
wsrep_on
=
ON
;
SELECT
@@
session
.
wsrep_on
;
SET
@@
session
.
wsrep_on
=
default
;
SELECT
@@
session
.
wsrep_on
;
--
echo
--
echo
# invalid values
--
error
ER_WRONG_VALUE_FOR_VAR
SET
@@
global
.
wsrep_on
=
NULL
;
--
error
ER_WRONG_VALUE_FOR_VAR
SET
@@
global
.
wsrep_on
=
'junk'
;
--
error
ER_WRONG_VALUE_FOR_VAR
SET
@@
session
.
wsrep_on
=
NULL
;
--
error
ER_WRONG_VALUE_FOR_VAR
SET
@@
session
.
wsrep_on
=
'junk'
;
--
echo
--
echo
# restore the initial values
SET
@@
global
.
wsrep_on
=
@
wsrep_on_global_saved
;
SET
@@
session
.
wsrep_on
=
@
wsrep_on_session_saved
;
--
echo
# End of test
mysql-test/suite/sys_vars/t/wsrep_on_without_provider.test
0 → 100644
View file @
09f7889b
--
source
include
/
not_embedded
.
inc
#
# @@global.wsrep_on is not allowed if there
# is no wsrep_provider
#
--
error
ER_WRONG_ARGUMENTS
SET
GLOBAL
wsrep_on
=
ON
;
SELECT
@@
global
.
wsrep_on
;
\ No newline at end of file
sql/wsrep_var.cc
View file @
09f7889b
...
...
@@ -70,6 +70,12 @@ bool wsrep_on_check(sys_var *self, THD* thd, set_var* var)
" innodb_lock_schedule_algorithm=FCFS and restart."
,
MYF
(
0
));
return
true
;
}
if
(
new_wsrep_on
&&
!
WSREP_PROVIDER_EXISTS
)
{
my_message
(
ER_WRONG_ARGUMENTS
,
"WSREP (galera) can't be enabled "
"if the wsrep_provider is unset or set to 'none'"
,
MYF
(
0
));
return
true
;
}
return
false
;
}
...
...
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