bk commit into 5.1 tree (monty:1.2208)

[monty]

Below is the list of changes that have just been committed into a local
5.1 repository of monty. When monty 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.2208 06/06/23 03:21:12 monty@stripped +2 -0
  Fixed problem when compiling libmysqld (without replication)
  This change allows us to use the stmt_binlog function in the code without ifdefs
  (We should avoid having ifdefs in the .cc and .c files)

  sql/sql_class.h
    1.303 06/06/23 03:21:08 monty@stripped +6 -2
    Fixed problem when compiling libmysqld (without replication)
    This change allows us to use the stmt_binlog function in the code without ifdefs
    (We should avoid having ifdefs in the .cc and .c files)

  sql/handler.h
    1.219 06/06/23 03:21:08 monty@stripped +6 -6
    Removed compiler warnings

# 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:	monty
# Host:	narttu.mysql.fi
# Root:	/home/my/mysql-5.1

--- 1.218/sql/handler.h	2006-06-22 22:44:17 +03:00
+++ 1.219/sql/handler.h	2006-06-23 03:21:08 +03:00
@@ -1646,10 +1646,10 @@
 void ha_binlog_wait(THD *thd);
 int ha_binlog_end(THD *thd);
 #else
-#define ha_reset_logs(a) 0
-#define ha_binlog_index_purge_file(a,b) 0
-#define ha_reset_slave(a)
-#define ha_binlog_log_query(a,b,c,d,e,f,g);
-#define ha_binlog_wait(a)
-#define ha_binlog_end(a) 0
+#define ha_reset_logs(a) do {} while (0)
+#define ha_binlog_index_purge_file(a,b) do {} while (0)
+#define ha_reset_slave(a) do {} while (0)
+#define ha_binlog_log_query(a,b,c,d,e,f,g) do {} while (0)
+#define ha_binlog_wait(a) do {} while (0)
+#define ha_binlog_end(a)  do {} while (0)
 #endif

--- 1.302/sql/sql_class.h	2006-06-23 03:02:58 +03:00
+++ 1.303/sql/sql_class.h	2006-06-23 03:21:08 +03:00
@@ -1415,21 +1415,25 @@
   void restore_sub_statement_state(Sub_statement_state *backup);
   void set_n_backup_active_arena(Query_arena *set, Query_arena *backup);
   void restore_active_arena(Query_arena *set, Query_arena *backup);
-#ifdef HAVE_ROW_BASED_REPLICATION
   inline void set_current_stmt_binlog_row_based_if_mixed()
   {
+#ifdef HAVE_ROW_BASED_REPLICATION
     if (variables.binlog_format == BINLOG_FORMAT_MIXED)
       current_stmt_binlog_row_based= TRUE;
+#endif
   }
   inline void set_current_stmt_binlog_row_based()
   {
+#ifdef HAVE_ROW_BASED_REPLICATION
     current_stmt_binlog_row_based= TRUE;
+#endif
   }
   inline void clear_current_stmt_binlog_row_based()
   {
+#ifdef HAVE_ROW_BASED_REPLICATION
     current_stmt_binlog_row_based= FALSE;
-  }
 #endif
+  }
   inline void reset_current_stmt_binlog_row_based()
   {
 #ifdef HAVE_ROW_BASED_REPLICATION