database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

got the last changeset to compile/run

Browse Source 
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
This commit is contained in:
unknown
2001-10-10 15:36:35 -06:00
parent b9578dba1f
commit 6b648e4b13
8 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/mysqld.cc
View File

@ -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: