Bug#70622 error result when use between...and againest bigint unsigned

Bug#17606942 ERROR RESULT WHEN USE BETWEEN...AND AGAINEST BIGINT UNSIGNED

Do value comparisons using unsigned arithmetic for unsigned values,
signed arighmetic for signed values.

Based on a contribution from xiaobin lin

Author: Tor Didriksen

mysql-test/r/bigint.result

@@ -506,3 +506,30 @@ a
 SELECT * FROM t1 WHERE a IN (0.8,0.9);
 a
 DROP TABLE t1;
+#
+# Bug#17606942 ERROR RESULT WHEN USE BETWEEN...AND
+#              AGAINEST BIGINT UNSIGNED
+#
+# Bug#70622 error result when use between...and againest bigint unsigned 
+create table t (id bigint unsigned, b int);
+insert into t values(8894754949779693574,1);
+insert into t values(8894754949779693579,2);
+insert into t values(17790886498483827171,3);
+select count(*) from t 
+where id>=8894754949779693574 and id <=17790886498483827171;
+count(*)
+3
+select count(*) from t 
+where id between 8894754949779693574 and 17790886498483827171;
+count(*)
+3
+alter table t add primary key (id);
+select count(*) from t 
+where id>=8894754949779693574 and id <=17790886498483827171;
+count(*)
+3
+select count(*) from t 
+where id between 8894754949779693574 and 17790886498483827171;
+count(*)
+3
+drop table t;

mysql-test/t/bigint.test

@@ -330,7 +330,7 @@ select -(-(9223372036854775808));
 select --9223372036854775808, ---9223372036854775808, ----9223372036854775808;
 select -(-9223372036854775808), -(-(-9223372036854775808));
 
-# Bug #28005 Partitions: can't use -9223372036854775808 
+# Bug #28005 Partitions: cannot use -9223372036854775808 
 create table t1 select -9223372036854775808 bi;
 describe t1;
 drop table t1;
@@ -419,3 +419,31 @@ SELECT * FROM t1 WHERE a=0.9;
 SELECT * FROM t1 WHERE a IN (0.8,0.9);
 
 DROP TABLE t1;
+
+--echo #
+--echo # Bug#17606942 ERROR RESULT WHEN USE BETWEEN...AND
+--echo #              AGAINEST BIGINT UNSIGNED
+--echo #
+--echo # Bug#70622 error result when use between...and againest bigint unsigned 
+
+create table t (id bigint unsigned, b int);
+
+insert into t values(8894754949779693574,1);
+insert into t values(8894754949779693579,2);
+insert into t values(17790886498483827171,3);
+
+select count(*) from t 
+where id>=8894754949779693574 and id <=17790886498483827171;
+
+select count(*) from t 
+where id between 8894754949779693574 and 17790886498483827171;
+
+alter table t add primary key (id);
+
+select count(*) from t 
+where id>=8894754949779693574 and id <=17790886498483827171;
+
+select count(*) from t 
+where id between 8894754949779693574 and 17790886498483827171;
+
+drop table t;

sql/item_cmpfunc.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -2654,8 +2654,68 @@ void Item_func_between::fix_length_and_dec()
 }
 
 
+/**
+  A helper function for Item_func_between::val_int() to avoid
+  over/underflow when comparing large values.
+
+  @tparam LLorULL ulonglong or longlong
+
+  @param  compare_as_temporal_dates copy of Item_func_between member variable
+  @param  compare_as_temporal_times copy of Item_func_between member variable
+  @param  negated                   copy of Item_func_between member variable
+  @param  args                      copy of Item_func_between member variable
+  @param  null_value [out]          set to true if result is not true/false
+
+  @retval true if: args[1] <= args[0] <= args[2]
+ */
+template<typename LLorULL>
+longlong compare_between_int_result(bool compare_as_temporal_dates,
+                                    bool compare_as_temporal_times,
+                                    bool negated,
+                                    Item **args,
+                                    my_bool *null_value)
+{
+  {
+    LLorULL a, b, value;
+    value= compare_as_temporal_times ? args[0]->val_time_temporal() :
+           compare_as_temporal_dates ? args[0]->val_date_temporal() :
+           args[0]->val_int();
+    if ((*null_value= args[0]->null_value))
+      return 0;                               /* purecov: inspected */
+    if (compare_as_temporal_times)
+    {
+      a= args[1]->val_time_temporal();
+      b= args[2]->val_time_temporal();
+    }
+    else if (compare_as_temporal_dates)
+    {
+      a= args[1]->val_date_temporal();
+      b= args[2]->val_date_temporal();
+    }
+    else
+    {
+      a= args[1]->val_int();
+      b= args[2]->val_int();
+    }
+    if (!args[1]->null_value && !args[2]->null_value)
+      return (longlong) ((value >= a && value <= b) != negated);
+    if (args[1]->null_value && args[2]->null_value)
+      *null_value= 1;
+    else if (args[1]->null_value)
+    {
+      *null_value= value <= b;                  // not null if false range.
+    }
+    else
+    {
+      *null_value= value >= a;
+    }
+    return value;
+  }
+}
+
+
 longlong Item_func_between::val_int()
-{						// ANSI BETWEEN
+{                                               // ANSI BETWEEN
   DBUG_ASSERT(fixed == 1);
   if (compare_as_dates_with_strings)
   {
@@ -2670,7 +2730,7 @@ longlong Item_func_between::val_int()
       return (longlong) ((ge_res >= 0 && le_res <=0) != negated);
     else if (args[1]->null_value)
     {
-      null_value= le_res > 0;			// not null if false range.
+      null_value= le_res > 0;                   // not null if false range.
     }
     else
     {
@@ -2704,46 +2764,30 @@ longlong Item_func_between::val_int()
   }
   else if (cmp_type == INT_RESULT)
   {
-    longlong a, b, value;
-    value= compare_as_temporal_times ? args[0]->val_time_temporal() :
-           compare_as_temporal_dates ? args[0]->val_date_temporal() :
-           args[0]->val_int();
-    if ((null_value=args[0]->null_value))
-      return 0;					/* purecov: inspected */
-    if (compare_as_temporal_times)
-    {
-      a= args[1]->val_time_temporal();
-      b= args[2]->val_time_temporal();
-    }
-    else if (compare_as_temporal_dates)
-    {
-      a= args[1]->val_date_temporal();
-      b= args[2]->val_date_temporal();
-    }
+    longlong value;
+    if (args[0]->unsigned_flag)
+      value= compare_between_int_result<ulonglong>(compare_as_temporal_dates,
+                                                   compare_as_temporal_times,
+                                                   negated,
+                                                   args,
+                                                   &null_value);
     else
-    {
-      a= args[1]->val_int();
-      b= args[2]->val_int();
-    }
+      value= compare_between_int_result<longlong>(compare_as_temporal_dates,
+                                                  compare_as_temporal_times,
+                                                  negated,
+                                                  args,
+                                                  &null_value);
+    if (args[0]->null_value)
+      return 0;                                 /* purecov: inspected */
     if (!args[1]->null_value && !args[2]->null_value)
-      return (longlong) ((value >= a && value <= b) != negated);
-    if (args[1]->null_value && args[2]->null_value)
-      null_value=1;
-    else if (args[1]->null_value)
-    {
-      null_value= value <= b;			// not null if false range.
-    }
-    else
-    {
-      null_value= value >= a;
-    }
+      return value;
   }
   else if (cmp_type == DECIMAL_RESULT)
   {
     my_decimal dec_buf, *dec= args[0]->val_decimal(&dec_buf),
                a_buf, *a_dec, b_buf, *b_dec;
     if ((null_value=args[0]->null_value))
-      return 0;					/* purecov: inspected */
+      return 0;                                 /* purecov: inspected */
     a_dec= args[1]->val_decimal(&a_buf);
     b_dec= args[2]->val_decimal(&b_buf);
     if (!args[1]->null_value && !args[2]->null_value)