diff options
| author | unknown <guilhem@mysql.com> | 2004-05-19 15:04:01 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-05-19 15:04:01 +0200 |
| commit | 4eb67ce4cae48a36d0e79d0fb1878353944a7f90 (patch) | |
| tree | 767b3ee8cb7165b04393cce90e16e97dd0a9ea06 /sql/set_var.cc | |
| parent | 458f07519c830ddc46d082246dad0ad7cb93f71c (diff) | |
| parent | 66c96f2c57edf8cff71734a8fa7fcba8b04f2f49 (diff) | |
| download | mariadb-git-4eb67ce4cae48a36d0e79d0fb1878353944a7f90.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
sql/set_var.cc:
Auto merged
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 1657d0d0bcb..0017c1f2f65 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -90,6 +90,7 @@ static void fix_max_relay_log_size(THD *thd, enum_var_type type); static void fix_max_connections(THD *thd, enum_var_type type); static void fix_thd_mem_root(THD *thd, enum_var_type type); static void fix_trans_mem_root(THD *thd, enum_var_type type); +static void fix_server_id(THD *thd, enum_var_type type); /* Variable definition list @@ -235,7 +236,7 @@ sys_var_thd_bool sys_query_cache_wlock_invalidate("query_cache_wlock_invalidate", &SV::query_cache_wlock_invalidate); #endif /* HAVE_QUERY_CACHE */ -sys_var_long_ptr sys_server_id("server_id",&server_id); +sys_var_long_ptr sys_server_id("server_id", &server_id, fix_server_id); sys_var_bool_ptr sys_slave_compressed_protocol("slave_compressed_protocol", &opt_slave_compressed_protocol); sys_var_long_ptr sys_slave_net_timeout("slave_net_timeout", @@ -811,6 +812,10 @@ static void fix_trans_mem_root(THD *thd, enum_var_type type) thd->variables.trans_prealloc_size); } +static void fix_server_id(THD *thd, enum_var_type type) +{ + server_id_supplied = 1; +} bool sys_var_long_ptr::update(THD *thd, set_var *var) { |