Commit 611299bb authored by unknown's avatar unknown
Browse files

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

into  trift2.:/MySQL/M41/mysql-4.1
parents 10698df6 4713caa7

BUILD/check-cpu

+1 −2
Original line number Diff line number Diff line
@@ -167,8 +167,7 @@ check_cpu () { 
  touch __test.c



  while [ "$cpu_arg" ] ; do

    # FIXME: echo -n isn't portable - see contortions autoconf goes through

    echo -n testing $cpu_arg "... " >&2

    printf "testing $cpu_arg ... " >&2

          

    # compile check

    check_cpu_cflags=`eval echo $check_cpu_args`

configure.in

+5 −1
Original line number Diff line number Diff line
@@ -2990,10 +2990,14 @@ AM_CONDITIONAL(HAVE_NETWARE, test "$netware_dir" = "netware") 
export CC CXX CFLAGS CXXFLAGS LD LDFLAGS AR

ac_configure_args="$ac_configure_args CFLAGS='$CFLAGS' CXXFLAGS='$CXXFLAGS'"



if test "$with_server" = "yes" -o "$THREAD_SAFE_CLIENT" != "no"

if test "$with_server" != "no" -o "$THREAD_SAFE_CLIENT" != "no"

then

  AC_DEFINE([THREAD], [1],

            [Define if you want to have threaded code. This may be undef on client code])

fi



if test "$with_server" != "no"

then

  # Avoid _PROGRAMS names

  THREAD_LPROGRAMS="test_thr_alarm\$(EXEEXT) test_thr_lock\$(EXEEXT)"

  AC_SUBST(THREAD_LPROGRAMS)

include/my_global.h

+36 −0
Original line number Diff line number Diff line
@@ -84,6 +84,42 @@ 
#define NETWARE_SET_SCREEN_MODE(A)

#endif



/*

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

  MySQL and MySQL applications under darwin. 

*/

#ifdef TARGET_FAT_BINARY

# undef SIZEOF_CHARP 

# undef SIZEOF_INT 

# undef SIZEOF_LONG 

# undef SIZEOF_LONG_LONG 

# undef SIZEOF_OFF_T 

# undef SIZEOF_SHORT 



#if defined(__i386__)

# undef WORDS_BIGENDIAN

# define SIZEOF_CHARP 4

# define SIZEOF_INT 4

# define SIZEOF_LONG 4

# define SIZEOF_LONG_LONG 8

# define SIZEOF_OFF_T 8

# define SIZEOF_SHORT 2



#elif defined(__ppc__)

# define WORDS_BIGENDIAN

# define SIZEOF_CHARP 4

# define SIZEOF_INT 4

# define SIZEOF_LONG 4

# define SIZEOF_LONG_LONG 8

# define SIZEOF_OFF_T 8

# define SIZEOF_SHORT 2



#else

# error Building FAT binary for an unknown architecture.

#endif

#endif /* TARGET_FAT_BINARY */





/*

  The macros below are borrowed from include/linux/compiler.h in the

  Linux kernel. Use them to indicate the likelyhood of the truthfulness

innobase/include/hash0hash.h

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ typedef struct hash_cell_struct hash_cell_t; 


typedef void*	hash_node_t;



/* Fix Bug #13859: symbol collision between imap/mysql */

#define hash_create hash0_create



/*****************************************************************

Creates a hash table with >= n array cells. The actual number

of cells is chosen to be a prime number slightly bigger than n. */

scripts/make_binary_distribution.sh

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ BASE=$BASE2 
#



if [ x"@GXX@" = x"yes" ] ; then

  gcclib=`@CC@ --print-libgcc-file`

  gcclib=`@CC@ @CFLAGS@ --print-libgcc-file`

  if [ $? -ne 0 ] ; then

    echo "Warning: Couldn't find libgcc.a!"

  else