summaryrefslogtreecommitdiff
path: root/sql/log.cc
diff options
context:
space:
mode:
authorunknown <lars@mysql.com>2005-02-10 21:23:48 +0100
committerunknown <lars@mysql.com>2005-02-10 21:23:48 +0100
commit9f4f798049fabca4ef4441ce9583b5c145d572f3 (patch)
treebf94a453e370e3f5e60cd1c464a90283440d599e /sql/log.cc
parent6a1e75621155f700bc6912f9669a5a374342b712 (diff)
downloadmariadb-git-9f4f798049fabca4ef4441ce9583b5c145d572f3.tar.gz
BUG#6749: If there is no current database, then nothing should be binlogged if
binlog-do-db or binlog-ignore-db are in effect. (In the future 5.1? 5.0? I think each statement should be verified against the filtering criteria based on the database it *uses* and not the *current* one. But, right now the *current* database is what counts according to the semantics of the manual.) sql/log.cc: BUG#6749: If there is no current database, then nothing should be binlogged if binlog-do-db or binlog-ignore-db are in effect. (In the future I think that each statement should be verified against the filtering criteria based on the database it *uses* and not the *current* one. But, right now the *current* database is what counts according to the semantics of the manual.)
Diffstat (limited to 'sql/log.cc')
-rw-r--r--sql/log.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc
index 38844877f1b..46b44837e0f 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -1274,7 +1274,7 @@ bool MYSQL_LOG::write(Log_event* event_info)
binlog_[wild_]{do|ignore}_table?" (WL#1049)"
*/
if ((thd && !(thd->options & OPTION_BIN_LOG)) ||
- (local_db && !db_ok(local_db, binlog_do_db, binlog_ignore_db)))
+ (!db_ok(local_db, binlog_do_db, binlog_ignore_db)))
{
VOID(pthread_mutex_unlock(&LOCK_log));
DBUG_PRINT("error",("!db_ok('%s')", local_db));