diff options
| author | unknown <jani@hynda.(none)> | 2003-05-13 19:34:51 +0300 |
|---|---|---|
| committer | unknown <jani@hynda.(none)> | 2003-05-13 19:34:51 +0300 |
| commit | 496357a18069730b97b303d40d91a9ac3ec3783f (patch) | |
| tree | 9d41f02e8299826a1b32e0e131402681199503cc /sql/set_var.h | |
| parent | 4ccf66df87bfe9290d686e7abd585d3ffe1c1370 (diff) | |
| download | mariadb-git-496357a18069730b97b303d40d91a9ac3ec3783f.tar.gz | |
- Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339 and 342
- Fix for QNX: UNIX sockets available since 6.2.1
include/my_global.h:
Fix for QNX: UNIX sockets available since 6.2.1
mysql-test/r/variables.result:
Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339
mysql-test/t/variables.test:
Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339
sql/mysqld.cc:
Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339
sql/set_var.cc:
Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339
sql/set_var.h:
Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339
Diffstat (limited to 'sql/set_var.h')
| -rw-r--r-- | sql/set_var.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/sql/set_var.h b/sql/set_var.h index c74f1e827bd..f33f53c5acc 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -233,13 +233,27 @@ class sys_var_thd_ulonglong :public sys_var_thd { public: ulonglong SV::*offset; + bool only_global; sys_var_thd_ulonglong(const char *name_arg, ulonglong SV::*offset_arg) :sys_var_thd(name_arg), offset(offset_arg) {} + sys_var_thd_ulonglong(const char *name_arg, ulonglong SV::*offset_arg, + sys_after_update_func func, bool only_global_arg) + :sys_var_thd(name_arg, func), offset(offset_arg), + only_global(only_global_arg) + {} bool update(THD *thd, set_var *var); void set_default(THD *thd, enum_var_type type); SHOW_TYPE type() { return SHOW_LONGLONG; } byte *value_ptr(THD *thd, enum_var_type type); + bool check_default(enum_var_type type) + { + return type == OPT_GLOBAL && !option_limits; + } + bool check_type(enum_var_type type) + { + return (only_global && type != OPT_GLOBAL); + } }; |