Bug#14314156 MAIN.FUNC_MATH TEST FAILS ON MYSQL-TRUNK ON PB2

Tor Didriksen · Tor Didriksen · commit 6a44f5347174 · 2012-08-07T15:37:23.000+02:00
This seems to be a bug in gcc/clang/osx10.7-x86
-(LONGLONG_MIN) is not flagged as out of range.
Fixed by adding an explicit test for this value in Item_func_neg::int_op()
diff --git a/sql/item_func.cc b/sql/item_func.cc
@@ -1936,7 +1936,13 @@ longlong Item_func_neg::int_op()
   if ((null_value= args[0]->null_value))
     return 0;
   if (args[0]->unsigned_flag &&
-      (ulonglong) value > (ulonglong) LONGLONG_MAX + 1)
+      (ulonglong) value > (ulonglong) LONGLONG_MAX + 1ULL)
+    return raise_integer_overflow();
+  // For some platforms we need special handling of LONGLONG_MIN to
+  // guarantee overflow.
+  if (value == LONGLONG_MIN &&
+      !args[0]->unsigned_flag &&
+      !unsigned_flag)
     return raise_integer_overflow();
   return check_integer_overflow(-value, !args[0]->unsigned_flag && value < 0);
 }
diff --git a/sql/item_func.h b/sql/item_func.h
@@ -272,7 +272,8 @@ class Item_func :public Item_result_field
   inline longlong check_integer_overflow(longlong value, bool val_unsigned)
   {
     if ((unsigned_flag && !val_unsigned && value < 0) ||
-        (!unsigned_flag && val_unsigned && (ulonglong) value > LONGLONG_MAX))
+        (!unsigned_flag && val_unsigned &&
+         (ulonglong) value > (ulonglong) LONGLONG_MAX))
       return raise_integer_overflow();
     return value;
   }
diff --git a/unittest/gunit/item-t.cc b/unittest/gunit/item-t.cc
@@ -293,6 +293,18 @@ TEST_F(ItemTest, ItemFuncIntDivUnderflow)
 }
 
 
+TEST_F(ItemTest, ItemFuncNegLongLongMin)
+{
+  // Bug#14314156 MAIN.FUNC_MATH TEST FAILS ON MYSQL-TRUNK ON PB2
+  const longlong longlong_min= LONGLONG_MIN;
+  Item_func_neg *item_neg= new Item_func_neg(new Item_int(longlong_min));
+
+  EXPECT_FALSE(item_neg->fix_fields(thd(), NULL));
+  initializer.set_expected_error(ER_DATA_OUT_OF_RANGE);
+  EXPECT_EQ(0, item_neg->int_op());
+}
+
+
 /*
   This is not an exhaustive test. It simply demonstrates that more of the
   initializations in mysqld.cc are needed for testing Item_xxx classes.

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,8 @@ class Item_func :public Item_result_field`
`272`	`272`	`inline longlong check_integer_overflow(longlong value, bool val_unsigned)`
`273`	`273`	`{`
`274`	`274`	`if ((unsigned_flag && !val_unsigned && value < 0) \|\|`
`275`		`- (!unsigned_flag && val_unsigned && (ulonglong) value > LONGLONG_MAX))`
	`275`	`+ (!unsigned_flag && val_unsigned &&`
	`276`	`+ (ulonglong) value > (ulonglong) LONGLONG_MAX))`
`276`	`277`	`return raise_integer_overflow();`
`277`	`278`	`return value;`
`278`	`279`	`}`