diff options
| author | unknown <msvensson@neptunus.homeip.net> | 2005-02-04 15:13:45 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.homeip.net> | 2005-02-04 15:13:45 +0100 |
| commit | c1d06b3cfaa64036de0de4907bc74a7faa4074f1 (patch) | |
| tree | c65a75bef2bc6a67df60074431f798396b06c2b3 /sql/set_var.h | |
| parent | 9e92b63a0bc55356e42c169827b5cd2d631a92f9 (diff) | |
| parent | 285038bd1c2d33ea6dae487bb1f39a97b6cb9672 (diff) | |
| download | mariadb-git-c1d06b3cfaa64036de0de4907bc74a7faa4074f1.tar.gz | |
Merge neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0-cluster-extra
BitKeeper/etc/logging_ok:
auto-union
sql/ha_innodb.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
Diffstat (limited to 'sql/set_var.h')
| -rw-r--r-- | sql/set_var.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/set_var.h b/sql/set_var.h index 8514b518660..3104fd38976 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -564,7 +564,7 @@ class sys_var_character_set_server :public sys_var_character_set public: sys_var_character_set_server(const char *name_arg) : sys_var_character_set(name_arg) {} -#if defined(HAVE_REPLICATION) +#if defined(HAVE_REPLICATION) && (MYSQL_VERSION_ID < 50003) bool check(THD *thd, set_var *var); #endif void set_default(THD *thd, enum_var_type type); @@ -602,7 +602,7 @@ class sys_var_collation_server :public sys_var_collation { public: sys_var_collation_server(const char *name_arg) :sys_var_collation(name_arg) {} -#if defined(HAVE_REPLICATION) +#if defined(HAVE_REPLICATION) && (MYSQL_VERSION_ID < 50003) bool check(THD *thd, set_var *var); #endif bool update(THD *thd, set_var *var); |