diff options
| author | unknown <guilhem@mysql.com> | 2004-05-19 15:03:32 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-05-19 15:03:32 +0200 |
| commit | 66c96f2c57edf8cff71734a8fa7fcba8b04f2f49 (patch) | |
| tree | 00acd87e6f185f09985129e3d5b19adff169a285 /sql/mysql_priv.h | |
| parent | efbf373be73237fcceeb485eab6a77ec935fb205 (diff) | |
| download | mariadb-git-66c96f2c57edf8cff71734a8fa7fcba8b04f2f49.tar.gz | |
Fix for BUG#3829 "Setting server_id on fly doesn't allow replication to start"
(fix by our Harrison Fisk): when one does SET GLOBAL SERVER_ID=x, we must set
server_id_supplied to 1.
sql/mysql_priv.h:
server_id_supplied must be here to be visible in set_var.cc
sql/mysqld.cc:
rephrasing warnings when server id is not set explicitely.
sql/set_var.cc:
when one does SET GLOBAL SERVER_ID=x; it should be considered as explicitely setting
the server id, so do server_id_supplied=1.
sql/slave.cc:
Correcting wrong comment
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index d4fe5968eff..b03d98f4cb0 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -703,7 +703,7 @@ extern uint protocol_version,dropping_tables; extern uint delay_key_write_options, lower_case_table_names; extern bool opt_endinfo, using_udf_functions, locked_in_memory; extern bool opt_using_transactions, mysql_embedded; -extern bool using_update_log, opt_large_files; +extern bool using_update_log, opt_large_files, server_id_supplied; extern bool opt_log, opt_update_log, opt_bin_log, opt_slow_log, opt_error_log; extern bool opt_disable_networking, opt_skip_show_db; extern bool volatile abort_loop, shutdown_in_progress, grant_option; |