From d71fb7b79ab3892b03207bfa6be6ee9809f492cd Mon Sep 17 00:00:00 2001
From: unknown <cbell/Chuck@suse.vabb.com>
Date: Thu, 7 Dec 2006 09:18:35 -0500
Subject: WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code. Please
 see worklog for details on files changed.

BitKeeper/deleted/.del-have_row_based.require:
  Delete: mysql-test/r/have_row_based.require
BitKeeper/deleted/.del-not_row_based.require:
  Delete: mysql-test/r/not_row_based.require
BitKeeper/deleted/.del-have_row_based.inc:
  Delete: mysql-test/include/have_row_based.inc
BitKeeper/deleted/.del-not_row_based.inc:
  Delete: mysql-test/include/not_row_based.inc
BitKeeper/deleted/.del-replication.m4:
  Delete: config/ac-macros/replication.m4
---
 sql/handler.cc | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'sql/handler.cc')

diff --git a/sql/handler.cc b/sql/handler.cc
index f16876f2ffd..8d4f4aec428 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -3455,7 +3455,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. */
@@ -3608,7 +3607,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)
 {
@@ -3649,10 +3647,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;
 }
 
@@ -3668,10 +3664,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;
 }
 
@@ -3680,10 +3674,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;
 }
 
-- 
cgit v1.2.1