Commit 8c6a01bf authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

Merge work:/home/bk/mysql-4.0 

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
parents 46a660f4 b13bd81c

mysql-test/mysql-test-run.sh

+3 −3
Original line number Diff line number Diff line
@@ -592,7 +592,7 @@ start_master() 
    if [ -z "$DO_BENCH" ]

    then

      master_args="--no-defaults --log-bin=$MYSQL_TEST_DIR/var/log/master-bin \

    	    --server-id=1 \

    	    --server-id=1 --rpl-recovery-rank=1 \

            --basedir=$MY_BASEDIR \

	    --port=$MASTER_MYPORT \

	    --exit-info=256 \
@@ -609,7 +609,7 @@ start_master() 
	     $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT"

    else

      master_args="--no-defaults --log-bin=$MYSQL_TEST_DIR/var/log/master-bin \

	    --server-id=1 \

	    --server-id=1 --rpl-recovery-rank=1 \

            --basedir=$MY_BASEDIR \

	    --port=$MASTER_MYPORT \

            --datadir=$MASTER_MYDDIR \
@@ -664,7 +664,7 @@ start_slave() 
	    --master-host=127.0.0.1 \

	    --master-password= \

	    --master-port=$MASTER_MYPORT \

	    --server-id=2"

	    --server-id=2 --rpl-recovery-rank=2"

   else

     master_info=$SLAVE_MASTER_INFO

   fi

mysql-test/r/rpl_failsafe.result

0 → 100644
+11 −0
Original line number Diff line number Diff line 
slave stop;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

slave start;

show variables like 'rpl_recovery_rank';

Variable_name	Value

rpl_recovery_rank	1

show variables like 'rpl_recovery_rank';

Variable_name	Value

rpl_recovery_rank	2

mysql-test/t/rpl_failsafe.test

0 → 100644
+5 −0
Original line number Diff line number Diff line 
source include/master-slave.inc;

connection master;

show variables like 'rpl_recovery_rank';

connection slave;

show variables like 'rpl_recovery_rank';

sql/mysqld.cc

+9 −1
Original line number Diff line number Diff line
@@ -332,6 +332,8 @@ const char *sql_mode_str="OFF"; 
const char *default_tx_isolation_name;

enum_tx_isolation default_tx_isolation=ISO_READ_COMMITTED;



uint rpl_recovery_rank=0;



#ifdef HAVE_GEMINI_DB

const char *gemini_recovery_options_str="FULL";

#endif
@@ -2608,7 +2610,8 @@ enum options { 
               OPT_DO_PSTACK, OPT_REPORT_HOST,

	       OPT_REPORT_USER, OPT_REPORT_PASSWORD, OPT_REPORT_PORT,

               OPT_SHOW_SLAVE_AUTH_INFO, OPT_OLD_RPL_COMPAT,

               OPT_SLAVE_LOAD_TMPDIR, OPT_NO_MIX_TYPE

               OPT_SLAVE_LOAD_TMPDIR, OPT_NO_MIX_TYPE,

	       OPT_RPL_RECOVERY_RANK

};



static struct option long_options[] = {
@@ -2733,6 +2736,7 @@ static struct option long_options[] = { 
  {"report-user",           required_argument, 0, (int) OPT_REPORT_USER},

  {"report-password",       required_argument, 0, (int) OPT_REPORT_PASSWORD},

  {"report-port",           required_argument, 0, (int) OPT_REPORT_PORT},

  {"rpl-recovery-rank",     required_argument, 0, (int) OPT_RPL_RECOVERY_RANK},

  {"safe-mode",             no_argument,       0, (int) OPT_SAFE},

  {"safe-show-database",    no_argument,       0, (int) OPT_SAFE_SHOW_DB},

  {"safe-user-create",	    no_argument,       0, (int) OPT_SAFE_USER_CREATE},
@@ -3032,6 +3036,7 @@ struct show_var_st init_vars[]= { 
  {"protocol_version",        (char*) &protocol_version,            SHOW_INT},

  {"record_buffer",           (char*) &my_default_record_cache_size,SHOW_LONG},

  {"record_rnd_buffer",       (char*) &record_rnd_cache_size,	    SHOW_LONG},

  {"rpl_recovery_rank",       (char*) &rpl_recovery_rank,           SHOW_LONG},

  {"query_buffer_size",       (char*) &query_buff_size,		    SHOW_LONG},

  {"safe_show_database",      (char*) &opt_safe_show_db,            SHOW_BOOL},

  {"server_id",               (char*) &server_id,		    SHOW_LONG},
@@ -3452,6 +3457,9 @@ static void get_options(int argc,char **argv) 
      safemalloc_mem_limit = atoi(optarg);

#endif      

      break;

    case OPT_RPL_RECOVERY_RANK:

      rpl_recovery_rank=atoi(optarg);

      break;

    case OPT_SLAVE_LOAD_TMPDIR:

      slave_load_tmpdir = my_strdup(optarg, MYF(MY_FAE));

      break;