diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-01-26 14:47:35 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-01-26 14:47:35 -0500 |
| commit | 48b8edc2ad6c64b2e131c792312c9eff6d252b95 (patch) | |
| tree | 5fcb06fdfa66050c761b4c31340d1e0016fbcd66 /sql/set_var.h | |
| parent | 8da25f3abc6bcdd65af87f5383b930b5cb39a04c (diff) | |
| parent | 783b6eb6b62f1e9d62bece3a6a331d005d8999d9 (diff) | |
| download | mariadb-git-48b8edc2ad6c64b2e131c792312c9eff6d252b95.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-m,c-gca
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
BitKeeper/etc/collapsed:
auto-union
sql/mysql_priv.h:
Auto merged
sql/set_var.h:
Auto merged
Diffstat (limited to 'sql/set_var.h')
| -rw-r--r-- | sql/set_var.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/set_var.h b/sql/set_var.h index 8cf9ba60c49..60fdb0e879b 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -457,11 +457,11 @@ class sys_var_thd_bit :public sys_var_thd sys_check_func check_func; sys_update_func update_func; public: - ulong bit_flag; + ulonglong bit_flag; bool reverse; sys_var_thd_bit(const char *name_arg, sys_check_func c_func, sys_update_func u_func, - ulong bit, bool reverse_arg=0) + ulonglong bit, bool reverse_arg=0) :sys_var_thd(name_arg), check_func(c_func), update_func(u_func), bit_flag(bit), reverse(reverse_arg) {} |