Skip to content

Commit 1d702ff

Browse files
author
Alexey Botchkov
committed
MDEV-8329 MariaDB crashes when replicate_wild_ignore_table is set to NULL.
Rpl_filter::parse_filter_rule() made NULL-safe.
1 parent d67ef7a commit 1d702ff

13 files changed

+45
-0
lines changed

mysql-test/suite/sys_vars/r/replicate_do_db_basic.result

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,9 @@ SET @@GLOBAL.replicate_do_db="";
3333
SELECT @@GLOBAL.replicate_do_db;
3434
@@GLOBAL.replicate_do_db
3535

36+
SET @@GLOBAL.replicate_do_db=null;
37+
SELECT @@GLOBAL.replicate_do_db;
38+
@@GLOBAL.replicate_do_db
39+
3640
# Cleanup.
3741
SET @@GLOBAL.replicate_do_db = @save_replicate_do_db;

mysql-test/suite/sys_vars/r/replicate_do_table_basic.result

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,9 @@ SET @@GLOBAL.replicate_do_table="";
4040
SELECT @@GLOBAL.replicate_do_table;
4141
@@GLOBAL.replicate_do_table
4242

43+
SET @@GLOBAL.replicate_do_table=null;
44+
SELECT @@GLOBAL.replicate_do_table;
45+
@@GLOBAL.replicate_do_table
46+
4347
# Cleanup.
4448
SET @@GLOBAL.replicate_do_table = @save_replicate_do_table;

mysql-test/suite/sys_vars/r/replicate_ignore_db_basic.result

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,9 @@ SET @@GLOBAL.replicate_ignore_db="";
3333
SELECT @@GLOBAL.replicate_ignore_db;
3434
@@GLOBAL.replicate_ignore_db
3535

36+
SET @@GLOBAL.replicate_ignore_db=null;
37+
SELECT @@GLOBAL.replicate_ignore_db;
38+
@@GLOBAL.replicate_ignore_db
39+
3640
# Cleanup.
3741
SET @@GLOBAL.replicate_ignore_db = @save_replicate_ignore_db;

mysql-test/suite/sys_vars/r/replicate_ignore_table_basic.result

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,9 @@ SET @@GLOBAL.replicate_ignore_table="";
4040
SELECT @@GLOBAL.replicate_ignore_table;
4141
@@GLOBAL.replicate_ignore_table
4242

43+
SET @@GLOBAL.replicate_ignore_table=null;
44+
SELECT @@GLOBAL.replicate_ignore_table;
45+
@@GLOBAL.replicate_ignore_table
46+
4347
# Cleanup.
4448
SET @@GLOBAL.replicate_ignore_table = @save_replicate_ignore_table;

mysql-test/suite/sys_vars/r/replicate_wild_do_table_basic.result

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,9 @@ SET @@GLOBAL.replicate_wild_do_table="";
4040
SELECT @@GLOBAL.replicate_wild_do_table;
4141
@@GLOBAL.replicate_wild_do_table
4242

43+
SET @@GLOBAL.replicate_wild_do_table=null;
44+
SELECT @@GLOBAL.replicate_wild_do_table;
45+
@@GLOBAL.replicate_wild_do_table
46+
4347
# Cleanup.
4448
SET @@GLOBAL.replicate_wild_do_table = @save_replicate_wild_do_table;

mysql-test/suite/sys_vars/r/replicate_wild_ignore_table_basic.result

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,9 @@ SET @@GLOBAL.replicate_wild_ignore_table="";
4040
SELECT @@GLOBAL.replicate_wild_ignore_table;
4141
@@GLOBAL.replicate_wild_ignore_table
4242

43+
SET @@GLOBAL.replicate_wild_ignore_table=null;
44+
SELECT @@GLOBAL.replicate_wild_ignore_table;
45+
@@GLOBAL.replicate_wild_ignore_table
46+
4347
# Cleanup.
4448
SET @@GLOBAL.replicate_wild_ignore_table = @save_replicate_wild_ignore_table;

mysql-test/suite/sys_vars/t/replicate_do_db_basic.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,8 @@ SELECT @@GLOBAL.replicate_do_db;
3535
SET @@GLOBAL.replicate_do_db="";
3636
SELECT @@GLOBAL.replicate_do_db;
3737

38+
SET @@GLOBAL.replicate_do_db=null;
39+
SELECT @@GLOBAL.replicate_do_db;
40+
3841
--echo # Cleanup.
3942
SET @@GLOBAL.replicate_do_db = @save_replicate_do_db;

mysql-test/suite/sys_vars/t/replicate_do_table_basic.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,8 @@ SELECT @@GLOBAL.replicate_do_table;
4444
SET @@GLOBAL.replicate_do_table="";
4545
SELECT @@GLOBAL.replicate_do_table;
4646

47+
SET @@GLOBAL.replicate_do_table=null;
48+
SELECT @@GLOBAL.replicate_do_table;
49+
4750
--echo # Cleanup.
4851
SET @@GLOBAL.replicate_do_table = @save_replicate_do_table;

mysql-test/suite/sys_vars/t/replicate_ignore_db_basic.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,8 @@ SELECT @@GLOBAL.replicate_ignore_db;
3535
SET @@GLOBAL.replicate_ignore_db="";
3636
SELECT @@GLOBAL.replicate_ignore_db;
3737

38+
SET @@GLOBAL.replicate_ignore_db=null;
39+
SELECT @@GLOBAL.replicate_ignore_db;
40+
3841
--echo # Cleanup.
3942
SET @@GLOBAL.replicate_ignore_db = @save_replicate_ignore_db;

mysql-test/suite/sys_vars/t/replicate_ignore_table_basic.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,8 @@ SELECT @@GLOBAL.replicate_ignore_table;
4444
SET @@GLOBAL.replicate_ignore_table="";
4545
SELECT @@GLOBAL.replicate_ignore_table;
4646

47+
SET @@GLOBAL.replicate_ignore_table=null;
48+
SELECT @@GLOBAL.replicate_ignore_table;
49+
4750
--echo # Cleanup.
4851
SET @@GLOBAL.replicate_ignore_table = @save_replicate_ignore_table;

0 commit comments

Comments
 (0)