diff options
| author | unknown <guilhem@mysql.com> | 2005-02-03 16:25:57 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2005-02-03 16:25:57 +0100 |
| commit | 868331406b531249196c4c246346c873e0e87bff (patch) | |
| tree | d43dabeefcbac827c0558352fc3f8944db44a7cc /sql/set_var.h | |
| parent | 888c211805fdc501e078c7f8576821b121eb6637 (diff) | |
| parent | 7636b12f6cc71e209b5189c94b06416beccaf2eb (diff) | |
| download | mariadb-git-868331406b531249196c4c246346c873e0e87bff.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
mysql-test/mysql-test-run.sh:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.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); |