got the last changeset to compile/run

mysqltest can run without connecting to the manager for tests that do not 
require manager operations


client/mysqltest.c:
  make mysqltest work without having to connect to the manager
mysql-test/mysql-test-run.sh:
  init-rpl-role option to servers
  pass manager-host to mysqltest
mysql-test/r/rpl_failsafe.result:
  updated result
mysql-test/t/rpl_failsafe.test:
  check for Rpl_status
sql/mysqld.cc:
  fixed bad merge
sql/repl_failsafe.cc:
  fixed bug
sql/repl_failsafe.h:
  fixed compile error
sql/sql_show.cc:
  fixed compile error

1 files changed, 8 insertions, 3 deletions

diff --git a/client/mysqltest.c b/client/mysqltest.c
index 1374a276231..c6169540469 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -92,7 +92,7 @@ static char *db = 0, *pass=0;
 const char* user = 0, *host = 0, *unix_sock = 0, *opt_basedir="./";
 static int port = 0, opt_big_test=0, opt_compress=0;
 static uint start_lineno, *lineno;
-const char* manager_user="root",*manager_host="localhost";
+const char* manager_user="root",*manager_host=0;
 char *manager_pass=0;
 int manager_port=MYSQL_MANAGER_PORT;
 int manager_wait_timeout=3;
@@ -655,6 +655,10 @@ int do_server_op(struct st_query* q,const char* op)
 {
   char* p=q->first_argument;
   char com_buf[256],*com_p;
+  if (!manager)
+  {
+    die("Manager is not initialized, manager commands are not possible");
+  }
   com_p=strmov(com_buf,op);
   com_p=strmov(com_p,"_exec ");
   if (!*p)
@@ -2195,8 +2199,9 @@ int main(int argc, char** argv)
   if (cur_file == file_stack)
     *++cur_file = stdin;
   *lineno=1;
-#ifndef EMBEDDED_LIBRARY  
-  init_manager();
+#ifndef EMBEDDED_LIBRARY
+  if (manager_host)
+    init_manager();
 #endif
   if (!( mysql_init(&cur_con->mysql)))
     die("Failed in mysql_init()");