diff --git a/filter-requires-mysql.sh b/filter-requires-mysql.sh index ff04055..d5a4691 100755 --- a/filter-requires-mysql.sh +++ b/filter-requires-mysql.sh @@ -1,3 +1,3 @@ #!/bin/sh -/usr/lib/rpm/perl.req $* | grep -v "perl(the" +/usr/lib/rpm/perl.req $* | grep -v "perl(th" diff --git a/mysql.init b/mysql.init index 58e0e9f..418ec23 100644 --- a/mysql.init +++ b/mysql.init @@ -36,8 +36,21 @@ start(){ chmod 0755 $datadir /usr/bin/safe_mysqld --defaults-file=/etc/my.cnf >/dev/null 2>&1 & ret=$? + # Spin for a maximum of ten seconds waiting for the server to come up if [ $ret -eq 0 ]; then - action $"Starting $prog: " /bin/true + for x in 1 2 3 4 5 6 7 8 9 10; do + if [ -n "`/usr/bin/mysqladmin ping 2> /dev/null`" ]; then + break; + else + sleep 1; + fi + done + if !([ -n "`/usr/bin/mysqladmin ping 2> /dev/null`" ]); then + echo "Timeout error occurred trying to start MySQL Daemon." + action $"Starting $prog: " /bin/false + else + action $"Starting $prog: " /bin/true + fi else action $"Starting $prog: " /bin/false fi diff --git a/mysql.spec b/mysql.spec index 3a79249..26e8e4f 100644 --- a/mysql.spec +++ b/mysql.spec @@ -1,6 +1,6 @@ Name: mysql Version: 3.23.58 -Release: 1.9 +Release: 4 Source0: http://www.mysql.com/Downloads/MySQL-3.23/mysql-%{version}.tar.gz Source1: mysql.init Source2: mysql.logrotate @@ -12,7 +12,7 @@ Patch1: mysql-3.23.54-libdir.patch Patch2: mysql-errno.patch URL: http://www.mysql.com BuildRoot: %{_tmppath}/%{name}-%{version}-root -Summary: MySQL client programs and shared library. +Summary: MySQL client programs and shared libraries. License: GPL/LGPL Group: Applications/Databases Prereq: /sbin/ldconfig, /sbin/install-info, grep, fileutils, chkconfig @@ -22,7 +22,7 @@ BuildRequires: libtool automake autoconf Requires: bash Conflicts: MySQL Requires: perl-DBI, perl-DBD-MySQL -Obsoletes: mysql-client mysql-bench mysql-perl +Obsoletes: mysql-client mysql-perl # Working around perl dependency checking bug in rpm FTTB. Remove later. %define __perl_requires %{SOURCE999} @@ -31,7 +31,7 @@ Obsoletes: mysql-client mysql-bench mysql-perl MySQL is a multi-user, multi-threaded SQL database server. MySQL is a client/server implementation consisting of a server daemon (mysqld) and many different client programs and libraries. This package -contains the MySQL client programs, the client shared library, and +contains the MySQL client programs, the client shared libraries, and generic MySQL files. %package server @@ -63,6 +63,19 @@ MySQL is a true multi-user, multi-threaded SQL database server. This package contains the libraries and header files that are needed for developing MySQL applications. +%package bench + +Summary: MySQL benchmark scripts and data. +License: GPL/LGPL +Group: Applications/Databases +Requires: %{name} = %{version} +Conflicts: MySQL-bench + +%description bench +MySQL is a true multi-user, multi-threaded SQL database server. This +package contains benchmark scripts and data for use when benchmarking +MySQL. + %prep %setup -q @@ -86,10 +99,6 @@ CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CFLAGS -fno-rtti -fno-exceptions" export CFLAGS CXXFLAGS -#CPPFLAGS="$CFLAGS" -#export CPPFLAGS - -#configure --without-debug \ %configure \ --without-readline \ --without-debug \ @@ -99,19 +108,18 @@ export CFLAGS CXXFLAGS --localstatedir=/var/lib/mysql \ --with-unix-socket-path=/var/lib/mysql/mysql.sock \ --with-mysqld-user="mysql" \ - --with-extra-charsets=all \ + --with-extra-charsets=all \ --with-innodb \ --enable-local-infile \ --enable-large-files=yes --enable-largefile=yes \ - --with-berkeley-db-includes=%{_includedir} \ - --with-berkeley-db-libs=%{_libdir} \ + --with-berkeley-db \ --enable-thread-safe-client # Not enabling assembler make %{?_smp_mflags} make check -%ifnarch ppc alpha s390x +%ifnarch ppc64 s390x x86_64 make test %endif @@ -136,10 +144,10 @@ install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/mysqld install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/mysqld install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/etc/my.cnf rm -f $RPM_BUILD_ROOT/%{_infodir}/dir* +mv $RPM_BUILD_ROOT/usr/sql-bench $RPM_BUILD_ROOT%{_datadir}/sql-bench # Doesn't contain anything rm -f Docs/manual.ps -rm -fr $RPM_BUILD_ROOT/usr/sql-bench rm -fr $RPM_BUILD_ROOT/usr/mysql-test rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqlclient*.la rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/binary-configure @@ -263,13 +271,52 @@ fi %{_libdir}/mysql/*.a %{_libdir}/mysql/libmysqlclient*.so -%changelog -* Wed Sep 17 2003 Patrick Macdonald 3.23.58-1.9 -- upgrade to 3.23.58 for security fixes (#104501) +%files bench +%defattr(-,root,root) +%{_datadir}/sql-bench -* Wed Apr 30 2003 Patrick Macdonald 3.23.56-1.9 +%changelog +* Mon Oct 27 2003 Kim Ho 3.23.58-4 +- update mysql.init to wait (max 10 seconds) for mysql server to + start (#58372) + +* Mon Oct 27 2003 Patrick Macdonald 3.23.58-3 +- re-enable Berkeley DB support (#106832) +- re-enable ia64 testing + +* Fri Sep 19 2003 Patrick Macdonald 3.23.58-2 +- rebuilt + +* Mon Sep 15 2003 Patrick Macdonald 3.23.58-1 +- upgrade to 3.23.58 for security fix + +* Tue Aug 26 2003 Patrick Macdonald 3.23.57-2 +- rebuilt + +* Wed Jul 02 2003 Patrick Macdonald 3.23.57-1 +- revert to prior version of MySQL due to license incompatibilities + with packages that link against the client. The MySQL folks are + looking into the issue. + +* Wed Jun 18 2003 Patrick Macdonald 4.0.13-4 +- restrict test on ia64 (temporary) + +* Wed Jun 04 2003 Elliot Lee 4.0.13-3 +- rebuilt + +* Thu May 29 2003 Patrick Macdonald 4.0.13-2 +- fix filter-requires-mysql.sh with less restrictive for mysql-bench + +* Wed May 28 2003 Patrick Macdonald 4.0.13-1 +- update for MySQL 4.0 +- back-level shared libraries available in mysqlclient10 package + +* Fri May 09 2003 Patrick Macdonald 3.23.56-2 +- add sql-bench package (#90110) + +* Wed Mar 19 2003 Patrick Macdonald 3.23.56-1 - upgrade to 3.23.56 for security fixes -- remove patch for double-free (included in 3.23.56) +- remove patch for double-free (included in 3.23.56) * Tue Feb 18 2003 Patrick Macdonald 3.23.54a-11 - enable thread safe client