Commit 9b163ef5 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

got the last changeset to compile/run 

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

client/mysqltest.c

+8 −3
Original line number Diff line number Diff line
@@ -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)
@@ -2196,6 +2200,7 @@ int main(int argc, char** argv) 
    *++cur_file = stdin;

  *lineno=1;

#ifndef EMBEDDED_LIBRARY

  if (manager_host)

    init_manager();

#endif

  if (!( mysql_init(&cur_con->mysql)))

mysql-test/mysql-test-run.sh

+5 −4
Original line number Diff line number Diff line
@@ -538,7 +538,8 @@ start_manager() 
 $MYSQL_MANAGER --log=$MYSQL_MANAGER_LOG --port=$MYSQL_MANAGER_PORT \

  --password-file=$MYSQL_MANAGER_PW_FILE

  abort_if_failed "Could not start MySQL manager"

  mysqltest_manager_args="--manager-user=$MYSQL_MANAGER_USER \

  mysqltest_manager_args="--manager-host=localhost \

  --manager-user=$MYSQL_MANAGER_USER \

  --manager-password=$MYSQL_MANAGER_PW \

  --manager-port=$MYSQL_MANAGER_PORT \

  --manager-wait-timeout=$START_WAIT_TIMEOUT"
@@ -600,7 +601,7 @@ start_master() 
    then

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

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

            --basedir=$MY_BASEDIR \

            --basedir=$MY_BASEDIR --init-rpl-role=master \

	    --port=$MASTER_MYPORT \

	    --exit-info=256 \

            --datadir=$MASTER_MYDDIR \
@@ -617,7 +618,7 @@ start_master() 
    else

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

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

            --basedir=$MY_BASEDIR \

            --basedir=$MY_BASEDIR --init-rpl-role=master \

	    --port=$MASTER_MYPORT \

            --datadir=$MASTER_MYDDIR \

	    --pid-file=$MASTER_MYPID \
@@ -712,7 +713,7 @@ start_slave() 
	    --socket=$slave_sock \

	    --character-sets-dir=$CHARSETSDIR \

	    --default-character-set=$CHARACTER_SET \

	    --core \

	    --core --init-rpl-role=slave \

	    --tmpdir=$MYSQL_TMP_DIR \

            --language=$LANGUAGE \

	    --skip-innodb --skip-slave-start \

mysql-test/r/rpl_failsafe.result

+12 −0
Original line number Diff line number Diff line
@@ -6,12 +6,24 @@ slave start; 
show variables like 'rpl_recovery_rank';

Variable_name	Value

rpl_recovery_rank	1

show status like 'Rpl_status';

Variable_name	Value

Rpl_status	AUTH_MASTER

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

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

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

mysql-test/t/rpl_failsafe.test

+4 −0
Original line number Diff line number Diff line
@@ -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';

sql/mysqld.cc

+3 −2
Original line number Diff line number Diff line
@@ -2598,7 +2598,7 @@ enum options { 
	       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_RPL_RECOVERY_RANK

	       OPT_RPL_RECOVERY_RANK,OPT_INIT_RPL_ROLE

};



static struct option long_options[] = {
@@ -2634,6 +2634,7 @@ static struct option long_options[] = { 
  {"enable-pstack",         no_argument,       0, (int) OPT_DO_PSTACK},

  {"exit-info",             optional_argument, 0, 'T'},

  {"flush",                 no_argument,       0, (int) OPT_FLUSH},

  {"init-rpl-role",         required_argument, 0, (int) OPT_INIT_RPL_ROLE},

  /* We must always support this option to make scripts like mysqltest easier

     to do */

  {"innodb_data_file_path", required_argument, 0,
@@ -3502,7 +3503,7 @@ static void get_options(int argc,char **argv) 
	fprintf(stderr, "Unknown replication role: %s\n", optarg);

	exit(1);

      }

      rpl_status = (rpl_role == 1) ?  RPL_AUTH_MASTER : RPL_IDLE_SLAVE;

      rpl_status = (role == 1) ?  RPL_AUTH_MASTER : RPL_IDLE_SLAVE;

      break;

    }

    case (int)OPT_REPLICATE_IGNORE_DB: