diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-04-17 10:18:04 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-04-17 10:18:04 -0700 |
| commit | a1cd28e2e54d32dc70280875bab7f0d35e9370c4 (patch) | |
| tree | ceb810aa1bd2619efec70cb60d4adbac05e35a42 /sql/sys_vars.h | |
| parent | 0e7410a154560486ce4e0c975f122a0b15853bb1 (diff) | |
| parent | 43fe53acc225a2cea07188d142c1c0f8364cc43b (diff) | |
| download | mariadb-git-a1cd28e2e54d32dc70280875bab7f0d35e9370c4.tar.gz | |
Merge 10.0-base -> 10.0
Diffstat (limited to 'sql/sys_vars.h')
| -rw-r--r-- | sql/sys_vars.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sys_vars.h b/sql/sys_vars.h index 47cb5a327e1..4a38b41ab9b 100644 --- a/sql/sys_vars.h +++ b/sql/sys_vars.h @@ -28,6 +28,7 @@ #include "keycaches.h" #include "strfunc.h" #include "tztime.h" // my_tz_find, my_tz_SYSTEM, struct Time_zone +#include "rpl_mi.h" // For Multi-Source Replication /* a set of mostly trivial (as in f(X)=X) defines below to make system variable @@ -552,6 +553,7 @@ protected: } }; +class Master_info; class Sys_var_rpl_filter: public sys_var { private: @@ -563,7 +565,7 @@ public: NO_ARG, SHOW_CHAR, 0, NULL, VARIABLE_NOT_IN_BINLOG, NULL, NULL, NULL), opt_id(getopt_id) { - option.var_type= GET_STR; + option.var_type= GET_STR | GET_ASK_ADDR; } bool do_check(THD *thd, set_var *var) @@ -589,7 +591,7 @@ public: protected: uchar *global_value_ptr(THD *thd, LEX_STRING *base); - bool set_filter_value(const char *value); + bool set_filter_value(const char *value, Master_info *mi); }; /** |