Commit 48ada204 authored by kaa@polly.(none)'s avatar kaa@polly.(none)
Browse files

Merge polly.(none):/home/kaa/src/maint/bug31254/my50-bug31254 

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
parents fa942cf8 56e85a8c

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.