bzr push into mysql-5.1 branch (hezx:2676 to 2677) Bug#38290

[He Zhenxing]

 2677 He Zhenxing	2008-08-14
      BUG#38290 valgrind warnings in binlog_base64_flag
      
      The problem was because the event allocated in mysql_client_binlog_statement
      was not freed when an error occured while applying the event.
modified:
  sql/sql_binlog.cc

 2676 Serge Kozlov	2008-08-13
      Bug#18817, removing --binlog-format option from .opt files
removed:
  mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt
  mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt
  mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt
modified:
  mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test

=== modified file 'sql/sql_binlog.cc'
--- a/sql/sql_binlog.cc	2008-02-19 12:45:21 +0000
+++ b/sql/sql_binlog.cc	2008-08-14 02:42:10 +0000
@@ -208,6 +208,7 @@ void mysql_client_binlog_statement(THD* 
 #if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
       if (apply_event_and_update_pos(ev, thd, thd->rli_fake, FALSE))
       {
+        delete ev;
         /*
           TODO: Maybe a better error message since the BINLOG statement
           now contains several events.