diff options
author | Sergei Golubchik <serg@mariadb.org> | 2014-08-27 20:32:32 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-10 22:27:41 +0200 |
commit | 28ebc2a72485c4b2956531010bd3ee247ae91df2 (patch) | |
tree | d89e1f85319a7b7610cee10ea850470879877dc2 /sql/sql_plugin.cc | |
parent | 051c132635555371c57b4dea3d1f9f1ad037342c (diff) | |
download | mariadb-git-28ebc2a72485c4b2956531010bd3ee247ae91df2.tar.gz |
cleanup: sysvar, only one common check_update_type()
Diffstat (limited to 'sql/sql_plugin.cc')
-rw-r--r-- | sql/sql_plugin.cc | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index e254d4330f7..979b6db7f79 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -273,7 +273,6 @@ public: plugin_var(plugin_var_arg) { plugin_var->name= name_arg; } sys_var_pluginvar *cast_pluginvar() { return this; } - bool check_update_type(Item_result type); SHOW_TYPE show_type(); uchar* real_value_ptr(THD *thd, enum_var_type type); TYPELIB* plugin_var_typelib(void); @@ -3251,27 +3250,6 @@ static SHOW_TYPE pluginvar_show_type(st_mysql_sys_var *plugin_var) } -bool sys_var_pluginvar::check_update_type(Item_result type) -{ - switch (plugin_var->flags & PLUGIN_VAR_TYPEMASK) { - case PLUGIN_VAR_INT: - case PLUGIN_VAR_LONG: - case PLUGIN_VAR_LONGLONG: - return type != INT_RESULT; - case PLUGIN_VAR_STR: - return type != STRING_RESULT; - case PLUGIN_VAR_ENUM: - case PLUGIN_VAR_BOOL: - case PLUGIN_VAR_SET: - return type != STRING_RESULT && type != INT_RESULT; - case PLUGIN_VAR_DOUBLE: - return type != INT_RESULT && type != REAL_RESULT && type != DECIMAL_RESULT; - default: - return true; - } -} - - uchar* sys_var_pluginvar::real_value_ptr(THD *thd, enum_var_type type) { DBUG_ASSERT(thd || (type == OPT_GLOBAL)); |