Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


client/mysqlbinlog.cc:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/extra/rpl_tests/rpl_insert_id.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysys/mf_iocache2.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_xmlfunc.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/t/disabled.def:
  Manual merge
sql/log.cc:
  Manual merge
sql/sql_insert.cc:
  Manual merge

1 files changed, 5 insertions, 5 deletions

diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index 027cf2ea435..66f440ff048 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -486,18 +486,15 @@ write_event_header_and_base64(Log_event *ev, FILE *result_file,
   DBUG_ENTER("write_event_header_and_base64");
   /* Write header and base64 output to cache */
   IO_CACHE result_cache;
-  if (init_io_cache(&result_cache, -1, 0, WRITE_CACHE, 0L, FALSE,
-                    MYF(MY_WME | MY_NABP)))
-  {
+  if (open_cached_file(&result_cache, NULL, NULL, 0, MYF(MY_WME | MY_NABP)))
     return 1;
-  }
 
   ev->print_header(&result_cache, print_event_info, FALSE);
   ev->print_base64(&result_cache, print_event_info, FALSE);
 
   /* Read data from cache and write to result file */
   my_b_copy_to_file(&result_cache, result_file);
-  end_io_cache(&result_cache);
+  close_cached_file(&result_cache);
   DBUG_RETURN(0);
 }
 
@@ -1016,6 +1013,9 @@ static int dump_log_entries(const char* logname)
 {
   int rc;
   PRINT_EVENT_INFO print_event_info;
+
+  if (!print_event_info.init_ok())
+    return 1;
   /*
      Set safe delimiter, to dump things
      like CREATE PROCEDURE safely