diff --git a/mysql-test/suite/rpl/r/rpl_loaddata_m.result b/mysql-test/suite/rpl/r/rpl_loaddata_m.result
index ad9fb6e0896..58339811a1a 100644
--- a/mysql-test/suite/rpl/r/rpl_loaddata_m.result
+++ b/mysql-test/suite/rpl/r/rpl_loaddata_m.result
@@ -32,5 +32,5 @@ SELECT COUNT(*) FROM mysqltest.t1;
 COUNT(*)
 2
 DROP DATABASE mysqltest;
-DROP TABLE test.t1;
+DROP TABLE IF EXISTS test.t1;
 include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_loaddata_m.test b/mysql-test/suite/rpl/t/rpl_loaddata_m.test
index bbe11bbb887..034fefa95f5 100644
--- a/mysql-test/suite/rpl/t/rpl_loaddata_m.test
+++ b/mysql-test/suite/rpl/t/rpl_loaddata_m.test
@@ -46,7 +46,7 @@ SELECT COUNT(*) FROM mysqltest.t1;
 # Cleanup
 connection master;
 DROP DATABASE mysqltest;
-DROP TABLE test.t1;
+DROP TABLE IF EXISTS test.t1;
 sync_slave_with_master;
 
 # End of test
diff --git a/sql/rpl_filter.cc b/sql/rpl_filter.cc
index 3d38c243a0a..cee518ebf0f 100644
--- a/sql/rpl_filter.cc
+++ b/sql/rpl_filter.cc
@@ -154,11 +154,14 @@ Rpl_filter::db_ok(const char* db)
     DBUG_RETURN(1); // Ok to replicate if the user puts no constraints
 
   /*
-    If the user has specified restrictions on which databases to replicate
-    and db was not selected, do not replicate.
+    Previous behaviour "if the user has specified restrictions on which
+    databases to replicate and db was not selected, do not replicate" has
+    been replaced with "do replicate".
+    Since the filtering criteria is not equal to "NULL" the statement should
+    be logged into binlog.
   */
   if (!db)
-    DBUG_RETURN(0);
+    DBUG_RETURN(1);
 
   if (!do_db.is_empty()) // if the do's are not empty
   {