bk commit into 5.1 tree (mats:1.1877)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats 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
  1.1877 05/04/15 12:29:15 mats@stripped +1 -0
  WL#2325: Adding early logging tests for row-level events.

  sql/sql_class.cc
    1.177 05/04/15 12:29:10 mats@stripped +4 -2
    WL#2325: Adding early logging tests for row-level events.

# 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:	mats
# Host:	romeo.kindahl.net
# Root:	/home/bk/w2325-mysql-5.1

--- 1.176/sql/sql_class.cc	2005-04-12 19:01:29 +02:00
+++ 1.177/sql/sql_class.cc	2005-04-15 12:29:10 +02:00
@@ -1895,8 +1895,10 @@
     Rows_log_event* const 
 	ev = new RowsEventT(this, table, tid, cols, is_transactional);
     ev->server_id = server_id; // I don't like this, it's too easy to forget. 
-    if (flush_and_set_pending_event(ev))
+    if (!ev->write_to_binlog() || flush_and_set_pending_event(ev)) {
+      delete ev;
       DBUG_RETURN(NULL);
+    }
     DBUG_RETURN(ev);
   }
   DBUG_RETURN(pending);
@@ -2135,7 +2137,7 @@
   Table_map_log_event 
     the_event(this, table, table_id, is_transactional);
 
-  if (mysql_bin_log.write(&the_event))
+  if (the_event.write_to_binlog() && mysql_bin_log.write(&the_event))
     DBUG_RETURN(1);
   DBUG_RETURN(0);
 }