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
a707c7f0
Commit
a707c7f0
authored
Oct 05, 2020
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '10.2' into 10.3
parents
4668e079
a4649177
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
47 additions
and
6 deletions
+47
-6
VERSION
VERSION
+1
-1
sql/wsrep_sst.cc
sql/wsrep_sst.cc
+46
-5
No files found.
VERSION
View file @
a707c7f0
MYSQL_VERSION_MAJOR=10
MYSQL_VERSION_MAJOR=10
MYSQL_VERSION_MINOR=3
MYSQL_VERSION_MINOR=3
MYSQL_VERSION_PATCH=2
4
MYSQL_VERSION_PATCH=2
5
SERVER_MATURITY=stable
SERVER_MATURITY=stable
sql/wsrep_sst.cc
View file @
a707c7f0
...
@@ -1726,24 +1726,65 @@ static int sst_donate_other (const char* method,
...
@@ -1726,24 +1726,65 @@ static int sst_donate_other (const char* method,
return
arg
.
err
;
return
arg
.
err
;
}
}
/* return true if character can be a part of a filename */
static
bool
filename_char
(
int
const
c
)
{
return
isalnum
(
c
)
||
(
c
==
'-'
)
||
(
c
==
'_'
)
||
(
c
==
'.'
);
}
/* return true if character can be a part of an address string */
static
bool
address_char
(
int
const
c
)
{
return
filename_char
(
c
)
||
(
c
==
':'
)
||
(
c
==
'['
)
||
(
c
==
']'
)
||
(
c
==
'/'
);
}
static
bool
check_request_str
(
const
char
*
const
str
,
bool
(
*
check
)
(
int
c
))
{
for
(
size_t
i
(
0
);
str
[
i
]
!=
'\0'
;
++
i
)
{
if
(
!
check
(
str
[
i
]))
{
WSREP_WARN
(
"Illegal character in state transfer request: %i (%c)."
,
str
[
i
],
str
[
i
]);
return
true
;
}
}
return
false
;
}
wsrep_cb_status_t
wsrep_sst_donate_cb
(
void
*
app_ctx
,
void
*
recv_ctx
,
wsrep_cb_status_t
wsrep_sst_donate_cb
(
void
*
app_ctx
,
void
*
recv_ctx
,
const
void
*
msg
,
size_t
msg_len
,
const
void
*
msg
,
size_t
msg_len
,
const
wsrep_gtid_t
*
current_gtid
,
const
wsrep_gtid_t
*
current_gtid
,
const
char
*
state
,
size_t
state_len
,
const
char
*
state
,
size_t
state_len
,
bool
bypass
)
bool
bypass
)
{
{
/* This will be reset when sync callback is called.
* Should we set wsrep_ready to FALSE here too? */
wsrep_config_state
->
set
(
WSREP_MEMBER_DONOR
);
const
char
*
method
=
(
char
*
)
msg
;
const
char
*
method
=
(
char
*
)
msg
;
size_t
method_len
=
strlen
(
method
);
size_t
method_len
=
strlen
(
method
);
if
(
check_request_str
(
method
,
filename_char
))
{
WSREP_ERROR
(
"Bad SST method name. SST canceled."
);
return
WSREP_CB_FAILURE
;
}
const
char
*
data
=
method
+
method_len
+
1
;
const
char
*
data
=
method
+
method_len
+
1
;
if
(
check_request_str
(
data
,
address_char
))
{
WSREP_ERROR
(
"Bad SST address string. SST canceled."
);
return
WSREP_CB_FAILURE
;
}
char
uuid_str
[
37
];
char
uuid_str
[
37
];
wsrep_uuid_print
(
&
current_gtid
->
uuid
,
uuid_str
,
sizeof
(
uuid_str
));
wsrep_uuid_print
(
&
current_gtid
->
uuid
,
uuid_str
,
sizeof
(
uuid_str
));
/* This will be reset when sync callback is called.
* Should we set wsrep_ready to FALSE here too? */
wsrep_config_state
->
set
(
WSREP_MEMBER_DONOR
);
wsp
::
env
env
(
NULL
);
wsp
::
env
env
(
NULL
);
if
(
env
.
error
())
if
(
env
.
error
())
{
{
...
...
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