Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
libmysqld/CMakeLists.txt:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/r/rpl_row_tabledefs_3innodb.result:
  Auto merged
mysql-test/r/rpl_sp.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  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/rpl_injector.cc:
  Auto merged
sql/rpl_injector.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  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_load.cc:
  Auto merged
sql/sql_locale.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
unittest/mysys/my_atomic-t.c:
  Auto merged
sql/log_event.cc:
  Manual merge main->rpl
sql/mysqld.cc:
  Manual merge main->rpl

sql/handler.cc

@@ -3458,7 +3458,6 @@ bool ha_show_status(THD *thd, handlerton *db_type, enum ha_stat_type stat)
   - table is not mysql.event
 */
 
-#ifdef HAVE_ROW_BASED_REPLICATION
 /* The Sun compiler cannot instantiate the template below if this is
    declared static, but it works by putting it into an anonymous
    namespace. */
@@ -3613,7 +3612,6 @@ namespace
   binlog_log_row<Update_rows_log_event>(TABLE *, const byte *, const byte *);
 }
 
-#endif /* HAVE_ROW_BASED_REPLICATION */
 
 int handler::ha_external_lock(THD *thd, int lock_type)
 {
@@ -3654,10 +3652,8 @@ int handler::ha_write_row(byte *buf)
   int error;
   if (unlikely(error= write_row(buf)))
     return error;
-#ifdef HAVE_ROW_BASED_REPLICATION
   if (unlikely(error= binlog_log_row<Write_rows_log_event>(table, 0, buf)))
     return error;
-#endif
   return 0;
 }
 
@@ -3673,10 +3669,8 @@ int handler::ha_update_row(const byte *old_data, byte *new_data)
 
   if (unlikely(error= update_row(old_data, new_data)))
     return error;
-#ifdef HAVE_ROW_BASED_REPLICATION
   if (unlikely(error= binlog_log_row<Update_rows_log_event>(table, old_data, new_data)))
     return error;
-#endif
   return 0;
 }
 
@@ -3685,10 +3679,8 @@ int handler::ha_delete_row(const byte *buf)
   int error;
   if (unlikely(error= delete_row(buf)))
     return error;
-#ifdef HAVE_ROW_BASED_REPLICATION
   if (unlikely(error= binlog_log_row<Delete_rows_log_event>(table, buf, 0)))
     return error;
-#endif
   return 0;
 }