Commit e11e35a3 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/space/pekka/ndb/version/my51
parents 850d692a 7b8f4fc6

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -1592,7 +1592,7 @@ then 
  AC_ARG_WITH([fast-mutexes],

              AC_HELP_STRING([--with-fast-mutexes], 

              [compile with fast mutexes (default is enabled)]),

              [with_fast_mutexes=$withval], [with_fast_mutexes=yes])

              [with_fast_mutexes=$withval], [with_fast_mutexes=no])

fi



if test "$with_fast_mutexes" = "yes"

server-tools/instance-manager/Makefile.am

+5 −4
Original line number Diff line number Diff line
@@ -24,9 +24,10 @@ DEFS= -DMYSQL_INSTANCE_MANAGER -DMYSQL_SERVER 
# default_options.h, generated from default_options.h.in)

# See automake/autoconf docs for details



noinst_LIBRARIES= liboptions.a libnet.a

noinst_LTLIBRARIES= liboptions.la

noinst_LIBRARIES=   libnet.a



liboptions_a_CXXFLAGS= $(CXXFLAGS) \

liboptions_la_CXXFLAGS= $(CXXFLAGS) \

	-DDEFAULT_PID_FILE_NAME="$(localstatedir)/mysqlmanager.pid" \

	-DDEFAULT_LOG_FILE_NAME="$(localstatedir)/mysqlmanager.log" \

	-DDEFAULT_SOCKET_FILE_NAME="/tmp/mysqlmanager.sock" \
@@ -35,8 +36,8 @@ liboptions_a_CXXFLAGS= $(CXXFLAGS) \ 
	-DDEFAULT_CONFIG_FILE="/etc/my.cnf" \

	-DPROTOCOL_VERSION=@PROTOCOL_VERSION@



liboptions_a_SOURCES= options.h options.cc priv.h priv.cc

liboptions_a_LIBADD= $(top_builddir)/libmysql/get_password.$(OBJEXT)

liboptions_la_SOURCES= options.h options.cc priv.h priv.cc

liboptions_la_LIBADD= $(top_builddir)/libmysql/get_password.lo



# MySQL sometimes uses symlinks to reuse code 

# All symlinked files are grouped in libnet.a

support-files/mysql.spec.sh

+2 −3
Original line number Diff line number Diff line
@@ -425,8 +425,7 @@ install -m 644 $MBD/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate. 
install -m 755 $MBD/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql



# Install embedded server library in the build root

# FIXME No libmysqld on 5.0 yet

#install -m 644 libmysqld/libmysqld.a $RBR%{_libdir}/mysql/

install -m 644 libmysqld/libmysqld.a $RBR%{_libdir}/mysql/



# Create a symlink "rcmysql", pointing to the init.script. SuSE users

# will appreciate that, as all services usually offer this.
@@ -703,7 +702,7 @@ fi 


%files embedded

%defattr(-, root, root, 0755)

# %attr(644, root, root) %{_libdir}/mysql/libmysqld.a

%attr(644, root, root) %{_libdir}/mysql/libmysqld.a



# The spec file changelog only includes changes made to the spec file

# itself - note that they must be ordered by date (important when