Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl

into  mysql.com:/home/bk/MERGE/mysql-5.1-merge


client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
config/ac-macros/ha_ndbcluster.m4:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/rpl_timezone.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/rpl_injector.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/t/mysqldump.test:
  Manual merge
sql/log_event.cc:
  manual merge

1 files changed, 0 insertions, 9 deletions

diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 191fc60dfd5..eca301aa1c6 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -2281,7 +2281,6 @@ bool delayed_insert::handle_inserts(void)
   thd.proc_info=0;
   pthread_mutex_unlock(&mutex);
 
-#ifdef HAVE_ROW_BASED_REPLICATION
   /*
     We need to flush the pending event when using row-based
     replication since the flushing normally done in binlog_query() is
@@ -2296,7 +2295,6 @@ bool delayed_insert::handle_inserts(void)
    */
   if (thd.current_stmt_binlog_row_based)
     thd.binlog_flush_pending_rows_event(TRUE);
-#endif /* HAVE_ROW_BASED_REPLICATION */
 
   if ((error=table->file->extra(HA_EXTRA_NO_CACHE)))
   {						// This shouldn't happen
@@ -2950,7 +2948,6 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
   DBUG_ENTER("select_create::prepare");
 
   TABLEOP_HOOKS *hook_ptr= NULL;
-#ifdef HAVE_ROW_BASED_REPLICATION
   class MY_HOOKS : public TABLEOP_HOOKS {
   public:
     MY_HOOKS(select_create *x) : ptr(x) { }
@@ -2972,11 +2969,9 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
 
   MY_HOOKS hooks(this);
   hook_ptr= &hooks;
-#endif
 
   unit= u;
 
-#ifdef HAVE_ROW_BASED_REPLICATION
   /*
     Start a statement transaction before the create if we are creating
     a non-temporary table and are using row-based replication for the
@@ -2987,7 +2982,6 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
   {
     thd->binlog_start_trans_and_stmt();
   }
-#endif
 
   if (!(table= create_table_from_items(thd, create_info, create_table,
                                        extra_fields, keys, &values,
@@ -3031,8 +3025,6 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
   DBUG_RETURN(0);
 }
 
-
-#ifdef HAVE_ROW_BASED_REPLICATION
 void
 select_create::binlog_show_create_table(TABLE **tables, uint count)
 {
@@ -3073,7 +3065,6 @@ select_create::binlog_show_create_table(TABLE **tables, uint count)
                     /* is_trans */ TRUE,
                     /* suppress_use */ FALSE);
 }
-#endif // HAVE_ROW_BASED_REPLICATION
 
 void select_create::store_values(List<Item> &values)
 {