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
1d702ff0
Commit
1d702ff0
authored
Dec 07, 2016
by
Alexey Botchkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-8329 MariaDB crashes when replicate_wild_ignore_table is set to NULL.
Rpl_filter::parse_filter_rule() made NULL-safe.
parent
d67ef7a2
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
45 additions
and
0 deletions
+45
-0
mysql-test/suite/sys_vars/r/replicate_do_db_basic.result
mysql-test/suite/sys_vars/r/replicate_do_db_basic.result
+4
-0
mysql-test/suite/sys_vars/r/replicate_do_table_basic.result
mysql-test/suite/sys_vars/r/replicate_do_table_basic.result
+4
-0
mysql-test/suite/sys_vars/r/replicate_ignore_db_basic.result
mysql-test/suite/sys_vars/r/replicate_ignore_db_basic.result
+4
-0
mysql-test/suite/sys_vars/r/replicate_ignore_table_basic.result
...test/suite/sys_vars/r/replicate_ignore_table_basic.result
+4
-0
mysql-test/suite/sys_vars/r/replicate_wild_do_table_basic.result
...est/suite/sys_vars/r/replicate_wild_do_table_basic.result
+4
-0
mysql-test/suite/sys_vars/r/replicate_wild_ignore_table_basic.result
...suite/sys_vars/r/replicate_wild_ignore_table_basic.result
+4
-0
mysql-test/suite/sys_vars/t/replicate_do_db_basic.test
mysql-test/suite/sys_vars/t/replicate_do_db_basic.test
+3
-0
mysql-test/suite/sys_vars/t/replicate_do_table_basic.test
mysql-test/suite/sys_vars/t/replicate_do_table_basic.test
+3
-0
mysql-test/suite/sys_vars/t/replicate_ignore_db_basic.test
mysql-test/suite/sys_vars/t/replicate_ignore_db_basic.test
+3
-0
mysql-test/suite/sys_vars/t/replicate_ignore_table_basic.test
...l-test/suite/sys_vars/t/replicate_ignore_table_basic.test
+3
-0
mysql-test/suite/sys_vars/t/replicate_wild_do_table_basic.test
...-test/suite/sys_vars/t/replicate_wild_do_table_basic.test
+3
-0
mysql-test/suite/sys_vars/t/replicate_wild_ignore_table_basic.test
...t/suite/sys_vars/t/replicate_wild_ignore_table_basic.test
+3
-0
sql/rpl_filter.cc
sql/rpl_filter.cc
+3
-0
No files found.
mysql-test/suite/sys_vars/r/replicate_do_db_basic.result
View file @
1d702ff0
...
...
@@ -33,5 +33,9 @@ SET @@GLOBAL.replicate_do_db="";
SELECT @@GLOBAL.replicate_do_db;
@@GLOBAL.replicate_do_db
SET @@GLOBAL.replicate_do_db=null;
SELECT @@GLOBAL.replicate_do_db;
@@GLOBAL.replicate_do_db
# Cleanup.
SET @@GLOBAL.replicate_do_db = @save_replicate_do_db;
mysql-test/suite/sys_vars/r/replicate_do_table_basic.result
View file @
1d702ff0
...
...
@@ -40,5 +40,9 @@ SET @@GLOBAL.replicate_do_table="";
SELECT @@GLOBAL.replicate_do_table;
@@GLOBAL.replicate_do_table
SET @@GLOBAL.replicate_do_table=null;
SELECT @@GLOBAL.replicate_do_table;
@@GLOBAL.replicate_do_table
# Cleanup.
SET @@GLOBAL.replicate_do_table = @save_replicate_do_table;
mysql-test/suite/sys_vars/r/replicate_ignore_db_basic.result
View file @
1d702ff0
...
...
@@ -33,5 +33,9 @@ SET @@GLOBAL.replicate_ignore_db="";
SELECT @@GLOBAL.replicate_ignore_db;
@@GLOBAL.replicate_ignore_db
SET @@GLOBAL.replicate_ignore_db=null;
SELECT @@GLOBAL.replicate_ignore_db;
@@GLOBAL.replicate_ignore_db
# Cleanup.
SET @@GLOBAL.replicate_ignore_db = @save_replicate_ignore_db;
mysql-test/suite/sys_vars/r/replicate_ignore_table_basic.result
View file @
1d702ff0
...
...
@@ -40,5 +40,9 @@ SET @@GLOBAL.replicate_ignore_table="";
SELECT @@GLOBAL.replicate_ignore_table;
@@GLOBAL.replicate_ignore_table
SET @@GLOBAL.replicate_ignore_table=null;
SELECT @@GLOBAL.replicate_ignore_table;
@@GLOBAL.replicate_ignore_table
# Cleanup.
SET @@GLOBAL.replicate_ignore_table = @save_replicate_ignore_table;
mysql-test/suite/sys_vars/r/replicate_wild_do_table_basic.result
View file @
1d702ff0
...
...
@@ -40,5 +40,9 @@ SET @@GLOBAL.replicate_wild_do_table="";
SELECT @@GLOBAL.replicate_wild_do_table;
@@GLOBAL.replicate_wild_do_table
SET @@GLOBAL.replicate_wild_do_table=null;
SELECT @@GLOBAL.replicate_wild_do_table;
@@GLOBAL.replicate_wild_do_table
# Cleanup.
SET @@GLOBAL.replicate_wild_do_table = @save_replicate_wild_do_table;
mysql-test/suite/sys_vars/r/replicate_wild_ignore_table_basic.result
View file @
1d702ff0
...
...
@@ -40,5 +40,9 @@ SET @@GLOBAL.replicate_wild_ignore_table="";
SELECT @@GLOBAL.replicate_wild_ignore_table;
@@GLOBAL.replicate_wild_ignore_table
SET @@GLOBAL.replicate_wild_ignore_table=null;
SELECT @@GLOBAL.replicate_wild_ignore_table;
@@GLOBAL.replicate_wild_ignore_table
# Cleanup.
SET @@GLOBAL.replicate_wild_ignore_table = @save_replicate_wild_ignore_table;
mysql-test/suite/sys_vars/t/replicate_do_db_basic.test
View file @
1d702ff0
...
...
@@ -35,5 +35,8 @@ SELECT @@GLOBAL.replicate_do_db;
SET
@@
GLOBAL
.
replicate_do_db
=
""
;
SELECT
@@
GLOBAL
.
replicate_do_db
;
SET
@@
GLOBAL
.
replicate_do_db
=
null
;
SELECT
@@
GLOBAL
.
replicate_do_db
;
--
echo
# Cleanup.
SET
@@
GLOBAL
.
replicate_do_db
=
@
save_replicate_do_db
;
mysql-test/suite/sys_vars/t/replicate_do_table_basic.test
View file @
1d702ff0
...
...
@@ -44,5 +44,8 @@ SELECT @@GLOBAL.replicate_do_table;
SET
@@
GLOBAL
.
replicate_do_table
=
""
;
SELECT
@@
GLOBAL
.
replicate_do_table
;
SET
@@
GLOBAL
.
replicate_do_table
=
null
;
SELECT
@@
GLOBAL
.
replicate_do_table
;
--
echo
# Cleanup.
SET
@@
GLOBAL
.
replicate_do_table
=
@
save_replicate_do_table
;
mysql-test/suite/sys_vars/t/replicate_ignore_db_basic.test
View file @
1d702ff0
...
...
@@ -35,5 +35,8 @@ SELECT @@GLOBAL.replicate_ignore_db;
SET
@@
GLOBAL
.
replicate_ignore_db
=
""
;
SELECT
@@
GLOBAL
.
replicate_ignore_db
;
SET
@@
GLOBAL
.
replicate_ignore_db
=
null
;
SELECT
@@
GLOBAL
.
replicate_ignore_db
;
--
echo
# Cleanup.
SET
@@
GLOBAL
.
replicate_ignore_db
=
@
save_replicate_ignore_db
;
mysql-test/suite/sys_vars/t/replicate_ignore_table_basic.test
View file @
1d702ff0
...
...
@@ -44,5 +44,8 @@ SELECT @@GLOBAL.replicate_ignore_table;
SET
@@
GLOBAL
.
replicate_ignore_table
=
""
;
SELECT
@@
GLOBAL
.
replicate_ignore_table
;
SET
@@
GLOBAL
.
replicate_ignore_table
=
null
;
SELECT
@@
GLOBAL
.
replicate_ignore_table
;
--
echo
# Cleanup.
SET
@@
GLOBAL
.
replicate_ignore_table
=
@
save_replicate_ignore_table
;
mysql-test/suite/sys_vars/t/replicate_wild_do_table_basic.test
View file @
1d702ff0
...
...
@@ -44,5 +44,8 @@ SELECT @@GLOBAL.replicate_wild_do_table;
SET
@@
GLOBAL
.
replicate_wild_do_table
=
""
;
SELECT
@@
GLOBAL
.
replicate_wild_do_table
;
SET
@@
GLOBAL
.
replicate_wild_do_table
=
null
;
SELECT
@@
GLOBAL
.
replicate_wild_do_table
;
--
echo
# Cleanup.
SET
@@
GLOBAL
.
replicate_wild_do_table
=
@
save_replicate_wild_do_table
;
mysql-test/suite/sys_vars/t/replicate_wild_ignore_table_basic.test
View file @
1d702ff0
...
...
@@ -44,5 +44,8 @@ SELECT @@GLOBAL.replicate_wild_ignore_table;
SET
@@
GLOBAL
.
replicate_wild_ignore_table
=
""
;
SELECT
@@
GLOBAL
.
replicate_wild_ignore_table
;
SET
@@
GLOBAL
.
replicate_wild_ignore_table
=
null
;
SELECT
@@
GLOBAL
.
replicate_wild_ignore_table
;
--
echo
# Cleanup.
SET
@@
GLOBAL
.
replicate_wild_ignore_table
=
@
save_replicate_wild_ignore_table
;
sql/rpl_filter.cc
View file @
1d702ff0
...
...
@@ -279,6 +279,9 @@ Rpl_filter::parse_filter_rule(const char* spec, Add_filter add)
int
status
=
0
;
char
*
arg
,
*
ptr
,
*
pstr
;
if
(
!
spec
)
return
false
;
if
(
!
(
ptr
=
my_strdup
(
spec
,
MYF
(
MY_WME
))))
return
true
;
...
...
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