database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge from mysql-5.1 to mysql-5.5

Browse Source
This commit is contained in:
Sujatha Sivakumar
2013-03-27 11:59:40 +05:30
parent 92c56b203a 0e763f4db5
commit e3c201d705
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/rpl/r/rpl_loaddata_m.result
View File

@ -33,5 +33,5 @@ SELECT COUNT(*) FROM mysqltest.t1;
COUNT(*) COUNT(*)
2 2
DROP DATABASE mysqltest; DROP DATABASE mysqltest;
DROP TABLE test.t1; DROP TABLE IF EXISTS test.t1;
include/rpl_end.inc include/rpl_end.inc

2
mysql-test/suite/rpl/t/rpl_loaddata_m.test
View File

@ -44,7 +44,7 @@ SELECT COUNT(*) FROM mysqltest.t1;
# Cleanup # Cleanup
connection master; connection master;
DROP DATABASE mysqltest; DROP DATABASE mysqltest;
DROP TABLE test.t1; DROP TABLE IF EXISTS test.t1;
sync_slave_with_master; sync_slave_with_master;
# End of test # End of test

9
sql/rpl_filter.cc
View File

@ -154,11 +154,14 @@ Rpl_filter::db_ok(const char* db)
DBUG_RETURN(1); // Ok to replicate if the user puts no constraints DBUG_RETURN(1); // Ok to replicate if the user puts no constraints
/* /*
If the user has specified restrictions on which databases to replicate Previous behaviour "if the user has specified restrictions on which
and db was not selected, do not replicate. 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) if (!db)
DBUG_RETURN(0); DBUG_RETURN(1);
if (!do_db.is_empty()) // if the do's are not empty if (!do_db.is_empty()) // if the do's are not empty
{ {