diff options
| author | unknown <kent@mysql.com> | 2006-03-06 13:50:52 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-03-06 13:50:52 +0100 |
| commit | f03e338a3d6317622afa90a8259160d37cff6bb8 (patch) | |
| tree | b4d4608ae6ae4deb8b4e2dd1eb1f2b66dc72c6cb | |
| parent | e9a61c577c28f0385f924f0b5766406b196ab0e5 (diff) | |
| parent | a91d0afdaa79b8e78571796079b8910dd8380fda (diff) | |
| download | mariadb-git-f03e338a3d6317622afa90a8259160d37cff6bb8.tar.gz | |
Merge
mysql-test/r/binary.result:
Auto merged
mysql-test/t/binary.test:
Auto merged
sql/field_conv.cc:
Auto merged
support-files/mysql.spec.sh:
Embedded is to be enabled in 5.1
| -rw-r--r-- | server-tools/instance-manager/Makefile.am | 9 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 5 |
2 files changed, 7 insertions, 7 deletions
diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am index 043a0336b93..3d7bfb5f4f9 100644 --- a/server-tools/instance-manager/Makefile.am +++ b/server-tools/instance-manager/Makefile.am @@ -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 diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 7bea933654a..dd8953ce02e 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -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 |