diff options
| author | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-12-20 14:10:07 +0200 |
|---|---|---|
| committer | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-12-20 14:10:07 +0200 |
| commit | efd91dff2cb010e792bea1e812d95513be24504a (patch) | |
| tree | c0de2291e6e78eb213021df1ea78f64643108844 /sql/set_var.h | |
| parent | 389dcccbed58122bb41dd0ad29aab69178592266 (diff) | |
| download | mariadb-git-efd91dff2cb010e792bea1e812d95513be24504a.tar.gz | |
Fixes to merge.
mysql-test/r/maria.result:
Fixed result file. The results will be fixed by Sergei's patch.
mysql-test/t/variables.test:
Fixed result file. The results will be fixed by Sergei's patch.
mysys/my_getopt.c:
Fixed a problem with manual merge.
sql/set_var.cc:
Fixed a problem with manual merge.
sql/set_var.h:
Fixed a problem with manual merge.
sql/sql_plugin.cc:
Removed unneccessary function call. This was forgotten from
a previous patch.
Diffstat (limited to 'sql/set_var.h')
| -rw-r--r-- | sql/set_var.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/sql/set_var.h b/sql/set_var.h index c98facc9f84..723b31eb188 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -305,6 +305,24 @@ public: }; +class sys_var_enum_const :public sys_var +{ + ulong SV::*offset; + TYPELIB *enum_names; +public: + sys_var_enum_const(sys_var_chain *chain, const char *name_arg, ulong SV::*offset_arg, + TYPELIB *typelib, sys_after_update_func func) + :sys_var(name_arg,func), offset(offset_arg), enum_names(typelib) + { chain_sys_var(chain); } + bool check(THD *thd, set_var *var) { return 1; } + bool update(THD *thd, set_var *var) { return 1; } + SHOW_TYPE show_type() { return SHOW_CHAR; } + bool check_update_type(Item_result type) { return 1; } + bool is_readonly() const { return 1; } + uchar *value_ptr(THD *thd, enum_var_type type, LEX_STRING *base); +}; + + class sys_var_thd :public sys_var { public: |