diff options
| author | unknown <guilhem@mysql.com> | 2005-02-03 18:55:29 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2005-02-03 18:55:29 +0100 |
| commit | 1497328caf061671edf68ecbb42279f616f89ac1 (patch) | |
| tree | 2891452f31e3bf181f0e2ab20d647025479eb8a2 /sql/set_var.cc | |
| parent | 4b027f5b998e9409449d4370df790040a911d13a (diff) | |
| parent | 868331406b531249196c4c246346c873e0e87bff (diff) | |
| download | mariadb-git-1497328caf061671edf68ecbb42279f616f89ac1.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index f4d07360282..142ef64a41f 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -2061,9 +2061,15 @@ void sys_var_character_set_server::set_default(THD *thd, enum_var_type type) } } -#if defined(HAVE_REPLICATION) +#if defined(HAVE_REPLICATION) && (MYSQL_VERSION_ID < 50003) bool sys_var_character_set_server::check(THD *thd, set_var *var) { + /* + To be perfect we should fail even if we are a 5.0.3 slave, a 4.1 master, + and user wants to change our global character set variables. Because + replicating a 4.1 assumes those are not changed. But that's not easy to + do. + */ if ((var->type == OPT_GLOBAL) && (mysql_bin_log.is_open() || active_mi->slave_running || active_mi->rli.slave_running)) @@ -2168,7 +2174,7 @@ void sys_var_collation_database::set_default(THD *thd, enum_var_type type) } } -#if defined(HAVE_REPLICATION) +#if defined(HAVE_REPLICATION) && (MYSQL_VERSION_ID < 50003) bool sys_var_collation_server::check(THD *thd, set_var *var) { if ((var->type == OPT_GLOBAL) && |