diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2009-11-06 18:35:04 +0200 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2009-11-06 18:35:04 +0200 |
| commit | 69d6fcbd3b225c177c4e0e3af65aa2cf9494eff3 (patch) | |
| tree | 44a02955b1dc18fc2e94cd0b4dc6ef62cd81d936 /sql/set_var.h | |
| parent | ea84da107a8d8f6b061d00dcf76c3369f8a96868 (diff) | |
| parent | 684b1d39ac7eab6ff5d9095aaa25dcea35b88a28 (diff) | |
| download | mariadb-git-69d6fcbd3b225c177c4e0e3af65aa2cf9494eff3.tar.gz | |
merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640
Diffstat (limited to 'sql/set_var.h')
| -rw-r--r-- | sql/set_var.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/sql/set_var.h b/sql/set_var.h index 0202a15836d..b5d90cae966 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -645,6 +645,7 @@ public: uchar *value_ptr(THD *thd, enum_var_type type, LEX_STRING *base); }; +#ifndef DBUG_OFF class sys_var_thd_dbug :public sys_var_thd { public: @@ -658,8 +659,23 @@ public: void set_default(THD *thd, enum_var_type type) { DBUG_POP(); } uchar *value_ptr(THD *thd, enum_var_type type, LEX_STRING *b); }; +#endif /* DBUG_OFF */ - +#if defined(ENABLED_DEBUG_SYNC) +/* Debug Sync Facility. Implemented in debug_sync.cc. */ +class sys_var_debug_sync :public sys_var_thd +{ +public: + sys_var_debug_sync(sys_var_chain *chain, const char *name_arg) + :sys_var_thd(name_arg) + { chain_sys_var(chain); } + bool check(THD *thd, set_var *var); + bool update(THD *thd, set_var *var); + SHOW_TYPE show_type() { return SHOW_CHAR; } + bool check_update_type(Item_result type) { return type != STRING_RESULT; } + uchar *value_ptr(THD *thd, enum_var_type type, LEX_STRING *base); +}; +#endif /* defined(ENABLED_DEBUG_SYNC) */ /* some variables that require special handling */ |