Commit 7864ea21 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/media/sda1/mysql/mysql-4.1-6059
parents c8ad5215 315b7d89

mysql-test/r/func_test.result

+9 −0
Original line number Diff line number Diff line
@@ -174,3 +174,12 @@ SELECT GREATEST(d,d) FROM t1 WHERE k=2; 
GREATEST(d,d)

NULL

DROP TABLE t1;

select 1197.90 mod 50;

1197.90 mod 50

47.90

select 5.1 mod 3, 5.1 mod -3, -5.1 mod 3, -5.1 mod -3;

5.1 mod 3	5.1 mod -3	-5.1 mod 3	-5.1 mod -3

2.1	2.1	-2.1	-2.1

select 5 mod 3, 5 mod -3, -5 mod 3, -5 mod -3;

5 mod 3	5 mod -3	-5 mod 3	-5 mod -3

2	2	-2	-2

mysql-test/t/func_test.test

+13 −0
Original line number Diff line number Diff line
@@ -94,3 +94,16 @@ CREATE TABLE t1 (d varchar(6), k int); 
INSERT INTO t1 VALUES (NULL, 2);

SELECT GREATEST(d,d) FROM t1 WHERE k=2;

DROP TABLE t1;



#

# Bug #6138: mod and doubles

#



select 1197.90 mod 50;

select 5.1 mod 3, 5.1 mod -3, -5.1 mod 3, -5.1 mod -3;



#

# Test for mod and signed integers

#



select 5 mod 3, 5 mod -3, -5 mod 3, -5 mod -3;

sql/item_func.cc

+5 −8
Original line number Diff line number Diff line
@@ -651,11 +651,11 @@ void Item_func_int_div::fix_length_and_dec() 
double Item_func_mod::val()

{

  DBUG_ASSERT(fixed == 1);

  double value= floor(args[0]->val()+0.5);

  double val2=floor(args[1]->val()+0.5);

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

  double x= args[0]->val();

  double y= args[1]->val();

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

    return 0.0; /* purecov: inspected */

  return fmod(value,val2);

  return fmod(x, y);

}



longlong Item_func_mod::val_int()
@@ -670,10 +670,7 @@ longlong Item_func_mod::val_int() 


void Item_func_mod::fix_length_and_dec()

{

  max_length=args[1]->max_length;

  decimals=0;

  maybe_null=1;

  find_num_type();

  Item_num_op::fix_length_and_dec();

}