summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlars@mysql.com <>2005-02-10 21:55:36 +0100
committerlars@mysql.com <>2005-02-10 21:55:36 +0100
commit8b9679de0ebf136a5f5674173570662b2802646c (patch)
tree98a29ff7359607fb811de333de13a05517b40be1
parent36c992b264eca68467659f4aeb475ad6c0a53704 (diff)
parentbef05eda10d384a22b4ce2151bacea41fe390b54 (diff)
downloadmariadb-git-8b9679de0ebf136a5f5674173570662b2802646c.tar.gz
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6749-4.1
-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));