diff options
| author | Sujatha Sivakumar <sujatha.sivakumar@oracle.com> | 2013-03-27 11:59:40 +0530 |
|---|---|---|
| committer | Sujatha Sivakumar <sujatha.sivakumar@oracle.com> | 2013-03-27 11:59:40 +0530 |
| commit | e3c201d705511dc5aa6646ce4c5bf6e33880a1a1 (patch) | |
| tree | efc3b01b381df63b379477f7e2a127ed0edbac4f | |
| parent | 92c56b203a2ba334d4a7273d5535409f4b2983fe (diff) | |
| parent | 0e763f4db5e024e75fdedb9bc3c3cbd1a45ed9e5 (diff) | |
| download | mariadb-git-e3c201d705511dc5aa6646ce4c5bf6e33880a1a1.tar.gz | |
Merge from mysql-5.1 to mysql-5.5
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_loaddata_m.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_loaddata_m.test | 2 | ||||
| -rw-r--r-- | sql/rpl_filter.cc | 9 |
3 files changed, 8 insertions, 5 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_loaddata_m.result b/mysql-test/suite/rpl/r/rpl_loaddata_m.result index c34021b1fef..538592f0d43 100644 --- a/mysql-test/suite/rpl/r/rpl_loaddata_m.result +++ b/mysql-test/suite/rpl/r/rpl_loaddata_m.result @@ -33,5 +33,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 1fe9283ef44..b9dffa3fb80 100644 --- a/mysql-test/suite/rpl/t/rpl_loaddata_m.test +++ b/mysql-test/suite/rpl/t/rpl_loaddata_m.test @@ -44,7 +44,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 e8b7837744b..57dde6c7875 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 { |