bk commit into 5.0 tree (guilhem:1.1901)

[guilhem]

Below is the list of changes that have just been committed into a local
5.0 repository of guilhem. When guilhem 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.1901 05/08/04 16:18:46 guilhem@stripped +2 -0
  fixing compilation defines for row-based (non-row-based build could not build due to my
changes of yesterday).

  sql/log_event.h
    1.118 05/08/04 16:18:42 guilhem@stripped +3 -3
    fixing compilation defines

  sql/handler.cc
    1.187 05/08/04 16:18:42 guilhem@stripped +1 -1
    fixing compilation defines

# 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:	guilhem
# Host:	gbichot3.local
# Root:	/home/mysql_src/mysql-5.0-wl1012

--- 1.186/sql/handler.cc	2005-08-04 00:32:00 +02:00
+++ 1.187/sql/handler.cc	2005-08-04 16:18:42 +02:00
@@ -2502,7 +2502,6 @@
     db_ok_with_wild_table(table->s->db) && 
     strcmp(table->s->db, "mysql") != 0;
 }
-#endif
 
 template<class RowsEventT> bool binlog_log_row(TABLE* table,
                                                const byte *before_record,
@@ -2541,6 +2540,7 @@
 template bool binlog_log_row<Delete_rows_log_event>(TABLE *, const byte *, byte *);
 template bool binlog_log_row<Update_rows_log_event>(TABLE *, const byte *, byte *);
 
+#endif /* HAVE_ROW_BASED_REPLICATION */
 
 int handler::
 ha_write_row(byte *buf) 

--- 1.117/sql/log_event.h	2005-08-04 00:32:00 +02:00
+++ 1.118/sql/log_event.h	2005-08-04 16:18:42 +02:00
@@ -1905,7 +1905,7 @@
   Write_rows_log_event(const char *buf, uint event_len, 
                        const Format_description_log_event *description_event);
 #endif
-#ifndef MYSQL_CLIENT
+#if !defined(MYSQL_CLIENT) && defined(HAVE_ROW_BASED_REPLICATION)
   static bool binlog_row_logging_function(THD *thd, TABLE *table,
                                           bool is_transactional,
                                           MY_BITMAP *cols,
@@ -1972,7 +1972,7 @@
 			const Format_description_log_event *description_event);
 #endif
 
-#ifndef MYSQL_CLIENT
+#if !defined(MYSQL_CLIENT) && defined(HAVE_ROW_BASED_REPLICATION)
   static bool binlog_row_logging_function(THD *thd, TABLE *table,
                                           bool is_transactional,
                                           MY_BITMAP *cols,
@@ -2037,7 +2037,7 @@
   Delete_rows_log_event(const char *buf, uint event_len, 
 			const Format_description_log_event *description_event);
 #endif
-#ifndef MYSQL_CLIENT
+#if !defined(MYSQL_CLIENT) && defined(HAVE_ROW_BASED_REPLICATION)
   static bool binlog_row_logging_function(THD *thd, TABLE *table,
                                           bool is_transactional,
                                           MY_BITMAP *cols,