diff options
| author | unknown <serg@serg.mylan> | 2004-02-16 18:53:00 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-02-16 18:53:00 +0100 |
| commit | 5a9ffa300aded1a8e5e3b00ed8334e5588653d6d (patch) | |
| tree | 9f50a5286834ba27e3397680e3530b5bb72e2392 /sql/set_var.h | |
| parent | cb6cd9affef3ea86d71a6f447d28fbaf520be098 (diff) | |
| download | mariadb-git-5a9ffa300aded1a8e5e3b00ed8334e5588653d6d.tar.gz | |
ft_boolean_syntax made changeable
BitKeeper/deleted/.del-gstream.cc~e7a4fae849aff6c8:
Delete: libmysqld/gstream.cc
BitKeeper/deleted/.del-item_subselect.cc~80564bbdb47e8160:
Delete: libmysqld/item_subselect.cc
BitKeeper/deleted/.del-spatial.cc~604df7172b141762:
Delete: libmysqld/spatial.cc
BitKeeper/deleted/.del-sql_derived.cc~548b125128871c7a:
Delete: libmysqld/sql_derived.cc
BitKeeper/etc/ignore:
Added libmysqld/item_subselect.cc libmysqld/sql_derived.cc to the ignore list
Diffstat (limited to 'sql/set_var.h')
| -rw-r--r-- | sql/set_var.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/set_var.h b/sql/set_var.h index 85871c90ebb..9087a3e023e 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -35,7 +35,7 @@ enum enum_var_type OPT_DEFAULT, OPT_SESSION, OPT_GLOBAL }; -typedef bool (*sys_check_func)(THD *, set_var *); +typedef int (*sys_check_func)(THD *, set_var *); typedef bool (*sys_update_func)(THD *, set_var *); typedef void (*sys_after_update_func)(THD *,enum_var_type); typedef void (*sys_set_default_func)(THD *, enum_var_type); @@ -143,10 +143,7 @@ public: :sys_var(name_arg), check_func(check_func_arg), update_func(update_func_arg),set_default_func(set_default_func_arg) {} - bool check(THD *thd, set_var *var) - { - return check_func ? (*check_func)(thd, var) : 0; - } + bool check(THD *thd, set_var *var); bool update(THD *thd, set_var *var) { return (*update_func)(thd, var); |