List:Commits« Previous MessageNext Message »
From:Lars Thalmann Date:January 4 2006 3:25pm
Subject:bk commit into 5.1 tree (lars:1.2033) BUG#16188
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of lthalmann. When lthalmann 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.2033 06/01/04 16:24:58 lars@stripped +1 -0
  BUG#16188: Could not compile

  sql/sql_class.cc
    1.231 06/01/04 16:24:43 lars@stripped +2 -0
    Needed to be able to compile without RBR

# 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:	lars
# Host:	dl145h.mysql.com
# Root:	/users/lthalmann/bk/mysql-5.1-new

--- 1.230/sql/sql_class.cc	2006-01-04 15:04:20 +01:00
+++ 1.231/sql/sql_class.cc	2006-01-04 16:24:43 +01:00
@@ -1976,6 +1976,7 @@
   backup->client_capabilities= client_capabilities;
   backup->savepoints= transaction.savepoints;
 
+#ifdef HAVE_ROW_BASED_REPLICATION
   /*
     For row-based replication and before executing a function/trigger,
     the pending rows event has to be flushed.  The function/trigger
@@ -1992,6 +1993,7 @@
   */
   if (binlog_row_based)
     binlog_flush_pending_rows_event(false);
+#endif /* HAVE_ROW_BASED_REPLICATION */
 
   if ((!lex->requires_prelocking() || is_update_query(lex->sql_command)) &&
       !binlog_row_based)
Thread
bk commit into 5.1 tree (lars:1.2033) BUG#16188Lars Thalmann4 Jan