Commit fbdf35e9 authored by unknown's avatar unknown
Browse files

Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1-new


sql/mysqld.cc:
  Auto merged
parents a06544c2 5b21d72f

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -1771,3 +1771,5 @@ vio/viotest.cpp 
zlib/*.ds?

zlib/*.vcproj

libmysqld/event_scheduler.cc

mysys/test_atomic

*-t

client/Makefile.am

+7 −7
Original line number Diff line number Diff line
@@ -83,12 +83,12 @@ link_sources: 
	for f in $(sql_src) ; do \

	  rm -f $$f; \

	  @LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \

        done; \

	done;

	for f in $(strings_src) ; do \

	  rm -f $(srcdir)/$$f; \

	  @LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \

        done; \

        rm -f $(srcdir)/my_user.c; \

	done;

	-rm -f $(srcdir)/my_user.c;

	@LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c

client/client_priv.h.rej

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
***************

*** 50,55 ****

    OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING,

  #endif

    OPT_TRIGGERS,

    OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,

!   OPT_TZ_UTC, OPT_AUTO_CLOSE

  };

--- 50,55 ----

    OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING,

  #endif

    OPT_TRIGGERS,

    OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,

!   OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_SSL_VERIFY_SERVER_CERT

  };

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

+27 −83
Original line number Diff line number Diff line
@@ -778,48 +778,6 @@ struct request_info *req; 
AC_SUBST(WRAPLIBS)



if test "$TARGET_LINUX" = "true"; then

  AC_MSG_CHECKING([for atomic operations])



  AC_LANG_SAVE

  AC_LANG_CPLUSPLUS



  atom_ops=

  AC_TRY_RUN([

#include <asm/atomic.h>

int main()

{

  atomic_t v;



  atomic_set(&v, 23);

  atomic_add(5, &v);

  return atomic_read(&v) == 28 ? 0 : -1;

}

  ],

  [AC_DEFINE([HAVE_ATOMIC_ADD], [1],

             [atomic_add() from <asm/atomic.h> (Linux only)])

   atom_ops="${atom_ops}atomic_add "],

  )

  AC_TRY_RUN([

#include <asm/atomic.h>

int main()

{

  atomic_t v;



  atomic_set(&v, 23);

  atomic_sub(5, &v);

  return atomic_read(&v) == 18 ? 0 : -1;

}

  ],

  [AC_DEFINE([HAVE_ATOMIC_SUB], [1],

             [atomic_sub() from <asm/atomic.h> (Linux only)])

   atom_ops="${atom_ops}atomic_sub "],

  )



  if test -z "$atom_ops"; then atom_ops="no"; fi

  AC_MSG_RESULT($atom_ops)



  AC_LANG_RESTORE



  AC_ARG_WITH(pstack,

    [  --with-pstack           Use the pstack backtrace library],

    [ USE_PSTACK=$withval ],
@@ -871,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
@@ -1631,6 +1571,20 @@ then 
  fi

fi



AC_ARG_WITH([atomic-ops],

	    AC_HELP_STRING([--with-atomic-ops=rwlocks|smp|up],

	    [Implement atomic operations using pthread rwlocks or atomic CPU

             instructions for multi-processor (default) or uniprocessor

             configuration]), , [with_atomic_ops=smp])

case "$with_atomic_ops" in

  "up") AC_DEFINE([MY_ATOMIC_MODE_DUMMY], [1],

                  [Assume single-CPU mode, no concurrency]) ;;

  "rwlocks") AC_DEFINE([MY_ATOMIC_MODE_RWLOCKS], [1],

                  [Use pthread rwlocks for atomic ops]) ;;

  "smp") ;;

   *) AC_MSG_ERROR(["$with_atomic_ops" is not a valid value for --with-atomic-ops]) ;;

esac



# Force static compilation to avoid linking problems/get more speed

AC_ARG_WITH(mysqld-ldflags,

    [  --with-mysqld-ldflags   Extra linking arguments for mysqld],
@@ -1762,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