5.5 merge

1 files changed, 7 insertions, 6 deletions

diff --git a/sql/rpl_filter.cc b/sql/rpl_filter.cc
index 2e7a2242d45..72e7770b6ee 100644
--- a/sql/rpl_filter.cc
+++ b/sql/rpl_filter.cc
@@ -156,14 +156,15 @@ 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_PRINT("exit", ("Don't replicate"));
-    DBUG_RETURN(0);
-  }
+    DBUG_RETURN(1);
+
   if (!do_db.is_empty()) // if the do's are not empty
   {
     I_List_iterator<i_string> it(do_db);