Commit 4d44d8b3 authored by mtaylor@solace.(none)'s avatar mtaylor@solace.(none)
Browse files

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

into  solace.(none):/home/mtaylor/src/mysql/mysql-5.0-maint
parents f6ba3443 c0268781

config/ac-macros/large_file.m4

+9 −2
Original line number Diff line number Diff line
@@ -128,8 +128,15 @@ AC_DEFUN([MYSQL_SYS_LARGEFILE], 
	  ac_cv_sys_largefile_source=1 ;;

	esac])



     # AIX 4.2 and later -- do nothing, include standards.h instead.

     # this goes for both GNU and IBM C and C++ compilers.

     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES,

       ac_cv_sys_large_files,

       [Large files support on AIX-style hosts.],

       [case "$host_os" in

       # Large file support on AIX is available starting from version 4.2

       # Tested only on 5.2 and up

       aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*)

         ac_cv_sys_large_files=1 ;;

       esac])

   fi

  ])

include/my_global.h

+5 −0
Original line number Diff line number Diff line
@@ -100,6 +100,11 @@ 
#define NETWARE_SET_SCREEN_MODE(A)

#endif



/* Workaround for _LARGE_FILES and _LARGE_FILE_API incompatibility on AIX */

#if defined(_AIX) && defined(_LARGE_FILE_API)

#undef _LARGE_FILE_API

#endif



/*

  The macros below are used to allow build of Universal/fat binaries of

  MySQL and MySQL applications under darwin.

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--;