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

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

View File

@ -23,9 +23,9 @@ RPL_STATUS rpl_status=RPL_NULL;
pthread_mutex_t LOCK_rpl_status;
pthread_cond_t COND_rpl_status;
const char *rpl_role_type[] = {"","MASTER","SLAVE",NullS};
TYPELIB rpl_role_typelib = {array_elements(rpl_role_type)-4,"",
rpl_role_type+1};
const char *rpl_role_type[] = {"MASTER","SLAVE",NullS};
TYPELIB rpl_role_typelib = {array_elements(rpl_role_type)-1,"",
rpl_role_type};
const char* rpl_status_type[] = {"AUTH_MASTER","ACTIVE_SLAVE","IDLE_SLAVE",
"LOST_SOLDIER","TROOP_SOLDIER",