merge with xtradb-5.5.15

fix test cases

1 files changed, 8 insertions, 0 deletions

diff --git a/sql/slave.cc b/sql/slave.cc
index 1d99d2b606b..1d0781aa7b2 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -1006,6 +1006,8 @@ const char *print_slave_db_safe(const char* db)
   DBUG_RETURN((db ? db : ""));
 }
 
+#endif /* HAVE_REPLICATION */
+
 int init_strvar_from_file(char *var, int max_size, IO_CACHE *f,
                                  const char *default_val)
 {
@@ -1037,6 +1039,10 @@ int init_strvar_from_file(char *var, int max_size, IO_CACHE *f,
 }
 
 
+/*
+  when moving these functions to mysys, don't forget to
+  remove slave.cc from libmysqld/CMakeLists.txt
+*/
 int init_intvar_from_file(int* var, IO_CACHE* f, int default_val)
 {
   char buf[32];
@@ -1165,6 +1171,8 @@ err:
   DBUG_RETURN(ret);
 }
 
+#ifdef HAVE_REPLICATION
+
 /*
   Check if the error is caused by network.
   @param[in]   errorno   Number of the error.