bzr commit into mysql-5.1 branch (mikael:2850) WL#4832

[Mikael Ronstrom]

#At file:///home/mikael/mysql_clones/LOCK_log/

 2850 Mikael Ronstrom	2009-05-08
      WL#4832 Patch 3 of 3: Remove use of LOCK_log from write statement to binlog
      modified:
        sql/log.cc

=== modified file 'sql/log.cc'
--- a/sql/log.cc	2009-05-08 16:43:26 +0000
+++ b/sql/log.cc	2009-05-08 16:50:34 +0000
@@ -3909,8 +3909,6 @@ bool MYSQL_BIN_LOG::write(Log_event *eve
     thd->prelocked_mode && thd->lex->requires_prelocking();
   thd->binlog_flush_pending_rows_event(end_stmt);
 
-  pthread_mutex_lock(&LOCK_log);
-
   /*
      In most cases this is only called if 'is_open()' is true; in fact this is
      mostly called if is_open() *was* true a few instructions before, but it
@@ -3937,7 +3935,6 @@ bool MYSQL_BIN_LOG::write(Log_event *eve
     if ((thd && !(thd->options & OPTION_BIN_LOG)) ||
 	(!binlog_filter->db_ok(local_db)))
     {
-      VOID(pthread_mutex_unlock(&LOCK_log));
       DBUG_RETURN(0);
     }
 #endif /* HAVE_REPLICATION */
@@ -4036,7 +4033,6 @@ err:
     }
   }
 
-  pthread_mutex_unlock(&LOCK_log);
   DBUG_RETURN(error);
 }