summaryrefslogtreecommitdiff
path: root/sql/set_var.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-10-16 13:04:42 +0200
committerSergei Golubchik <sergii@pisem.net>2012-10-16 13:04:42 +0200
commitee9afef27141f55165009fdbd58e54942f3a6867 (patch)
treeb5e15e62e10daa40aef3e6d33eeabf9205d1be0f /sql/set_var.h
parentd9a8799205d160688f81362356dd2323eb8a91ea (diff)
parenta619bfad30c13207fb0453a85af5740846186900 (diff)
downloadmariadb-git-ee9afef27141f55165009fdbd58e54942f3a6867.tar.gz
mysql-5.5.28
Diffstat (limited to 'sql/set_var.h')
-rw-r--r--sql/set_var.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/set_var.h b/sql/set_var.h
index 6edfd6adb39..f36c0f8b88f 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -79,7 +79,7 @@ protected:
ptrdiff_t offset; ///< offset to the value from global_system_variables
on_check_function on_check;
on_update_function on_update;
- struct { uint version; const char *substitute; } deprecated;
+ const char *const deprecation_substitute;
bool is_os_charset; ///< true if the value is in character_set_filesystem
public:
@@ -88,7 +88,7 @@ public:
enum get_opt_arg_type getopt_arg_type, SHOW_TYPE show_val_type_arg,
longlong def_val, PolyLock *lock, enum binlog_status_enum binlog_status_arg,
on_check_function on_check_func, on_update_function on_update_func,
- uint deprecated_version, const char *substitute);
+ const char *substitute);
virtual ~sys_var() {}