1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

5.5 merge

This commit is contained in:
Sergei Golubchik
2013-07-17 21:24:29 +02:00
1704 changed files with 7802 additions and 3315 deletions

View File

@ -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);