diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-01-22 15:29:36 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-01-22 15:29:36 +0100 |
| commit | 37d240ecf9213a29d6a0a236ebeb1e72c0b43ce6 (patch) | |
| tree | 6bd2508d867303d8830aab0f246cd61a7ec5a835 /sql/set_var.h | |
| parent | e8f6f402922295ec36aab42976f3e494455407d4 (diff) | |
| parent | 5caddbfd5b4a7ec377f3d40a5830436e0e6e993b (diff) | |
| download | mariadb-git-37d240ecf9213a29d6a0a236ebeb1e72c0b43ce6.tar.gz | |
MySQL-5.5.35 merge
Diffstat (limited to 'sql/set_var.h')
| -rw-r--r-- | sql/set_var.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/set_var.h b/sql/set_var.h index 205812e8822..2b3a376488b 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -140,6 +140,7 @@ public: return (option.id != -1) && ((flags & PARSE_EARLY) == parse_flags) && insert_dynamic(array, (uchar*)&option); } + void do_deprecated_warning(THD *thd); private: virtual bool do_check(THD *thd, set_var *var) = 0; @@ -153,7 +154,7 @@ private: virtual void global_save_default(THD *thd, set_var *var) = 0; virtual bool session_update(THD *thd, set_var *var) = 0; virtual bool global_update(THD *thd, set_var *var) = 0; - void do_deprecated_warning(THD *thd); + protected: /** A pointer to a value of the variable for SHOW. |