Skip to content

M
MariaDB
Commit 9a507dc6 authored by unknown's avatar unknown
Browse files
Options

Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql 


support-files/Makefile.am:
  Auto merged
parents 278072d5 8dc1cd87
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 30 deletions
BitKeeper/etc/logging_ok
View file @ 9a507dc6
...@@ -8,5 +8,5 @@ sasha@work.mysql.com ...@@ -8,5 +8,5 @@ sasha@work.mysql.com
serg@donna.mysql.com serg@donna.mysql.com
serg@serg.mysql.com serg@serg.mysql.com
tim@cane.mysql.fi tim@cane.mysql.fi
tim@work.mysql.com
tim@threads.polyesthetic.msg tim@threads.polyesthetic.msg
tim@work.mysql.com
Docs/Makefile.am
View file @ 9a507dc6
...@@ -115,8 +115,8 @@ manual_letter.ps: manual.texi include.texi ...@@ -115,8 +115,8 @@ manual_letter.ps: manual.texi include.texi
dist-hook: dist-hook:
BD=`cd $(top_srcdir); pwd`; \ BD=`cd $(top_srcdir); pwd`; \
if test ! -d $(distdir)/Flags; then mkdir -p $(distdir)/Flags; fi; \ if test ! -d $(distdir)/Flags; then mkdir -p $(distdir)/Flags; fi; \
cp -p $(srcdir)/Flags/*.gif $(srcdir)/Flags/*.eps $(srcdir)/Flags/*.txt \ $(INSTALL_DATA) $(srcdir)/Flags/*.gif $(srcdir)/Flags/*.eps \
$(distdir)/Flags; $(srcdir)/Flags/*.txt $(distdir)/Flags;
echo "PostScript and PDF versions suitable for printing" \ echo "PostScript and PDF versions suitable for printing" \
> $(distdir)/manual.ps > $(distdir)/manual.ps
echo "are available from http://www.mysql.com/Manual/" \ echo "are available from http://www.mysql.com/Manual/" \
......
configure.in
View file @ 9a507dc6
...@@ -253,7 +253,7 @@ case "$target_os" in ...@@ -253,7 +253,7 @@ case "$target_os" in
;; ;;
esac esac
;; ;;
sysv5uw7*) LIBS="-lsocket -lnsl $LIBS" sysv5uw7*)
if test "$GCC" != "yes"; then if test "$GCC" != "yes"; then
# We are using built-in inline function # We are using built-in inline function
CFLAGS="$CFLAGS -Kalloca" CFLAGS="$CFLAGS -Kalloca"
...@@ -631,8 +631,6 @@ then ...@@ -631,8 +631,6 @@ then
fi fi
# We make a special variable for client library's to avoid including # We make a special variable for client library's to avoid including
# thread libs in the client. # thread libs in the client.
LIBS_AFTER_SOCKET=$LIBS
LIBS="$LIBS_BEFORE_SOCKET $LIBS_SOCKET $LIBS_AFTER_SOCKET"
NON_THREADED_CLIENT_LIBS="$LIBS" NON_THREADED_CLIENT_LIBS="$LIBS"
AC_MSG_CHECKING([for int8]) AC_MSG_CHECKING([for int8])
...@@ -824,6 +822,13 @@ Reference Manual.]) ...@@ -824,6 +822,13 @@ Reference Manual.])
fi fi
fi 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 # Hack for SCO UNIX
if test "$with_named_thread" = "no" if test "$with_named_thread" = "no"
then then
...@@ -832,7 +837,7 @@ then ...@@ -832,7 +837,7 @@ then
then then
if test -f /usr/lib/libgthreads.a -o -f /usr/lib/libgthreads.so if test -f /usr/lib/libgthreads.a -o -f /usr/lib/libgthreads.so
then then
LIBS="$LIBS_BEFORE_SOCKET $LIBS_AFTER_SOCKET" MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK
with_named_thread="-lgthreads -lsocket -lgthreads" with_named_thread="-lgthreads -lsocket -lgthreads"
# sched.h conflicts with fsu-threads # sched.h conflicts with fsu-threads
touch ./include/sched.h touch ./include/sched.h
...@@ -847,7 +852,7 @@ then ...@@ -847,7 +852,7 @@ then
AC_MSG_RESULT("yes") AC_MSG_RESULT("yes")
elif test -f /usr/local/lib/libpthread.a -o -f /usr/local/lib/libpthread.so elif test -f /usr/local/lib/libpthread.a -o -f /usr/local/lib/libpthread.so
then then
LIBS="$LIBS_BEFORE_SOCKET $LIBS_AFTER_SOCKET" MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK
with_named_thread="-lpthread -lsocket" with_named_thread="-lpthread -lsocket"
# sched.h conflicts with fsu-threads # sched.h conflicts with fsu-threads
# touch ./include/sched.h # touch ./include/sched.h
...@@ -871,12 +876,12 @@ then ...@@ -871,12 +876,12 @@ then
then then
if test -f /usr/lib/libthread.so -o -f /usr/lib/libthreadT.so if test -f /usr/lib/libthread.so -o -f /usr/lib/libthreadT.so
then then
LIBS="$LIBS_BEFORE_SOCKET $LIBS_AFTER_SOCKET" MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK
if expr "$CC" : ".*gcc.*" if expr "$CC" : ".*gcc.*"
then then
with_named_thread="-pthread -lsocket -lnsl" with_named_thread="-pthread -lnsl"
else else
with_named_thread="-Kthread -lsocket -lnsl" with_named_thread="-Kthread -lnsl"
fi fi
if expr "$SYSTEM_TYPE" : ".*unixware7.0.0" > /dev/null if expr "$SYSTEM_TYPE" : ".*unixware7.0.0" > /dev/null
then then
...@@ -917,8 +922,8 @@ then ...@@ -917,8 +922,8 @@ then
then then
if test -f /usr/lib/libthread.so -o -f /usr/lib/libthreadT.so if test -f /usr/lib/libthread.so -o -f /usr/lib/libthreadT.so
then then
LIBS="$LIBS_BEFORE_SOCKET $LIBS_AFTER_SOCKET" MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK
with_named_thread="-Kthread -lsocket -lnsl" with_named_thread="-Kthread -lnsl"
if expr "$SYSTEM_TYPE" : ".*unixware7.0.0" > /dev/null if expr "$SYSTEM_TYPE" : ".*unixware7.0.0" > /dev/null
then then
AC_DEFINE(HAVE_UNIXWARE7_THREADS) AC_DEFINE(HAVE_UNIXWARE7_THREADS)
...@@ -949,7 +954,7 @@ then ...@@ -949,7 +954,7 @@ then
AC_MSG_CHECKING("Siemens threads") AC_MSG_CHECKING("Siemens threads")
if test -f /usr/lib/libxnet.so -a "$SYSTEM_TYPE" = "sni-sysv4" if test -f /usr/lib/libxnet.so -a "$SYSTEM_TYPE" = "sni-sysv4"
then then
LIBS="$LIBS_BEFORE_SOCKET -lxnet $LIBS_AFTER_SOCKET" LIBS="-lxnet $LIBS"
NON_THREADED_CLIENT_LIBS="$NON_THREADED_CLIENT_LIBS -lxnet" NON_THREADED_CLIENT_LIBS="$NON_THREADED_CLIENT_LIBS -lxnet"
with_named_thread="-Kthread $LDFLAGS -lxnet" with_named_thread="-Kthread $LDFLAGS -lxnet"
LD_FLAGS="" LD_FLAGS=""
......
libmysql/Makefile.am
View file @ 9a507dc6
...@@ -80,8 +80,8 @@ do-lib-dist: ...@@ -80,8 +80,8 @@ do-lib-dist:
objs="$$objs1 $$objs2"; \ objs="$$objs1 $$objs2"; \
rm -rf $$dir; \ rm -rf $$dir; \
mkdir $$dir; \ mkdir $$dir; \
cp $$srcs $(mysysheaders) $$dir; \ $(INSTALL_DATA) $$srcs $(mysysheaders) $$dir; \
for i in $(nh); do cp ../include/$$i $$dir; done; \ for i in $(nh); do $(INSTALL_DATA) ../include/$$i $$dir; done; \
echo "# A very minimal Makefile to compile" > $$dir/Makefile; \ echo "# A very minimal Makefile to compile" > $$dir/Makefile; \
echo "# the minimized libmysql library" >> $$dir/Makefile; \ echo "# the minimized libmysql library" >> $$dir/Makefile; \
echo "# This file is autogenerated from Makefile.am" >> $$dir/Makefile; \ echo "# This file is autogenerated from Makefile.am" >> $$dir/Makefile; \
......
ltconfig
View file @ 9a507dc6
...@@ -1500,7 +1500,7 @@ else ...@@ -1500,7 +1500,7 @@ else
no_undefined_flag=' -z text' no_undefined_flag=' -z text'
# $CC -shared without GNU ld will not create a library from C++ # $CC -shared without GNU ld will not create a library from C++
# object files and a static libstdc++, better avoid it by now # 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~ 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' $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp'
hardcode_libdir_flag_spec= hardcode_libdir_flag_spec=
...@@ -1540,7 +1540,7 @@ else ...@@ -1540,7 +1540,7 @@ else
;; ;;
unixware7*) 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' runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
;; ;;
......
ltmain.sh
View file @ 9a507dc6
...@@ -809,6 +809,7 @@ compiler." ...@@ -809,6 +809,7 @@ compiler."
;; ;;
esac esac
compile_command="$nonopt" compile_command="$nonopt"
UW7_compile_command="$nonopt"
finalize_command="$nonopt" finalize_command="$nonopt"
compile_rpath= compile_rpath=
......
mysql-test/Makefile.am
View file @ 9a507dc6
...@@ -27,10 +27,10 @@ CLEANFILES = $(test_SCRIPTS) ...@@ -27,10 +27,10 @@ CLEANFILES = $(test_SCRIPTS)
dist-hook: dist-hook:
mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \ mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \
$(distdir)/std_data $(distdir)/std_data
cp -p $(srcdir)/t/*.test $(srcdir)/t/*.opt $(distdir)/t $(INSTALL_DATA) $(srcdir)/t/*.test $(srcdir)/t/*.opt $(distdir)/t
cp -p $(srcdir)/include/*.inc $(distdir)/include $(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include
cp -p $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r $(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r
cp -p $(srcdir)/std_data/*.dat $(distdir)/std_data $(INSTALL_DATA) $(srcdir)/std_data/*.dat $(distdir)/std_data
install-data-local: install-data-local:
$(mkinstalldirs) \ $(mkinstalldirs) \
......
sql-bench/Makefile.am
View file @ 9a507dc6
...@@ -37,13 +37,13 @@ dist-hook: ...@@ -37,13 +37,13 @@ dist-hook:
$(distdir)/Results $(distdir)/Results-linux \ $(distdir)/Results $(distdir)/Results-linux \
$(distdir)/Results-win32 \ $(distdir)/Results-win32 \
$(distdir)/limits $(distdir)/Comments $(distdir)/limits $(distdir)/Comments
cp -pr $(srcdir)/Data/ATIS $(distdir)/Data $(INSTALL_DATA) $(srcdir)/Data/ATIS/*.* $(distdir)/Data
cp -pr $(srcdir)/Data/Wisconsin $(distdir)/Data $(INSTALL_DATA) $(srcdir)/Data/Wisconsin/*.* $(distdir)/Data
cp -pr $(srcdir)/Results $(distdir)/ $(INSTALL_DATA) $(srcdir)/Results/*-* $(distdir)/
cp -pr $(srcdir)/Results-linux $(distdir)/ $(INSTALL_DATA) $(srcdir)/Results-linux/*-* $(distdir)/
cp -pr $(srcdir)/Results-win32 $(distdir)/ $(INSTALL_DATA) $(srcdir)/Results-win32/*-* $(distdir)/
cp -pr $(srcdir)/limits $(distdir)/ $(INSTALL_DATA) $(srcdir)/limits/*.* $(distdir)/
cp -pr $(srcdir)/Comments $(distdir)/ $(INSTALL_DATA) $(srcdir)/Comments/*.* $(distdir)/
install-data-local: install-data-local:
$(mkinstalldirs) \ $(mkinstalldirs) \
......
support-files/Makefile.am
View file @ 9a507dc6
...@@ -33,9 +33,10 @@ pkgdata_DATA = my-small.cnf \ ...@@ -33,9 +33,10 @@ pkgdata_DATA = my-small.cnf \
my-huge.cnf \ my-huge.cnf \
mysql-log-rotate \ mysql-log-rotate \
mysql-@VERSION@.spec \ mysql-@VERSION@.spec \
mysql.server \
binary-configure binary-configure
pkgdata_SCRIPTS = mysql.server
CLEANFILES = my-small.cnf \ CLEANFILES = my-small.cnf \
my-medium.cnf \ my-medium.cnf \
my-large.cnf \ my-large.cnf \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7