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 /support-files | |
| 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
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 5 |
1 files changed, 2 insertions, 3 deletions
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 |