From 37fdb93d7c89a0cb1f1764617a448ab96e6f3221 Mon Sep 17 00:00:00 2001
From: "bar@bar.mysql.r18.ru" <>
Date: Fri, 31 Jan 2003 11:41:39 +0400
Subject: [PATCH] Gluh asked me to do it

---
 client/mysqlbinlog.cc | 1 +
 sql/log_event.cc      | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index fff7224afd6..83c93ee3fca 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -18,6 +18,7 @@
 #undef MYSQL_SERVER
 #include "client_priv.h"
 #include <time.h>
+#include <assert.h>
 #include "log_event.h"
 
 #define BIN_LOG_HEADER_SIZE	4
diff --git a/sql/log_event.cc b/sql/log_event.cc
index d922ab7372f..bb88445876d 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -1999,7 +1999,7 @@ int Rand_log_event::exec_event(struct st_relay_log_info* rli)
   User_var_log_event::pack_info()
 
  ****************************************************************************/
-#ifndef MYSQL_CLIENT
+#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
 void User_var_log_event::pack_info(Protocol* protocol)
 {
   char *buf= 0;
@@ -2112,9 +2112,7 @@ int User_var_log_event::write_data(IO_CACHE* file)
       pos= val;
       break;
     case ROW_RESULT:
-#ifndef MYSQL_CLIENT
       DBUG_ASSERT(1);
-#endif
       return 0;
     }
     return (my_b_safe_write(file, (byte*) buf, sizeof(buf))   ||
@@ -2166,6 +2164,7 @@ void User_var_log_event::print(FILE* file, bool short_form, char* last_db)
       fprintf(file, ":='%s';\n", val);
       break;
     case ROW_RESULT:
+      DBUG_ASSERT(1);
       return;
     }
   }
@@ -2178,7 +2177,7 @@ void User_var_log_event::print(FILE* file, bool short_form, char* last_db)
   User_var_log_event::exec_event()
 
  ****************************************************************************/
-#ifndef MYSQL_CLIENT
+#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
 int User_var_log_event::exec_event(struct st_relay_log_info* rli)
 {
   Item *it= 0;