Commit 5d88ac5c authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
parents ccaf7618 2f48a591

BitKeeper/etc/collapsed

0 → 100644
+1 −0
Original line number Diff line number Diff line 
44d03f27qNdqJmARzBoP3Is_cN5e0w

config/ac-macros/misc.m4

+0 −30
Original line number Diff line number Diff line 
# Local macros for automake & autoconf



# A local version of AC_CHECK_SIZEOF that includes sys/types.h

dnl MYSQL_CHECK_SIZEOF(TYPE [, CROSS-SIZE])

AC_DEFUN([MYSQL_CHECK_SIZEOF],

[changequote(<<, >>)dnl

dnl The name to #define.

define(<<AC_TYPE_NAME>>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl

dnl The cache variable name.

define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$1, [ *], [_p]))dnl

changequote([, ])dnl

AC_MSG_CHECKING(size of $1)

AC_CACHE_VAL(AC_CV_NAME,

[AC_TRY_RUN([#include <stdio.h>

#include <sys/types.h>

#if STDC_HEADERS

#include <stdlib.h>

#include <stddef.h>

#endif

main()

{

  FILE *f=fopen("conftestval", "w");

  if (!f) exit(1);

  fprintf(f, "%d\n", sizeof($1));

  exit(0);

}], AC_CV_NAME=`cat conftestval`, AC_CV_NAME=0, ifelse([$2], , , AC_CV_NAME=$2))])dnl

AC_MSG_RESULT($AC_CV_NAME)

AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [ ])

undefine([AC_TYPE_NAME])dnl

undefine([AC_CV_NAME])dnl

])



#---START: Used in for client configure

AC_DEFUN([MYSQL_TYPE_ACCEPT],

[ac_save_CXXFLAGS="$CXXFLAGS"

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -1687,7 +1687,7 @@ then 
  AC_MSG_ERROR("MySQL needs a long long type.")

fi

# off_t is not a builtin type

MYSQL_CHECK_SIZEOF(off_t, 4)

AC_CHECK_SIZEOF(off_t, 4)

if test "$ac_cv_sizeof_off_t" -eq 0

then

  AC_MSG_ERROR("MySQL needs a off_t type.")

include/my_atomic.h

+7 −1
Original line number Diff line number Diff line
@@ -135,7 +135,13 @@ make_atomic_swap(ptr) 
#undef _atomic_h_cleanup_

#endif



typedef int32 intptr; /* TODO configure check */

#if SIZEOF_CHARP == SIZEOF_INT

typedef int intptr;

#elif SIZEOF_CHARP == SIZEOF_LONG

typedef long intptr;

#else

#error

#endif



#define MY_ATOMIC_OK       0

#define MY_ATOMIC_NOT_1CPU 1

mysql-test/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ install-data-local: 
	$(INSTALL_DATA) $(srcdir)/include/*.inc $(DESTDIR)$(testdir)/include

	$(INSTALL_DATA) $(srcdir)/std_data/*.dat $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.*001 $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/des_key_file $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.pem $(DESTDIR)$(testdir)/std_data