Commit 8dc5c95b authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-4.1-clean 

into  mysql.com:/home/jimw/my/mysql-5.0-clean


include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/violite.h:
  Auto merged
mysql-test/r/ndb_autodiscover.result:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
sql-common/client.c:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
vio/vio.c:
  Auto merged
vio/viosocket.c:
  Auto merged
vio/viossl.c:
  Auto merged
configure.in:
  Resolve conflicts
parents 74aeffda accf5c26

README

+24 −41
Original line number Diff line number Diff line 
This is a release of MySQL, a GPL (free) SQL database server (more

licence information in the PUBLIC file and in the reference manual).

This is a release of MySQL, a dual-license SQL database server.

MySQL is brought to you by the MySQL team at MySQL AB.



Please read the "Upgrading from..." section in the manual first, if you are

migrating from older versions of MySQL!

License information can be found in these files:

- For GPL (free) distributions, see the COPYING file.

- For commercial distributions, see the MySQLEULA.txt file.



The latest information about MySQL can be found at:

http://www.mysql.com



To see what it can do take a look at the features section in the

manual.

For further information about MySQL or additional documentation, see:

- The latest information about MySQL: http://www.mysql.com

- The current MySQL documentation: http:/dev.mysql.com/doc



For installation instructions see the Installation chapter in the

manual.

Some manual sections of special interest:



For future plans see the TODO appendix in the manual.

- If you are migrating from an older version of MySQL, please read the

  "Upgrading from..." section first!

- To see what MySQL can do, take a look at the features section.

- For installation instructions, see the Installation chapter.

- For future plans, see the TODO appendix.

- For the new features/bugfix history, see the News appendix.

- For the currently known bugs/misfeatures (known errors) see the problems

  appendix.

- For a list of developers and other contributors, see the Credits

  appendix.



New features/bug fixes history is in the news appendix in the manual.



For the currently known bugs/misfeatures (known errors) see the bugs

appendix in the manual.



For examples of SQL and benchmarking information see the bench

directory.



The manual mentioned above can be found in the Docs directory. The

manual is available in the following formats: as plain ASCII text in

Docs/manual.txt, in HTML format in Docs/manual_toc.html, as GNU Info in

Docs/mysql.info and as PostScript in Docs/manual.ps.



MySQL is brought to you by the MySQL team at MySQL AB



For a list of developers and other contributors, see the Credits appendix

in the manual.

A local copy of the MySQL Reference Manual can be found in the Docs

directory in GNU Info format.  You can also browse the manual online or

download it in any of several formats at the URL given earlier in this

file.



************************************************************



IMPORTANT:



Send bug (error) reports, questions and comments to the mailing list

at mysql@lists.mysql.com



Please use the 'mysqlbug' script when posting bug reports or questions

about MySQL. mysqlbug will gather some information about your system

and start your editor with a form in which you can describe your

problem. Bug reports might be silently ignored by the MySQL

maintainers if there is not a good reason included in the report as to

why mysqlbug has not been used. A report that says 'MySQL does not

work for me. Why?' is not considered a valid bug report.



The mysqlbug script can be found in the 'scripts' directory of the

distribution, that is '<where-you-installed-mysql>/scripts'.
 
Bug or error reports should be sent to http://bugs.mysql.com.

configure.in

+31 −71
Original line number Diff line number Diff line
@@ -322,19 +322,19 @@ case "$target_os" in 
       ;;

     esac

  ;;

  sysv5UnixWare*) 

  sysv5UnixWare* | sysv5OpenUNIX8*) 

    if test "$GCC" != "yes"; then

      # We are using built-in inline function

      # Use the built-in alloca()

      CFLAGS="$CFLAGS -Kalloca"

    fi

    CXXFLAGS="$CXXFLAGS -DNO_CPLUSPLUS_ALLOCA"

  ;;

  sysv5OpenUNIX8*) 

  sysv5SCO_SV6.0.0*)

    if test "$GCC" != "yes"; then

      # We are using built-in inline function

      # Use the built-in alloca()

      CFLAGS="$CFLAGS -Kalloca"

      CXXFLAGS="$CFLAGS -Kalloca"

    fi

    CXXFLAGS="$CXXFLAGS -DNO_CPLUSPLUS_ALLOCA"

  ;;

esac

AC_SUBST(CC)
@@ -1047,6 +1047,15 @@ case $SYSTEM_TYPE in 
      MAX_C_OPTIMIZE="-O"

    fi

    ;;

  *darwin9*)

    if test "$ac_cv_prog_gcc" = "yes"

    then

      FLAGS="-D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DIGNORE_SIGHUP_SIGQUIT"

      CFLAGS="$CFLAGS $FLAGS"

      CXXFLAGS="$CXXFLAGS $FLAGS"

      MAX_C_OPTIMIZE="-O"

    fi

    ;;

  *freebsd*)

    AC_MSG_WARN([Adding fix for interrupted reads])

    OSVERSION=`sysctl -a | grep osreldate | awk '{ print $2 }'`
@@ -1359,8 +1368,6 @@ then 
          if expr "$SYSTEM_TYPE" : ".*unixware7.0.0" > /dev/null

          then

            AC_DEFINE(HAVE_UNIXWARE7_THREADS, [1])

          else

            AC_DEFINE(HAVE_UNIXWARE7_POSIX, [1])

          fi

          AC_MSG_RESULT("yes")

          # We must have cc
@@ -1386,87 +1393,40 @@ then 
    AC_MSG_RESULT("no")

  fi

fi

# Hack for SCO UnixWare7

#

if test "$with_named_thread" = "no"

then

  AC_MSG_CHECKING("SCO UnixWare7 native threads")

  if expr "$SYSTEM_TYPE" : ".*UnixWare*" > /dev/null

  then

    if test -f /usr/lib/libthread.so -o -f /usr/lib/libthreadT.so

    then

      MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK

      if expr "$CC" : ".*gcc.*"

        then

          with_named_thread="-pthread -lsocket -lnsl"

      else

        with_named_thread="-Kthread -lsocket -lnsl"

      fi

      if expr "$SYSTEM_TYPE" : ".*unixware7.0.0" > /dev/null

      then

        AC_DEFINE(HAVE_UNIXWARE7_THREADS, [1])

      else

        AC_DEFINE(HAVE_UNIXWARE7_POSIX, [1])

      fi

      # We must have cc

      AC_MSG_CHECKING("for gcc")

      if expr "$CC" : ".*gcc.*"

      then

	CC="$CC -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"

	CXX="$CXX -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"

      else

	CC="$CC -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"

	CXX="$CXX -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"

      fi

      AC_MSG_RESULT("yes")

    else

      AC_MSG_ERROR([configure: error: Can't find thread libs on SCO UnixWare7. See the Installation chapter in the Reference Manual.]) 

    fi

  else

    AC_MSG_RESULT("no")

  fi

fi



# Hack for Caldera OpenUNIX8

#

# Check for SCO threading libraries

#

if test "$with_named_thread" = "no"

then

  AC_MSG_CHECKING("OpenUNIX8 native threads")

  if expr "$SYSTEM_TYPE" : ".*OpenUNIX*" > /dev/null

  AC_MSG_CHECKING([SCO OpenServer 6, UnixWare 7 or OpenUNIX 8 native threads])

  if expr "$SYSTEM_TYPE" : ".*UnixWare.*" > /dev/null || \

     expr "$SYSTEM_TYPE" : ".*SCO_SV6.*" > /dev/null || \

     expr "$SYSTEM_TYPE" : ".*OpenUNIX.*" > /dev/null

  then

    if test -f /usr/lib/libthread.so -o -f /usr/lib/libthreadT.so

    then

      MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK

      if expr "$CC" : ".*gcc.*"

      if expr "$CC" : ".*gcc.*" > /dev/null

      then

        with_named_thread="-pthread -lsocket -lnsl"

	CC="$CC -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK";

	CXX="$CXX -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK";

      else

        with_named_thread="-Kthread -lsocket -lnsl"

	CC="$CC -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK";

	CXX="$CXX -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK";

      fi

      if expr "$SYSTEM_TYPE" : ".*unixware7.0.0" > /dev/null

      then

        AC_DEFINE([HAVE_UNIXWARE7_THREADS], [1],

                  [UNIXWARE7 threads are not posix])

      else

        AC_DEFINE([HAVE_UNIXWARE7_POSIX], [1],

                  [new UNIXWARE7 threads that are not yet posix])

        AC_DEFINE(HAVE_UNIXWARE7_THREADS, [1], [Have UnixWare 7 (or similar) almost-POSIX threading library])

      fi

      # We must have cc

      AC_MSG_CHECKING("for gcc")

      if expr "$CC" : ".*gcc.*"

      then

	CC="$CC -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"

	CXX="$CXX -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"

      else

 	CC="$CC -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"

 	CXX="$CXX -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"

      fi

      AC_MSG_RESULT("yes")

      AC_MSG_RESULT(yes)

    else

      AC_MSG_ERROR([configure: error: Can't find thread libs on Caldera OpenUNIX 8. See the Installation chapter in the Reference Manual.]) 

      AC_MSG_ERROR([configure: error: Can't find thread library on SCO/Caldera system. See the Installation chapter in the Reference Manual.]) 

    fi

  else

    AC_MSG_RESULT("no")

    AC_MSG_RESULT(no)

  fi

fi
@@ -2508,7 +2468,7 @@ then 
      AC_CONFIG_FILES(bdb/Makefile)



      echo "CONFIGURING FOR BERKELEY DB" 

      bdb_conf_flags="--disable-shared"

      bdb_conf_flags="--disable-shared --build=$build_alias"

      if test $with_debug = "yes"

      then

        bdb_conf_flags="$bdb_conf_flags --enable-debug --enable-diagnostic"

include/my_global.h

+3 −0
Original line number Diff line number Diff line
@@ -834,6 +834,7 @@ typedef off_t os_off_t; 
#define socket_errno	WSAGetLastError()

#define SOCKET_EINTR	WSAEINTR

#define SOCKET_EAGAIN	WSAEINPROGRESS

#define SOCKET_ETIMEDOUT WSAETIMEDOUT

#define SOCKET_EWOULDBLOCK WSAEWOULDBLOCK

#define SOCKET_ENFILE	ENFILE

#define SOCKET_EMFILE	EMFILE
@@ -841,6 +842,7 @@ typedef off_t os_off_t; 
#define socket_errno	sock_errno()

#define SOCKET_EINTR	SOCEINTR

#define SOCKET_EAGAIN	SOCEINPROGRESS

#define SOCKET_ETIMEDOUT SOCKET_EINTR

#define SOCKET_EWOULDBLOCK SOCEWOULDBLOCK

#define SOCKET_ENFILE	SOCENFILE

#define SOCKET_EMFILE	SOCEMFILE
@@ -850,6 +852,7 @@ typedef off_t os_off_t; 
#define closesocket(A)	close(A)

#define SOCKET_EINTR	EINTR

#define SOCKET_EAGAIN	EAGAIN

#define SOCKET_ETIMEDOUT SOCKET_EINTR

#define SOCKET_EWOULDBLOCK EWOULDBLOCK

#define SOCKET_ENFILE	ENFILE

#define SOCKET_EMFILE	EMFILE

include/my_pthread.h

+0 −5
Original line number Diff line number Diff line
@@ -298,11 +298,6 @@ extern int my_pthread_create_detached; 
int sigwait(sigset_t *set, int *sig);

#endif



#if defined(HAVE_UNIXWARE7_POSIX)

#undef HAVE_NONPOSIX_SIGWAIT

#define HAVE_NONPOSIX_SIGWAIT	/* sigwait takes only 1 argument */

#endif



#ifndef HAVE_NONPOSIX_SIGWAIT

#define my_sigwait(A,B) sigwait((A),(B))

#else

include/violite.h

+4 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ int vio_fastsend(Vio *vio); 
int	vio_keepalive(Vio *vio, my_bool	onoff);

/* Whenever we should retry the last read/write operation. */

my_bool	vio_should_retry(Vio *vio);

/* Check that operation was timed out */

my_bool	vio_was_interrupted(Vio *vio);

/* Short text description of the socket for those, who are curious.. */

const char* vio_description(Vio *vio);

/* Return the type of the connection */
@@ -153,6 +155,7 @@ int vio_close_shared_memory(Vio * vio); 
#define vio_fastsend(vio)			(vio)->fastsend(vio)

#define vio_keepalive(vio, set_keep_alive)	(vio)->viokeepalive(vio, set_keep_alive)

#define vio_should_retry(vio) 			(vio)->should_retry(vio)

#define vio_was_interrupted(vio) 		(vio)->was_interrupted(vio)

#define vio_close(vio)				((vio)->vioclose)(vio)

#define vio_peer_addr(vio, buf, prt)		(vio)->peer_addr(vio, buf, prt)

#define vio_in_addr(vio, in)			(vio)->in_addr(vio, in)
@@ -198,6 +201,7 @@ struct st_vio 
  my_bool (*peer_addr)(Vio*, char *, uint16*);

  void    (*in_addr)(Vio*, struct in_addr*);

  my_bool (*should_retry)(Vio*);

  my_bool (*was_interrupted)(Vio*);

  int     (*vioclose)(Vio*);

  void	  (*timeout)(Vio*, unsigned int which, unsigned int timeout);

  void	  *ssl_arg;