List:Commits« Previous MessageNext Message »
From:Luis Soares Date:November 30 2010 6:23pm
Subject:bzr push into mysql-trunk-bugfixing branch (luis.soares:3396 to 3397)
View as plain text  
 3397 Luis Soares	2010-11-30 [merge]
      BUG 57288: manual merge from mysql-5.5-bugteam.
      
      Conflicts
      =========
      Text conflict in sql/log.cc

    modified:
      sql/binlog.cc
 3396 Christopher Powers	2010-11-30 [merge]
      Null-merge from mysql-5.5-bugteam

=== modified file 'sql/binlog.cc'
--- a/sql/binlog.cc	2010-11-29 11:28:55 +0000
+++ b/sql/binlog.cc	2010-11-30 18:20:57 +0000
@@ -2042,7 +2042,7 @@ bool MYSQL_BIN_LOG::reset_logs(THD* thd)
   }
 
   /* Start logging with a new file */
-  close(LOG_CLOSE_INDEX);
+  close(LOG_CLOSE_INDEX | LOG_CLOSE_TO_BE_OPENED);
   if ((error= my_delete_allow_opened(index_file_name, MYF(0))))	// Reset (open will update)
   {
     if (my_errno == ENOENT) 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-bugfixing branch (luis.soares:3396 to 3397) Luis Soares30 Nov