diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-08-31 13:39:05 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-10 22:27:42 +0200 |
| commit | b969a690217f2364cd6c8b55315360223fe1f00b (patch) | |
| tree | d8982b5fe32adfc0840b90942560bd9bd604e495 /sql/set_var.h | |
| parent | a4e7d339af0ea95b8b3c68e2b648294932e8550e (diff) | |
| download | mariadb-git-b969a690217f2364cd6c8b55315360223fe1f00b.tar.gz | |
cleanup: simplify sys_var::val* methods, introduce val_str_nolock()
Diffstat (limited to 'sql/set_var.h')
| -rw-r--r-- | sql/set_var.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/set_var.h b/sql/set_var.h index d6398006ca6..b495c17867d 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -117,9 +117,10 @@ public: bool set_default(THD *thd, set_var *var); bool update(THD *thd, set_var *var); - longlong val_int(bool *is_null, THD *thd, enum_var_type type, LEX_STRING *base); - String *val_str(String *str, THD *thd, enum_var_type type, LEX_STRING *base); - double val_real(bool *is_null, THD *thd, enum_var_type type, LEX_STRING *base); + String *val_str_nolock(String *str, THD *thd, const uchar *value); + longlong val_int(bool *is_null, THD *thd, enum_var_type type, const LEX_STRING *base); + String *val_str(String *str, THD *thd, enum_var_type type, const LEX_STRING *base); + double val_real(bool *is_null, THD *thd, enum_var_type type, const LEX_STRING *base); SHOW_TYPE show_type() { return show_val_type; } int scope() const { return flags & SCOPE_MASK; } |