From 783b6eb6b62f1e9d62bece3a6a331d005d8999d9 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 26 Jan 2007 14:47:12 -0500 Subject: 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. --- BitKeeper/etc/collapsed | 2 ++ 1 file changed, 2 insertions(+) (limited to 'BitKeeper') diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed index 5ff033b2163..e64a04b0060 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -29,3 +29,5 @@ 4554a95d7txO1DuO9G3nAizI3SkFAA 4554b3722d71SbPiI2Gx-RhbZjmuIQ 4558b3d73Cxjlb7Wv1oytdSTthxDfw +45ba4faf2oqu6eR8fqecR3LfSNcYUg +45ba5238-NKl80QVXzdGo8hO9M75Xg -- cgit v1.2.1