classes that are compiled conditionally in log_event.cc must be defined...

classes that are compiled conditionally in log_event.cc must be defined conditionally in log_event.h

client/client_priv.h.rej

-***************
-*** 50,55 ****
-    OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING,
-  #endif
-    OPT_TRIGGERS,
-    OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,
-!   OPT_TZ_UTC, OPT_AUTO_CLOSE
-  };
---- 50,55 ----
-    OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING,
-  #endif
-    OPT_TRIGGERS,
-    OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,
-!   OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_SSL_VERIFY_SERVER_CERT
-  };

sql/log_event.h

@@ -1635,6 +1635,8 @@ public:
 #endif
 char *str_to_hex(char *to, const char *from, uint len);
 
+#ifdef HAVE_ROW_BASED_REPLICATION
+
 /*****************************************************************************
 
   Table map log event class
@@ -1643,7 +1645,6 @@ char *str_to_hex(char *to, const char *from, uint len);
   identifier (an integer number).
 
  ****************************************************************************/
-
 class Table_map_log_event : public Log_event
 {
 public:
@@ -1750,6 +1751,7 @@ private:
 
  ****************************************************************************/
 
+
 class Rows_log_event : public Log_event
 {
 public:
@@ -2121,5 +2123,6 @@ private:
 #endif
 };
 
+#endif /* HAVE_ROW_BASED_REPLICATION */
 
 #endif /* _log_event_h */