diff options
author | sasha@mysql.sashanet.com <> | 2000-12-08 12:50:57 -0700 |
---|---|---|
committer | sasha@mysql.sashanet.com <> | 2000-12-08 12:50:57 -0700 |
commit | 2cd21162ca4c4b3ead6ea8398ebfd20943dd6b82 (patch) | |
tree | 4344926e48c2b0783056c1ce3f3c8100349f28ce /sql/sql_repl.h | |
parent | 0dd9ec5a6329f3b11025ec7d4ac0b80268366999 (diff) | |
download | mariadb-git-2cd21162ca4c4b3ead6ea8398ebfd20943dd6b82.tar.gz |
sql/mysqld.cc
fixed auto set of server id
sql/sql_repl.cc
do not allow slave to replicate if master id was not supplied
sql/sql_repl.h
fix for server_id
Diffstat (limited to 'sql/sql_repl.h')
-rw-r--r-- | sql/sql_repl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_repl.h b/sql/sql_repl.h index 240efb81fe4..f8a67f51aa2 100644 --- a/sql/sql_repl.h +++ b/sql/sql_repl.h @@ -5,6 +5,8 @@ extern char* master_host; extern my_string opt_bin_logname, master_info_file; +extern uint32 server_id; +extern bool server_id_supplied; extern I_List<i_string> binlog_do_db, binlog_ignore_db; int start_slave(THD* thd = 0, bool net_report = 1); |