Commit f1cf7077 authored by tim@threads.polyesthetic.msg's avatar tim@threads.polyesthetic.msg
Browse files

Merge work.mysql.com:/home/bk/mysql 

into threads.polyesthetic.msg:/usr/local/src/my/work
parents dec73640 bcd6abea

BitKeeper/etc/logging_ok

+1 −1
Original line number Diff line number Diff line
@@ -8,5 +8,5 @@ sasha@work.mysql.com 
serg@donna.mysql.com

serg@serg.mysql.com

tim@cane.mysql.fi

tim@work.mysql.com

tim@threads.polyesthetic.msg

tim@work.mysql.com

Docs/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -115,8 +115,8 @@ manual_letter.ps: manual.texi include.texi 
dist-hook:

	BD=`cd $(top_srcdir); pwd`; \

	if test ! -d $(distdir)/Flags; then mkdir -p $(distdir)/Flags; fi; \

	cp -p $(srcdir)/Flags/*.gif $(srcdir)/Flags/*.eps $(srcdir)/Flags/*.txt \

		$(distdir)/Flags;

	$(INSTALL_DATA) $(srcdir)/Flags/*.gif $(srcdir)/Flags/*.eps \

		$(srcdir)/Flags/*.txt $(distdir)/Flags;

	echo "PostScript and PDF versions suitable for printing" \

		> $(distdir)/manual.ps

	echo "are available from http://www.mysql.com/Manual/" \

configure.in

+16 −11
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ case "$target_os" in 
       ;;

     esac

  ;;

  sysv5uw7*) LIBS="-lsocket -lnsl $LIBS"

  sysv5uw7*) 

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

      # We are using built-in inline function

      CFLAGS="$CFLAGS -Kalloca"
@@ -631,8 +631,6 @@ then 
fi

# We make a special variable for client library's to avoid including

# thread libs in the client.

LIBS_AFTER_SOCKET=$LIBS

LIBS="$LIBS_BEFORE_SOCKET $LIBS_SOCKET $LIBS_AFTER_SOCKET"

NON_THREADED_CLIENT_LIBS="$LIBS"



AC_MSG_CHECKING([for int8])
@@ -824,6 +822,13 @@ Reference Manual.]) 
     fi

   fi

fi





dnl This is needed because -lsocket has to come after the thread

dnl library on SCO.

AC_DEFUN([MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK], [

  LIBS=`echo " $LIBS " | sed -e 's/ -lsocket / /g'`

])

# Hack for SCO UNIX

if test "$with_named_thread" = "no"

then
@@ -832,7 +837,7 @@ then 
  then

    if test -f /usr/lib/libgthreads.a -o -f /usr/lib/libgthreads.so

    then

      LIBS="$LIBS_BEFORE_SOCKET $LIBS_AFTER_SOCKET"

      MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK

      with_named_thread="-lgthreads -lsocket -lgthreads"

      # sched.h conflicts with fsu-threads

      touch ./include/sched.h
@@ -847,7 +852,7 @@ then 
      AC_MSG_RESULT("yes")

    elif test -f /usr/local/lib/libpthread.a -o -f /usr/local/lib/libpthread.so

    then

      LIBS="$LIBS_BEFORE_SOCKET $LIBS_AFTER_SOCKET"

      MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK

      with_named_thread="-lpthread -lsocket"

      # sched.h conflicts with fsu-threads

      # touch ./include/sched.h
@@ -871,12 +876,12 @@ then 
      then

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

        then

          LIBS="$LIBS_BEFORE_SOCKET $LIBS_AFTER_SOCKET"

	  MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK

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

          then

            with_named_thread="-pthread -lsocket -lnsl"

            with_named_thread="-pthread -lnsl"

          else

            with_named_thread="-Kthread -lsocket -lnsl"

            with_named_thread="-Kthread -lnsl"

          fi

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

          then
@@ -917,8 +922,8 @@ then 
  then

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

    then

      LIBS="$LIBS_BEFORE_SOCKET $LIBS_AFTER_SOCKET"

      with_named_thread="-Kthread -lsocket -lnsl"

      MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK

      with_named_thread="-Kthread -lnsl"

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

      then

        AC_DEFINE(HAVE_UNIXWARE7_THREADS)
@@ -949,7 +954,7 @@ then 
  AC_MSG_CHECKING("Siemens threads")

  if test -f /usr/lib/libxnet.so -a "$SYSTEM_TYPE" = "sni-sysv4"

  then

    LIBS="$LIBS_BEFORE_SOCKET -lxnet $LIBS_AFTER_SOCKET"

    LIBS="-lxnet $LIBS"

    NON_THREADED_CLIENT_LIBS="$NON_THREADED_CLIENT_LIBS -lxnet"

    with_named_thread="-Kthread $LDFLAGS -lxnet"

    LD_FLAGS=""

libmysql/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -80,8 +80,8 @@ do-lib-dist: 
	objs="$$objs1 $$objs2"; \

	rm -rf $$dir; \

	mkdir $$dir; \

	cp $$srcs $(mysysheaders) $$dir; \

	for i in $(nh); do cp ../include/$$i $$dir; done; \

	$(INSTALL_DATA) $$srcs $(mysysheaders) $$dir; \

	for i in $(nh); do $(INSTALL_DATA) ../include/$$i $$dir; done; \

	echo "# A very minimal Makefile to compile" > $$dir/Makefile; \

	echo "# the minimized libmysql library" >> $$dir/Makefile; \

	echo "# This file is autogenerated from Makefile.am" >> $$dir/Makefile; \

ltconfig

+2 −2
Original line number Diff line number Diff line
@@ -1500,7 +1500,7 @@ else 
    no_undefined_flag=' -z text'

    # $CC -shared without GNU ld will not create a library from C++

    # object files and a static libstdc++, better avoid it by now

    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'

    archive_cmds='$UW7_compile_command -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'

    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~

		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp'

    hardcode_libdir_flag_spec=
@@ -1540,7 +1540,7 @@ else 
    ;;



  unixware7*)

    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'

    archive_cmds='$UW7_compile_command -G -h $soname -o $lib $libobjs $deplibs $linkopts'

    runpath_var='LD_RUN_PATH'

    hardcode_shlibpath_var=no

    ;;