database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.1

Browse Source 
into  bodhi.(none):/opt/local/work/mysql-5.1-27430
This commit is contained in:
kostja@bodhi.(none)
2008-05-20 11:38:17 +04:00
parent 7ec38d1fa7 86396459ae
commit 2c0ce2a832
47 changed files with 5573 additions and 5011 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/set_var.h
View File

@ -74,7 +74,8 @@ public:
sys_var(const char *name_arg, sys_after_update_func func= NULL,
Binlog_status_enum binlog_status_arg= NOT_IN_BINLOG)
:name(name_arg), after_update(func), no_support_one_shot(1),
binlog_status(binlog_status_arg)
binlog_status(binlog_status_arg),
m_allow_empty_value(TRUE)
{}
virtual ~sys_var() {}
void chain_sys_var(sys_var_chain *chain_arg)
@ -109,8 +110,16 @@ public:
virtual bool is_readonly() const { return 0; }
virtual sys_var_pluginvar *cast_pluginvar() { return 0; }
protected:
void set_allow_empty_value(bool allow_empty_value)
{
m_allow_empty_value= allow_empty_value;
}
private:
const Binlog_status_enum binlog_status;
bool m_allow_empty_value;
};
@ -878,8 +887,11 @@ public:
sys_var_log_output(sys_var_chain *chain, const char *name_arg, ulong *value_arg,
TYPELIB *typelib, sys_after_update_func func)
:sys_var(name_arg,func), value(value_arg), enum_names(typelib)
{ chain_sys_var(chain); }
bool check(THD *thd, set_var *var)
{
chain_sys_var(chain);
set_allow_empty_value(FALSE);
}
virtual bool check(THD *thd, set_var *var)
{
return check_set(thd, var, enum_names);
}