Commit 25257222 authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/usr/home/ram/work/5.0.b6961
parents 7f4e45ef c1ed128f

mysql-test/r/type_newdecimal.result

+6 −0
Original line number Diff line number Diff line
@@ -885,3 +885,9 @@ SELECT GRADE FROM t1 WHERE GRADE= 151; 
GRADE

151

DROP TABLE t1;

select abs(10/0);

abs(10/0)

NULL

select abs(NULL);

abs(NULL)

NULL

mysql-test/t/type_newdecimal.test

+7 −0
Original line number Diff line number Diff line
@@ -916,3 +916,10 @@ INSERT INTO t1 (GRADE) VALUES (151),(252),(343); 
SELECT GRADE  FROM t1 WHERE GRADE > 160 AND GRADE < 300;

SELECT GRADE  FROM t1 WHERE GRADE= 151;

DROP TABLE t1;



#

# Bug #10599: problem with NULL

#



select abs(10/0);

select abs(NULL);

sql/item_func.cc

+34 −32
Original line number Diff line number Diff line
@@ -1063,11 +1063,11 @@ my_decimal *Item_func_plus::decimal_op(my_decimal *decimal_value) 
  if ((null_value= args[0]->null_value))

    return 0;

  val2= args[1]->val_decimal(&value2);

  if ((null_value= (args[1]->null_value ||

  if (!(null_value= (args[1]->null_value ||

                     my_decimal_add(E_DEC_FATAL_ERROR, decimal_value, val1,

                                    val2) > 1)))

    return 0;

    return decimal_value;

  return 0;

}



/*
@@ -1136,11 +1136,11 @@ my_decimal *Item_func_minus::decimal_op(my_decimal *decimal_value) 
  if ((null_value= args[0]->null_value))

    return 0;

  val2= args[1]->val_decimal(&value2);

  if ((null_value= (args[1]->null_value ||

  if (!(null_value= (args[1]->null_value ||

                     my_decimal_sub(E_DEC_FATAL_ERROR, decimal_value, val1,

                                    val2) > 1)))

    return 0;

    return decimal_value;

  return 0;

}
@@ -1174,11 +1174,11 @@ my_decimal *Item_func_mul::decimal_op(my_decimal *decimal_value) 
  if ((null_value= args[0]->null_value))

    return 0;

  val2= args[1]->val_decimal(&value2);

  if ((null_value= (args[1]->null_value ||

  if (!(null_value= (args[1]->null_value ||

                     my_decimal_mul(E_DEC_FATAL_ERROR, decimal_value, val1,

                                    val2) > 1)))

    return 0;

    return decimal_value;

  return 0;

}
@@ -1396,9 +1396,10 @@ my_decimal *Item_func_neg::decimal_op(my_decimal *decimal_value) 
  {

    my_decimal2decimal(value, decimal_value);

    my_decimal_neg(decimal_value);

  }

    return decimal_value;

  }

  return 0;

}





void Item_func_neg::fix_num_length_and_dec()
@@ -1460,9 +1461,10 @@ my_decimal *Item_func_abs::decimal_op(my_decimal *decimal_value) 
    my_decimal2decimal(value, decimal_value);

    if (decimal_value->sign())

      my_decimal_neg(decimal_value);

  }

    return decimal_value;

  }

  return 0;

}





void Item_func_abs::fix_length_and_dec()
@@ -1761,11 +1763,11 @@ double Item_func_ceiling::real_op() 
my_decimal *Item_func_ceiling::decimal_op(my_decimal *decimal_value)

{

  my_decimal val, *value= args[0]->val_decimal(&val);

  if ((null_value= (args[0]->null_value ||

  if (!(null_value= (args[0]->null_value ||

                     my_decimal_ceiling(E_DEC_FATAL_ERROR, value,

                                        decimal_value) > 1)))

    return 0;

    return decimal_value;

  return 0;

}
@@ -1808,11 +1810,11 @@ double Item_func_floor::real_op() 
my_decimal *Item_func_floor::decimal_op(my_decimal *decimal_value)

{

  my_decimal val, *value= args[0]->val_decimal(&val);

  if ((null_value= (args[0]->null_value ||

  if (!(null_value= (args[0]->null_value ||

                     my_decimal_floor(E_DEC_FATAL_ERROR, value,

                                      decimal_value) > 1)))

    return 0;

    return decimal_value;

  return 0;

}
@@ -1955,11 +1957,11 @@ my_decimal *Item_func_round::decimal_op(my_decimal *decimal_value) 
  {

    decimals= min(dec, DECIMAL_MAX_SCALE); // to get correct output

  }

  if ((null_value= (args[0]->null_value || args[1]->null_value ||

  if (!(null_value= (args[0]->null_value || args[1]->null_value ||

                     my_decimal_round(E_DEC_FATAL_ERROR, value, dec, truncate,

                                      decimal_value) > 1)))

    return 0;

    return decimal_value;

  return 0;

}