List:Commits« Previous MessageNext Message »
From:Lars Thalmann Date:January 31 2006 12:08pm
Subject:bk commit into 5.1 tree (lars:1.2100) BUG#16837
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.2100 06/01/31 13:08:07 lars@stripped +4 -0
  BUG#16837: Compile --without-row-based-replication failed
  Added #ifdef's
  Changed so that binlog_flush_pending_rows_events is not called twice

  sql/sql_load.cc
    1.91 06/01/31 13:07:58 lars@stripped +0 -4
    BUG#16837: Compile --without-row-based-replication failed
    Added #ifdef

  sql/sql_class.h
    1.284 06/01/31 13:07:58 lars@stripped +4 -4
    BUG#16837: Compile --without-row-based-replication failed
    Added #ifdef

  sql/sql_class.cc
    1.242 06/01/31 13:07:58 lars@stripped +14 -4
    Changed so that binlog_flush_pending_rows_event will only be called once

  sql/log.cc
    1.190 06/01/31 13:07:57 lars@stripped +10 -0
    BUG#16837: Compile --without-row-based-replication failed
    Added #ifdef

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

--- 1.189/sql/log.cc	2006-01-27 14:10:37 +01:00
+++ 1.190/sql/log.cc	2006-01-31 13:07:57 +01:00
@@ -2583,6 +2583,9 @@
   DBUG_RETURN(0);
 }
 
+
+#ifdef HAVE_ROW_BASED_REPLICATION
+
 Rows_log_event*
 THD::binlog_get_pending_rows_event() const
 {
@@ -2597,6 +2600,7 @@
   return trx_data ? trx_data->pending : NULL;
 }
 
+
 void
 THD::binlog_set_pending_rows_event(Rows_log_event* ev)
 {
@@ -2710,6 +2714,9 @@
   DBUG_RETURN(error);
 }
 
+#endif /* HAVE_ROW_BASED_REPLICATION */
+
+
 /*
   Write an event to the binary log
 */
@@ -3499,6 +3506,7 @@
   DBUG_PRINT("enter", ("table=%p (%s: %u)",
                        table, table->s->table_name, table->s->table_map_id));
 
+#ifdef HAVE_ROW_BASED_REPLICATION
   /* Pre-conditions */
   DBUG_ASSERT(binlog_row_based && is_open());
   DBUG_ASSERT(table->s->table_map_id != ULONG_MAX);
@@ -3524,6 +3532,8 @@
     DBUG_RETURN(1);
 
   table->s->table_map_version= m_table_map_version;
+#endif /* HAVE_ROW_BASED_REPLICATION */
+
   DBUG_RETURN(0);
 }
 #endif /* !defined(MYSQL_CLIENT) */

--- 1.241/sql/sql_class.cc	2006-01-24 13:33:58 +01:00
+++ 1.242/sql/sql_class.cc	2006-01-31 13:07:58 +01:00
@@ -2008,7 +2008,6 @@
   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
@@ -2025,7 +2024,6 @@
   */
   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)
@@ -2552,6 +2550,18 @@
   }
 }
 
+#else /* HAVE_ROW_BASED_REPLICATION */
+
+int THD::binlog_flush_pending_rows_event(bool stmt_end)
+{
+  return 0;
+}
+
+
+void THD::binlog_delete_pending_rows_event()
+{
+}
+
 #endif /* HAVE_ROW_BASED_REPLICATION */
 
 /*
@@ -2586,7 +2596,7 @@
     */
   case THD::ROW_QUERY_TYPE:
     if (binlog_row_based)
-      DBUG_RETURN(binlog_flush_pending_rows_event(true));
+      DBUG_RETURN(error);
     /* Otherwise, we fall through */
   case THD::STMT_QUERY_TYPE:
     /*
@@ -2606,7 +2616,7 @@
   default:
     DBUG_ASSERT(0 <= qtype && qtype < QUERY_TYPE_COUNT);
   }
-  DBUG_RETURN(0);
+  DBUG_RETURN(error);
 }
 
 #endif /* !defined(MYSQL_CLIENT) */

--- 1.283/sql/sql_class.h	2006-01-23 08:59:21 +01:00
+++ 1.284/sql/sql_class.h	2006-01-31 13:07:58 +01:00
@@ -932,7 +932,6 @@
 				      RowsEventT* hint);
   Rows_log_event* binlog_get_pending_rows_event() const;
   void            binlog_set_pending_rows_event(Rows_log_event* ev);
-  int             binlog_setup_trx_data();
   
   my_size_t max_row_length_blob(TABLE* table, const byte *data) const;
   my_size_t max_row_length(TABLE* table, const byte *data) const
@@ -948,12 +947,13 @@
   my_size_t pack_row(TABLE* table, MY_BITMAP const* cols, byte *row_data,
                      const byte *data) const;
 
-  int binlog_flush_pending_rows_event(bool stmt_end);
-  void binlog_delete_pending_rows_event();
-
 #endif
 #endif /* HAVE_ROW_BASED_REPLICATION */
 #ifndef MYSQL_CLIENT
+  int binlog_flush_pending_rows_event(bool stmt_end);
+  void binlog_delete_pending_rows_event();
+  int binlog_setup_trx_data();
+
   enum enum_binlog_query_type {
       /*
         The query can be logged row-based or statement-based

--- 1.90/sql/sql_load.cc	2005-12-26 10:50:36 +01:00
+++ 1.91/sql/sql_load.cc	2006-01-31 13:07:58 +01:00
@@ -414,7 +414,6 @@
 #ifndef EMBEDDED_LIBRARY
     if (mysql_bin_log.is_open())
     {
-#ifdef HAVE_ROW_BASED_REPLICATION
       /*
         We need to do the job that is normally done inside
         binlog_query() here, which is to ensure that the pending event
@@ -426,7 +425,6 @@
       if (binlog_row_based)
         thd->binlog_flush_pending_rows_event(true);
       else
-#endif
       {
 	/*
 	  Make sure last block (the one which caused the error) gets
@@ -479,7 +477,6 @@
 #ifndef EMBEDDED_LIBRARY
   if (mysql_bin_log.is_open())
   {
-#ifdef HAVE_ROW_BASED_REPLICATION
     /*
       We need to do the job that is normally done inside
       binlog_query() here, which is to ensure that the pending event
@@ -491,7 +488,6 @@
     if (binlog_row_based)
       thd->binlog_flush_pending_rows_event(true);
     else
-#endif
     {
       /*
         As already explained above, we need to call end_io_cache() or the last
Thread
bk commit into 5.1 tree (lars:1.2100) BUG#16837Lars Thalmann31 Jan