Changed the function my_set_bits() to return uint64 instead of uint32.

Corrected an assertion in the constructor for the class Sys_var_flagset.

include/my_bit.h

@@ -119,9 +119,9 @@ static inline uint32 my_reverse_bits(uint32 key)
   a number with the n lowest bits set
   an overflow-safe version of  (1 << n) - 1
 */
-static inline uint32 my_set_bits(int n)
+static inline uint64 my_set_bits(int n)
 {
-  return (((1UL << (n - 1)) - 1) << 1) | 1;
+  return (((1ULL << (n - 1)) - 1) << 1) | 1;
 }
 
 C_MODE_END

sql/sys_vars.ic

@@ -1230,7 +1230,7 @@ public:
     global_var(ulonglong)= def_val;
     SYSVAR_ASSERT(typelib.count > 1);
     SYSVAR_ASSERT(typelib.count <= 65);
-    SYSVAR_ASSERT(def_val < my_set_bits(typelib.count));
+    SYSVAR_ASSERT(def_val <= my_set_bits(typelib.count-1));
     SYSVAR_ASSERT(strcmp(values[typelib.count-1], "default") == 0);
     SYSVAR_ASSERT(size == sizeof(ulonglong));
   }