Bug#16837 (Missing #ifdef cause compile problem --without-row-based-replication):

Added #ifdef's to make code work even when the system is built without
row-based replication.


mysql-test/r/create.result:
  Result change
mysql-test/r/innodb_mysql.result:
  Result change
mysql-test/t/create.test:
  Moving InnoDB specific test to innodb_mysql.test
mysql-test/t/innodb_mysql.test:
  Moving InnoDB-specific test from create.test
mysql-test/t/rpl_rbr_to_sbr.test:
  Test only sensible if we have row-based replication compiled in.
mysql-test/t/rpl_row_basic_8partition.test:
  Test only sensible if we have row-based replication compiled in.
sql/log.cc:
  Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
  row-based replication.
sql/set_var.cc:
  Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
  row-based replication.
sql/set_var.h:
  Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
  row-based replication.
sql/share/errmsg.txt:
  Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
  row-based replication.
sql/sql_base.cc:
  Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
  row-based replication.
sql/sql_class.cc:
  Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
  row-based replication.
sql/sql_class.h:
  Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
  row-based replication.
sql/sql_insert.cc:
  Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
  row-based replication.
sql/sql_parse.cc:
  Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
  row-based replication.
sql/sql_table.cc:
  Not running hooks

1 files changed, 17 insertions, 6 deletions

diff --git a/sql/sql_class.h b/sql/sql_class.h
index 54f256997d0..56ddc7702f8 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -890,8 +890,10 @@ public:
   /* container for handler's private per-connection data */
   void *ha_data[MAX_HA];
 
-#ifdef HAVE_ROW_BASED_REPLICATION
 #ifndef MYSQL_CLIENT
+  int binlog_setup_trx_data();
+
+#ifdef HAVE_ROW_BASED_REPLICATION
 
   /*
     Public interface to write RBR events to the binlog
@@ -921,7 +923,6 @@ public:
 				      RowsEventT* hint);
   Rows_log_event* binlog_get_pending_rows_event() const;
   void            binlog_set_pending_rows_event(Rows_log_event* ev);
-  int             binlog_setup_trx_data();
   
   my_size_t max_row_length_blob(TABLE* table, const byte *data) const;
   my_size_t max_row_length(TABLE* table, const byte *data) const
@@ -945,8 +946,9 @@ private:
 
 public:
 
-#endif
 #endif /* HAVE_ROW_BASED_REPLICATION */
+#endif /* MYSQL_CLIENT */
+
 #ifndef MYSQL_CLIENT
   enum enum_binlog_query_type {
       /*
@@ -1380,18 +1382,25 @@ public:
   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()
   {
     if (variables.binlog_format == BINLOG_FORMAT_MIXED)
-      current_stmt_binlog_row_based= 1;
+      current_stmt_binlog_row_based= TRUE;
   }
   inline void set_current_stmt_binlog_row_based()
   {
-    current_stmt_binlog_row_based= 1;
+    current_stmt_binlog_row_based= TRUE;
   }
+#endif
   inline void reset_current_stmt_binlog_row_based()
   {
-    current_stmt_binlog_row_based= test(variables.binlog_format == BINLOG_FORMAT_ROW);
+#ifdef HAVE_ROW_BASED_REPLICATION
+    current_stmt_binlog_row_based=
+      test(variables.binlog_format == BINLOG_FORMAT_ROW);
+#else
+    current_stmt_binlog_row_based= FALSE;
+#endif
   }
 };
 
@@ -1584,7 +1593,9 @@ public:
     {}
   int prepare(List<Item> &list, SELECT_LEX_UNIT *u);
   
+#ifdef HAVE_ROW_BASED_REPLICATION
   void binlog_show_create_table(TABLE **tables, uint count);
+#endif
   void store_values(List<Item> &values);
   void send_error(uint errcode,const char *err);
   bool send_eof();