diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-10-10 15:36:35 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-10-10 15:36:35 -0600 |
| commit | 6b648e4b1344391659b7be10c45c7fb71cb8e17d (patch) | |
| tree | 2143fd43b5532ceec7d6fb7e900d5119ca3a61ec /sql/repl_failsafe.h | |
| parent | b9578dba1f8521a22cdf73d6c3fa20ef4bc11de0 (diff) | |
| download | mariadb-git-6b648e4b1344391659b7be10c45c7fb71cb8e17d.tar.gz | |
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
Diffstat (limited to 'sql/repl_failsafe.h')
| -rw-r--r-- | sql/repl_failsafe.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/repl_failsafe.h b/sql/repl_failsafe.h index 1f62da7b05e..95069404acb 100644 --- a/sql/repl_failsafe.h +++ b/sql/repl_failsafe.h @@ -9,5 +9,5 @@ extern RPL_STATUS rpl_status; extern pthread_mutex_t LOCK_rpl_status; extern pthread_cond_t COND_rpl_status; extern TYPELIB rpl_role_typelib, rpl_status_typelib; -extern char* rpl_role_type[], *rpl_status_type; +extern const char* rpl_role_type[], *rpl_status_type[]; #endif |