* Fixed: Illegal comparison between signed and unsigned integer expressions

* Fixed: GRANT_INFO member should be in #ifndef DBUG_OFF clause

Author: Kristofer Pettersson

plugin/version_token/version_token.cc

@@ -957,7 +957,7 @@ PLUGIN_EXPORT long long version_tokens_lock_shared(
 {
   long long timeout= *((long long*)args->args[args->arg_count - 1]);
 
-  if (timeout < 0 || timeout > ULONG_MAX)
+  if (timeout < 0 || timeout > LONG_MAX)
   {
     my_error(ER_DATA_OUT_OF_RANGE, MYF(0), "timeout",
              "version_tokens_lock_shared");
@@ -984,7 +984,7 @@ PLUGIN_EXPORT long long version_tokens_lock_exclusive(
 {
   long long timeout= *((long long*)args->args[args->arg_count - 1]);
 
-  if (timeout < 0 || timeout > ULONG_MAX)
+  if (timeout < 0 || timeout > LONG_MAX)
   {
     my_error(ER_DATA_OUT_OF_RANGE, MYF(0), "timeout",
              "version_tokens_lock_exclusive");

sql/table.cc

@@ -226,7 +226,9 @@ GRANT_INFO::GRANT_INFO()
   grant_table= 0;
   version= 0;
   privilege= NO_ACCESS;
+#ifndef DBUG_OFF
   want_privilege= 0;
+#endif
 }