Bug #25879: THD::options isn't set with ulonglong values and \

	variables

Bits higher than 2**31 were impossible to set on THD::options.  It's
probably a remnant from a time when options was a 32-bit integer.

Now, use unsigned long-long constants and variables to set and clear
THD::options.
---
Pulled comments back to column 49.


sql/mysql_priv.h:
  THD::options is an ulonglong, so we should define our bit constants 
  that way.
  ---
  Pulled comments back to column 49.
sql/set_var.h:
  THD::options is a ulonglong, and we if we're going to set bits higher
  than 2**31, then we must treat the bitmasks as a 64-bit number.

1 files changed, 2 insertions, 2 deletions

diff --git a/sql/set_var.h b/sql/set_var.h
index 3304f552a97..d55ca4d289f 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)
   {}