Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new (eeeaa19b) · Commits · Software / OSDI20 Artifacts / mariadb

.bzrignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -1772,3 +1772,4 @@ zlib/*.ds?
		zlib/*.vcproj
		libmysqld/event_scheduler.cc
		mysys/test_atomic
		*-t

config/ac-macros/misc.m4

+0 −97

Original line number	Diff line number	Diff line
		@@ -155,84 +155,6 @@ fi
		])


		#---START: Used in for client configure
		AC_DEFUN([MYSQL_CHECK_ULONG],
		[AC_MSG_CHECKING(for type ulong)
		AC_CACHE_VAL(ac_cv_ulong,
		[AC_TRY_RUN([#include <stdio.h>
		#include <sys/types.h>
		main()
		{
		ulong foo;
		foo++;
		exit(0);
		}], ac_cv_ulong=yes, ac_cv_ulong=no, ac_cv_ulong=no)])
		AC_MSG_RESULT($ac_cv_ulong)
		if test "$ac_cv_ulong" = "yes"
		then
		AC_DEFINE([HAVE_ULONG], [1], [system headers define ulong])
		fi
		])

		AC_DEFUN([MYSQL_CHECK_UCHAR],
		[AC_MSG_CHECKING(for type uchar)
		AC_CACHE_VAL(ac_cv_uchar,
		[AC_TRY_RUN([#include <stdio.h>
		#include <sys/types.h>
		main()
		{
		uchar foo;
		foo++;
		exit(0);
		}], ac_cv_uchar=yes, ac_cv_uchar=no, ac_cv_uchar=no)])
		AC_MSG_RESULT($ac_cv_uchar)
		if test "$ac_cv_uchar" = "yes"
		then
		AC_DEFINE([HAVE_UCHAR], [1], [system headers define uchar])
		fi
		])

		AC_DEFUN([MYSQL_CHECK_UINT],
		[AC_MSG_CHECKING(for type uint)
		AC_CACHE_VAL(ac_cv_uint,
		[AC_TRY_RUN([#include <stdio.h>
		#include <sys/types.h>
		main()
		{
		uint foo;
		foo++;
		exit(0);
		}], ac_cv_uint=yes, ac_cv_uint=no, ac_cv_uint=no)])
		AC_MSG_RESULT($ac_cv_uint)
		if test "$ac_cv_uint" = "yes"
		then
		AC_DEFINE([HAVE_UINT], [1], [system headers define uint])
		fi
		])


		AC_DEFUN([MYSQL_CHECK_IN_ADDR_T],
		[AC_MSG_CHECKING(for type in_addr_t)
		AC_CACHE_VAL(ac_cv_in_addr_t,
		[AC_TRY_RUN([#include <stdio.h>
		#include <sys/types.h>
		#include <sys/socket.h>
		#include <netinet/in.h>
		#include <arpa/inet.h>

		int main(int argc, char **argv)
		{
		in_addr_t foo;
		exit(0);
		}], ac_cv_in_addr_t=yes, ac_cv_in_addr_t=no, ac_cv_in_addr_t=no)])
		AC_MSG_RESULT($ac_cv_in_addr_t)
		if test "$ac_cv_in_addr_t" = "yes"
		then
		AC_DEFINE([HAVE_IN_ADDR_T], [1], [system headers define in_addr_t])
		fi
		])


		AC_DEFUN([MYSQL_PTHREAD_YIELD],
		[AC_CACHE_CHECK([if pthread_yield takes zero arguments], ac_cv_pthread_yield_zero_arg,
		[AC_TRY_LINK([#define _GNU_SOURCE
		@@ -272,25 +194,6 @@ fi

		#---END:

		AC_DEFUN([MYSQL_CHECK_FP_EXCEPT],
		[AC_MSG_CHECKING(for type fp_except)
		AC_CACHE_VAL(ac_cv_fp_except,
		[AC_TRY_RUN([#include <stdio.h>
		#include <sys/types.h>
		#include <ieeefp.h>
		main()
		{
		fp_except foo;
		foo++;
		exit(0);
		}], ac_cv_fp_except=yes, ac_cv_fp_except=no, ac_cv_fp_except=no)])
		AC_MSG_RESULT($ac_cv_fp_except)
		if test "$ac_cv_fp_except" = "yes"
		then
		AC_DEFINE([HAVE_FP_EXCEPT], [1], [fp_except from ieeefp.h])
		fi
		])

		# From fileutils-3.14/aclocal.m4

		# @defmac AC_PROG_CC_STDC

configure.in

+13 −41

Original line number	Diff line number	Diff line
		@@ -829,38 +829,20 @@ fi
		# Later in this script LIBS will be augmented with a threads library.
		NON_THREADED_LIBS="$LIBS"

		AC_MSG_CHECKING([for int8])
		case $SYSTEM_TYPE in
		*netware)
		AC_MSG_RESULT([no])
		;;
		*)
		AC_TRY_RUN([
		#ifdef HAVE_STDLIB_H
		#include <stdlib.h>
		#endif

		#ifdef HAVE_STDDEF_H
		#include <stddef.h>
		#endif

		#ifdef HAVE_SYS_TYPES_H
		AC_CHECK_TYPES([int8, uint8, int16, uint16, int32, uint32, int64, uint64,
		uchar, uint, ulong],[],[], [
		#include <sys/types.h>
		#endif

		int main()
		{
		int8 i;
		return 0;
		}
		],
		[AC_DEFINE([HAVE_INT_8_16_32], [1],
		[whether int8, int16 and int32 types exist])
		AC_MSG_RESULT([yes])],
		[AC_MSG_RESULT([no])]
		)
		;;
		esac
		])
		AC_CHECK_TYPES([in_addr_t], [], [], [
		#include <sys/types.h>
		#include <sys/socket.h>
		#include <netinet/in.h>
		#include <arpa/inet.h>
		])
		AC_CHECK_TYPES([fp_except], [], [], [
		#include <sys/types.h>
		#include <ieeefp.h>
		])

		#
		# Some system specific hacks
		@@ -1734,16 +1716,6 @@ MYSQL_FUNC_ALLOCA
		MYSQL_TIMESPEC_TS
		# Do we have the tzname variable
		MYSQL_TZNAME
		# Do the system files define ulong
		MYSQL_CHECK_ULONG
		# Do the system files define uchar
		MYSQL_CHECK_UCHAR
		# Do the system files define uint
		MYSQL_CHECK_UINT
		# Check for fp_except in ieeefp.h
		MYSQL_CHECK_FP_EXCEPT
		# Check for IN_ADDR_T
		MYSQL_CHECK_IN_ADDR_T
		# Do the c++ compiler have a bool type
		MYSQL_CXX_BOOL
		# Check some common bugs with gcc 2.8.# on sparc

include/atomic/x86-gcc.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,9 @@
		cmpxchg8b, if necessary
		*/

		/* fix -ansi errors while maintaining readability */
		#define asm __asm__

		#define make_atomic_add_body8 \
		asm volatile (LOCK "xadd %0, %1;" : "+r" (v) , "+m" (a->val))
		#define make_atomic_swap_body8 \

include/my_global.h

+26 −12

Original line number	Diff line number	Diff line
		@@ -864,26 +864,36 @@ typedef void gptr; / Generic pointer */
		#else
		typedef char gptr; / Generic pointer */
		#endif
		#ifndef HAVE_INT_8_16_32
		typedef signed char int8; /* Signed integer >= 8 bits */
		typedef short int16; /* Signed integer >= 16 bits */
		#endif
		#ifndef HAVE_UCHAR
		typedef unsigned char uchar; /* Short for unsigned char */
		#endif
		typedef unsigned char uint8; /* Short for unsigned integer >= 8 bits */
		typedef unsigned short uint16; /* Short for unsigned integer >= 16 bits */

		#ifndef HAVE_INT8
		typedef signed char int8; /* Signed integer >= 8 bits */
		#endif
		#ifndef HAVE_UINT8
		typedef unsigned char uint8; /* Unsigned integer >= 8 bits */
		#endif
		#ifndef HAVE_INT16
		typedef short int16;
		#endif
		#ifndef HAVE_UINT16
		typedef unsigned short uint16;
		#endif
		#if SIZEOF_INT == 4
		#ifndef HAVE_INT_8_16_32
		#ifndef HAVE_INT32
		typedef int int32;
		#endif
		typedef unsigned int uint32; /* Short for unsigned integer >= 32 bits */
		#ifndef HAVE_UINT32
		typedef unsigned int uint32;
		#endif
		#elif SIZEOF_LONG == 4
		#ifndef HAVE_INT_8_16_32
		#ifndef HAVE_INT32
		typedef long int32;
		#endif
		typedef unsigned long uint32; /* Short for unsigned integer >= 32 bits */
		#ifndef HAVE_UINT32
		typedef unsigned long uint32;
		#endif
		#else
		#error "Neither int or long is of 4 bytes width"
		#endif
		@@ -900,8 +910,12 @@ typedef unsigned long ulonglong; /* ulong or unsigned long long */
		typedef long longlong;
		#endif
		#endif
		#ifndef HAVE_INT64
		typedef longlong int64;
		#endif
		#ifndef HAVE_UINT64
		typedef ulonglong uint64;
		#endif

		#if defined(NO_CLIENT_LONG_LONG)
		typedef unsigned long my_ulonglong;