Addendum #1 to bug #21034322: fixed a signed/unsigned comparison.

gkodinov · gkodinov · commit 2256190e657d · 2015-07-10T10:14:46.000+02:00
diff --git a/plugin/version_token/version_token.cc b/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 > LONG_MAX)
+  if (timeout < 0 || timeout > ((long long) ULONG_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 > LONG_MAX)
+  if (timeout < 0 || timeout > ((long long) ULONG_MAX))
   {
     my_error(ER_DATA_OUT_OF_RANGE, MYF(0), "timeout",
              "version_tokens_lock_exclusive");

Original file line number	Diff line number	Diff line change
`@@ -957,7 +957,7 @@ PLUGIN_EXPORT long long version_tokens_lock_shared(`
`957`	`957`	`{`
`958`	`958`	`long long timeout= ((long long)args->args[args->arg_count - 1]);`
`959`	`959`
`960`		`- if (timeout < 0 \|\| timeout > LONG_MAX)`
	`960`	`+ if (timeout < 0 \|\| timeout > ((long long) ULONG_MAX))`
`961`	`961`	`{`
`962`	`962`	`my_error(ER_DATA_OUT_OF_RANGE, MYF(0), "timeout",`
`963`	`963`	`"version_tokens_lock_shared");`
`@@ -984,7 +984,7 @@ PLUGIN_EXPORT long long version_tokens_lock_exclusive(`
`984`	`984`	`{`
`985`	`985`	`long long timeout= ((long long)args->args[args->arg_count - 1]);`
`986`	`986`
`987`		`- if (timeout < 0 \|\| timeout > LONG_MAX)`
	`987`	`+ if (timeout < 0 \|\| timeout > ((long long) ULONG_MAX))`
`988`	`988`	`{`
`989`	`989`	`my_error(ER_DATA_OUT_OF_RANGE, MYF(0), "timeout",`
`990`	`990`	`"version_tokens_lock_exclusive");`