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, 4 insertions, 0 deletions

diff --git a/mysql-test/t/rpl_failsafe.test b/mysql-test/t/rpl_failsafe.test
index 75f1c9ee3b2..f93dbf4b118 100644
--- a/mysql-test/t/rpl_failsafe.test
+++ b/mysql-test/t/rpl_failsafe.test
@@ -3,9 +3,13 @@ connect (slave_sec,localhost,root,,test,0,slave.sock-1);
 connect (slave_ter,localhost,root,,test,0,slave.sock-2); 
 connection master;
 show variables like 'rpl_recovery_rank';
+show status like 'Rpl_status';
 connection slave;
 show variables like 'rpl_recovery_rank';
+show status like 'Rpl_status';
 connection slave_sec;
 show variables like 'rpl_recovery_rank';
+show status like 'Rpl_status';
 connection slave_ter;
 show variables like 'rpl_recovery_rank';
+show status like 'Rpl_status';