bk commit into 5.1 tree (guilhem:1.2478)

[Guilhem Bichot]

Below is the list of changes that have just been committed into a local
5.1 repository of guilhem. When guilhem does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-22 15:35:15+01:00, guilhem@stripped +6 -0
  Merge gbichot@stripped:/home/bk/mysql-5.1-rpl
  into  gbichot3.local:/home/mysql_src/mysql-5.1-rpl-26194
  will fix by hand
  MERGE: 1.2343.58.2

  client/mysqlbinlog.cc@stripped, 2007-03-22 15:33:43+01:00, guilhem@stripped +9 -10
    weird
    MERGE: 1.141.1.2

  mysql-test/r/mysqlbinlog_base64.result@stripped, 2007-03-22 15:21:35+01:00,
guilhem@stripped +0 -20
    Auto merged
    MERGE: 1.3.1.1

  mysql-test/t/mysqlbinlog_base64.test@stripped, 2007-03-22 15:21:35+01:00,
guilhem@stripped +0 -28
    Auto merged
    MERGE: 1.3.1.1

  mysys/mf_iocache2.c@stripped, 2007-03-22 15:21:35+01:00, guilhem@stripped +0 -7
    Auto merged
    MERGE: 1.30.1.1

  sql/log_event.cc@stripped, 2007-03-22 15:35:11+01:00, guilhem@stripped +0 -7
    merge
    MERGE: 1.259.2.2

  sql/log_event.h@stripped, 2007-03-22 15:21:35+01:00, guilhem@stripped +0 -9
    Auto merged
    MERGE: 1.142.2.2

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	guilhem
# Host:	gbichot3.local
# Root:	/home/mysql_src/mysql-5.1-rpl-26194/RESYNC

--- 1.274/sql/log_event.cc	2007-03-22 15:35:27 +01:00
+++ 1.275/sql/log_event.cc	2007-03-22 15:35:27 +01:00
@@ -75,8 +75,7 @@ public:
 
   ~Write_on_release_cache()
   {
-    if (!my_b_copy_to_file(m_cache, m_file))
-      reinit_io_cache(m_cache, WRITE_CACHE, 0L, FALSE, TRUE);
+    copy_event_cache_to_file_and_reinit(m_cache, m_file);
     if (m_flags | FLUSH_F)
       fflush(m_file);
   }
@@ -6160,10 +6159,8 @@ void Rows_log_event::print_helper(FILE *
 
   if (get_flags(STMT_END_F))
   {
-    my_b_copy_to_file(head, file);
-    my_b_copy_to_file(body, file);
-    reinit_io_cache(head, WRITE_CACHE, 0, FALSE, TRUE);
-    reinit_io_cache(body, WRITE_CACHE, 0, FALSE, TRUE);
+    copy_event_cache_to_file_and_reinit(head, file);
+    copy_event_cache_to_file_and_reinit(body, file);
   }
 }
 #endif

--- 1.149/sql/log_event.h	2007-03-22 15:35:27 +01:00
+++ 1.150/sql/log_event.h	2007-03-22 15:35:27 +01:00
@@ -2230,4 +2230,12 @@ private:
 #endif
 };
 
+static inline bool copy_event_cache_to_file_and_reinit(IO_CACHE *cache,
+                                                       FILE *file)
+{
+  return         
+    my_b_copy_to_file(cache, file) ||
+    reinit_io_cache(cache, WRITE_CACHE, 0, FALSE, TRUE);
+}
+
 #endif /* _log_event_h */