diff options
| author | unknown <jimw@mysql.com> | 2005-02-17 16:16:58 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-02-17 16:16:58 -0800 |
| commit | 90cc9c6bb60c60dbf6e603a0cb5d9ae736a9a906 (patch) | |
| tree | 76f459723b9f122eb50373fe7c42ffc72f277131 /sql/set_var.h | |
| parent | 4c5a3914b8924ebc72c6c4233c18d2e3f1ad118b (diff) | |
| parent | 2b69b4ae4f0b29a0eceb72a404b7f52a67748875 (diff) | |
| download | mariadb-git-90cc9c6bb60c60dbf6e603a0cb5d9ae736a9a906.tar.gz | |
Merge
BitKeeper/triggers/post-commit:
Auto merged
mysql-test/r/lowercase_table2.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
mysql-test/r/system_mysql_db.result:
Update results
scripts/mysql_create_system_tables.sh:
Merge fix for Bug #7617, making enum fields in grant tables
case-insensitive.
scripts/mysql_fix_privilege_tables.sql:
Merge fix for Bug #7617, and fix additional enum/set columns.
sql/sql_acl.cc:
Hand-merge due to whitespace change
sql/sql_lex.cc:
Hand-merge bug fix.
Diffstat (limited to 'sql/set_var.h')
| -rw-r--r-- | sql/set_var.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/set_var.h b/sql/set_var.h index 3104fd38976..19cf63871ef 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -87,6 +87,7 @@ public: sys_var_long_ptr(const char *name_arg, ulong *value_ptr, sys_after_update_func func) :sys_var(name_arg,func), value(value_ptr) {} + bool check(THD *thd, set_var *var); bool update(THD *thd, set_var *var); void set_default(THD *thd, enum_var_type type); SHOW_TYPE type() { return SHOW_LONG; } |