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
f1ac8305
Commit
f1ac8305
authored
May 14, 2022
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-20119 fixup: GCC 12 -Wmaybe-uninitialized, -Wunused-but-set-variable
parent
ee2613c7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
12 deletions
+8
-12
sql/rpl_gtid.cc
sql/rpl_gtid.cc
+8
-12
No files found.
sql/rpl_gtid.cc
View file @
f1ac8305
/* Copyright (c) 2013, Kristian Nielsen and MariaDB Services Ab.
/* Copyright (c) 2013, Kristian Nielsen and MariaDB Services Ab.
Copyright (c) 2020, MariaDB Corporation.
Copyright (c) 2020,
2022,
MariaDB Corporation.
This program is free software; you can redistribute it and/or modify
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
...
@@ -3603,20 +3603,16 @@ int Id_delegating_gtid_event_filter<T>::set_id_restrictions(
...
@@ -3603,20 +3603,16 @@ int Id_delegating_gtid_event_filter<T>::set_id_restrictions(
size_t
id_ctr
;
size_t
id_ctr
;
int
err
;
int
err
;
Gtid_event_filter
::
gtid_event_filter_type
filter_type
;
const
char
*
filter_name
,
*
opposite_filter_name
;
const
char
*
filter_name
,
*
opposite_filter_name
;
Gtid_event_filter
*
(
*
construct_filter
)(
void
);
Gtid_event_filter
*
(
*
construct_filter
)(
void
);
Gtid_event_filter
*
(
*
construct_default_filter
)(
void
);
Gtid_event_filter
*
(
*
construct_default_filter
)(
void
);
DBUG_ASSERT
(
mode
>
id_restriction_mode
::
MODE_NOT_SET
);
/*
/*
Set up variables which help this filter either be in whitelist or blacklist
Set up variables which help this filter either be in whitelist or blacklist
mode
mode
*/
*/
if
(
mode
==
Gtid_event_filter
::
id_restriction_mode
::
WHITELIST_MODE
)
if
(
mode
==
Gtid_event_filter
::
id_restriction_mode
::
WHITELIST_MODE
)
{
{
filter_type
=
Gtid_event_filter
::
ACCEPT_ALL_GTID_FILTER_TYPE
;
filter_name
=
WHITELIST_NAME
;
filter_name
=
WHITELIST_NAME
;
opposite_filter_name
=
BLACKLIST_NAME
;
opposite_filter_name
=
BLACKLIST_NAME
;
construct_filter
=
construct_filter
=
...
@@ -3624,9 +3620,10 @@ int Id_delegating_gtid_event_filter<T>::set_id_restrictions(
...
@@ -3624,9 +3620,10 @@ int Id_delegating_gtid_event_filter<T>::set_id_restrictions(
construct_default_filter
=
construct_default_filter
=
create_event_filter
<
Reject_all_gtid_filter
>
;
create_event_filter
<
Reject_all_gtid_filter
>
;
}
}
else
if
(
mode
==
Gtid_event_filter
::
id_restriction_mode
::
BLACKLIST_MODE
)
else
{
{
filter_type
=
Gtid_event_filter
::
REJECT_ALL_GTID_FILTER_TYPE
;
DBUG_ASSERT
(
mode
==
Gtid_event_filter
::
id_restriction_mode
::
BLACKLIST_MODE
);
filter_name
=
BLACKLIST_NAME
;
filter_name
=
BLACKLIST_NAME
;
opposite_filter_name
=
WHITELIST_NAME
;
opposite_filter_name
=
WHITELIST_NAME
;
construct_filter
=
construct_filter
=
...
@@ -3634,10 +3631,6 @@ int Id_delegating_gtid_event_filter<T>::set_id_restrictions(
...
@@ -3634,10 +3631,6 @@ int Id_delegating_gtid_event_filter<T>::set_id_restrictions(
construct_default_filter
=
construct_default_filter
=
create_event_filter
<
Accept_all_gtid_filter
>
;
create_event_filter
<
Accept_all_gtid_filter
>
;
}
}
else
{
DBUG_ASSERT
(
0
);
}
if
(
m_id_restriction_mode
!=
if
(
m_id_restriction_mode
!=
Gtid_event_filter
::
id_restriction_mode
::
MODE_NOT_SET
)
Gtid_event_filter
::
id_restriction_mode
::
MODE_NOT_SET
)
...
@@ -3683,7 +3676,10 @@ int Id_delegating_gtid_event_filter<T>::set_id_restrictions(
...
@@ -3683,7 +3676,10 @@ int Id_delegating_gtid_event_filter<T>::set_id_restrictions(
else
else
{
{
DBUG_ASSERT
(
map_element
->
filter
->
get_filter_type
()
==
DBUG_ASSERT
(
map_element
->
filter
->
get_filter_type
()
==
filter_type
);
(
mode
==
Gtid_event_filter
::
id_restriction_mode
::
WHITELIST_MODE
)
?
Gtid_event_filter
::
ACCEPT_ALL_GTID_FILTER_TYPE
:
Gtid_event_filter
::
REJECT_ALL_GTID_FILTER_TYPE
);
}
}
}
}
...
...
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