From 56303b0383da01a94293927c209a962effd930d0 Mon Sep 17 00:00:00 2001
From: unknown <sasha@mysql.sashanet.com>
Date: Thu, 11 Oct 2001 13:54:06 -0600
Subject: fixes for mysql-test to run without manager a bit more work on
 failsafe replication

client/mysqltest.c:
  added require_manager support
mysql-test/mysql-test-run.sh:
  added --no-manager
mysql-test/r/rpl_failsafe.result:
  updated result
mysql-test/t/rpl000018.test:
  must have manager
mysql-test/t/rpl_failsafe.test:
  must have manager
sql/repl_failsafe.cc:
  more work
sql/repl_failsafe.h:
  more work
sql/slave.cc:
  update replication status for fail-safe replication on different events
---
 mysql-test/mysql-test-run.sh     | 35 +++++++++++++++++++++++++++++++++--
 mysql-test/r/rpl_failsafe.result | 10 +++++++---
 mysql-test/t/rpl000018.test      |  1 +
 mysql-test/t/rpl_failsafe.test   |  9 +++++++++
 4 files changed, 50 insertions(+), 5 deletions(-)

(limited to 'mysql-test')

diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 8f824d82a08..b601abce1fc 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -12,6 +12,7 @@
 DB=test
 DBPASSWD=
 VERBOSE=""
+NO_MANAGER=""
 TZ=GMT-3; export TZ # for UNIX_TIMESTAMP tests to work
 
 #++
@@ -162,6 +163,9 @@ while test $# -gt 0; do
      --ssl-ca=$BASEDIR/SSL/cacert.pem \
      --ssl-cert=$BASEDIR/SSL/server-cert.pem \
      --ssl-key=$BASEDIR/SSL/server-key.pem" ;;
+    --no-manager)
+     NO_MANAGER=1
+     ;;
     --skip-innobase)
      EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --skip-innobase"
      EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --skip-innobase" ;;
@@ -476,6 +480,7 @@ mysql_install_db () {
     
     for slave_num in 1 2 ;
     do
+     rm -rf var/slave$slave_num-data/
      mkdir -p var/slave$slave_num-data/mysql
      mkdir -p var/slave$slave_num-data/test
      cp var/slave-data/mysql/* var/slave$slave_num-data/mysql
@@ -533,6 +538,11 @@ abort_if_failed()
 
 start_manager()
 {
+ if [ -n "$NO_MANAGER" ] ; then
+  echo "Manager disabled, skipping manager start. Tests requiring manager will\
+ be skipped"
+  return
+ fi
  MYSQL_MANAGER_PW=`$MYSQL_MANAGER_PWGEN -u $MYSQL_MANAGER_USER \
  -o $MYSQL_MANAGER_PW_FILE`
  $MYSQL_MANAGER --log=$MYSQL_MANAGER_LOG --port=$MYSQL_MANAGER_PORT \
@@ -550,6 +560,9 @@ start_manager()
 
 stop_manager()
 {
+ if [ -n "$NO_MANAGER" ] ; then
+  return
+ fi
  $MYSQL_MANAGER_CLIENT $MANAGER_QUIET_OPT -u$MYSQL_MANAGER_USER \
   -p$MYSQL_MANAGER_PW -P $MYSQL_MANAGER_PORT <<EOF
 shutdown
@@ -560,6 +573,11 @@ manager_launch()
 {
   ident=$1
   shift
+  if [ -n "$NO_MANAGER" ] ; then
+   $@  >$CUR_MYERR 2>&1  &
+   sleep 2 #hack 
+   return
+  fi
   $MYSQL_MANAGER_CLIENT $MANAGER_QUIET_OPT --user=$MYSQL_MANAGER_USER \
    --password=$MYSQL_MANAGER_PW  --port=$MYSQL_MANAGER_PORT <<EOF
 def_exec $ident $@
@@ -575,6 +593,11 @@ manager_term()
 {
   ident=$1
   shift
+  if [ -n "$NO_MANAGER" ] ; then
+   $MYSQLADMIN --no-defaults -uroot --socket=$MYSQL_TMP_DIR/$ident.sock -O \
+   connect_timeout=5 shutdown >/dev/null 2>&1
+   return
+  fi
   $MYSQL_MANAGER_CLIENT $MANAGER_QUIET_OPT --user=$MYSQL_MANAGER_USER \
    --password=$MYSQL_MANAGER_PW  --port=$MYSQL_MANAGER_PORT <<EOF
 stop_exec $ident $STOP_WAIT_TIMEOUT
@@ -841,7 +864,10 @@ run_testcase ()
  slave_init_script=$TESTDIR/$tname-slave.sh
  slave_master_info_file=$TESTDIR/$tname-slave-master-info.opt
  SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0`
- many_slaves=`$EXPR \( $tname : rpl_failsafe \) != 0`
+ if [ -z "$NO_MANAGER" ] ; then
+  many_slaves=`$EXPR \( $tname : rpl_failsafe \) != 0`
+ fi 
+ 
  if [ -n "$SKIP_TEST" ] ; then 
    SKIP_THIS_TEST=`$EXPR \( $tname : "$SKIP_TEST" \) != 0`
    if [ x$SKIP_THIS_TEST = x1 ] ;
@@ -952,7 +978,12 @@ run_testcase ()
     timestr="$USERT $SYST $REALT"
     pname=`$ECHO "$tname                        "|$CUT -c 1-24`
     RES="$pname  $timestr"
-
+    
+    if [ x$many_slaves = x1 ] ; then
+     stop_slave 1
+     stop_slave 2
+    fi
+    
     if [ $res = 0 ]; then
       total_inc
       pass_inc
diff --git a/mysql-test/r/rpl_failsafe.result b/mysql-test/r/rpl_failsafe.result
index 596d6ef7191..14b749fada9 100644
--- a/mysql-test/r/rpl_failsafe.result
+++ b/mysql-test/r/rpl_failsafe.result
@@ -9,21 +9,25 @@ rpl_recovery_rank	1
 show status like 'Rpl_status';
 Variable_name	Value
 Rpl_status	AUTH_MASTER
+create table t1(n int);
+drop table t1;
 show variables like 'rpl_recovery_rank';
 Variable_name	Value
 rpl_recovery_rank	2
 show status like 'Rpl_status';
 Variable_name	Value
-Rpl_status	IDLE_SLAVE
+Rpl_status	ACTIVE_SLAVE
+slave start;
 show variables like 'rpl_recovery_rank';
 Variable_name	Value
 rpl_recovery_rank	3
 show status like 'Rpl_status';
 Variable_name	Value
-Rpl_status	IDLE_SLAVE
+Rpl_status	ACTIVE_SLAVE
+slave start;
 show variables like 'rpl_recovery_rank';
 Variable_name	Value
 rpl_recovery_rank	4
 show status like 'Rpl_status';
 Variable_name	Value
-Rpl_status	IDLE_SLAVE
+Rpl_status	ACTIVE_SLAVE
diff --git a/mysql-test/t/rpl000018.test b/mysql-test/t/rpl000018.test
index 621147b7c3e..30d601bb375 100644
--- a/mysql-test/t/rpl000018.test
+++ b/mysql-test/t/rpl000018.test
@@ -1,3 +1,4 @@
+require_manager;
 connect (master,localhost,root,,test,0,master.sock);
 connect (slave,localhost,root,,test,0,slave.sock);
 server_stop master;
diff --git a/mysql-test/t/rpl_failsafe.test b/mysql-test/t/rpl_failsafe.test
index f93dbf4b118..866efbce5bf 100644
--- a/mysql-test/t/rpl_failsafe.test
+++ b/mysql-test/t/rpl_failsafe.test
@@ -1,15 +1,24 @@
+require_manager;
 source include/master-slave.inc;
 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';
+create table t1(n int);
+drop table t1;
+save_master_pos;
 connection slave;
+sync_with_master;
 show variables like 'rpl_recovery_rank';
 show status like 'Rpl_status';
 connection slave_sec;
+slave start;
+sync_with_master;
 show variables like 'rpl_recovery_rank';
 show status like 'Rpl_status';
 connection slave_ter;
+slave start;
+sync_with_master;
 show variables like 'rpl_recovery_rank';
 show status like 'Rpl_status';
-- 
cgit v1.2.1