Commit 7754e54b authored by tnurnberg@sin.intern.azundris.com's avatar tnurnberg@sin.intern.azundris.com
Browse files

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

into  sin.intern.azundris.com:/home/tnurnberg/30951/50-30951
parents fa942cf8 57dc3812

mysql-test/r/func_sapdb.result

+3 −0
Original line number Diff line number Diff line
@@ -93,6 +93,9 @@ makedate(9999,365) 
select makedate(9999,366);

makedate(9999,366)

NULL

select makedate(100,1);

makedate(100,1)

0100-01-01

select addtime("1997-12-31 23:59:59.999999", "1 1:1:1.000002");

addtime("1997-12-31 23:59:59.999999", "1 1:1:1.000002")

1998-01-02 01:01:01.000001

mysql-test/t/func_sapdb.test

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ select makedate(1997,1); 
select makedate(1997,0);

select makedate(9999,365);

select makedate(9999,366);

select makedate(100,1);



#Time functions

sql-common/my_time.c

+0 −5
Original line number Diff line number Diff line
@@ -769,11 +769,6 @@ long calc_daynr(uint year,uint month,uint day) 


  if (year == 0 && month == 0 && day == 0)

    DBUG_RETURN(0);				/* Skip errors */

  if (year < 200)

  {

    if ((year=year+1900) < 1900+YY_PART_YEAR)

      year+=100;

  }

  delsum= (long) (365L * year+ 31*(month-1) +day);

  if (month <= 2)

      year--;