diff --git a/.cvsignore b/.cvsignore index 679cc8f..dce1388 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mysql-3.23.41.tar.bz2 +mysql-3.23.49.tar.bz2 diff --git a/filter-requires-mysql.sh b/filter-requires-mysql.sh new file mode 100755 index 0000000..f430ee8 --- /dev/null +++ b/filter-requires-mysql.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +/usr/lib/rpm/find-requires $* | grep -v "perl(the" diff --git a/mysql.init b/mysql.init index 92b7627..58e0e9f 100644 --- a/mysql.init +++ b/mysql.init @@ -15,26 +15,25 @@ # Source networking configuration. . /etc/sysconfig/network -# Source subsystem configuration. -[ -f /etc/sysconfig/subsys/mysqld ] && . /etc/sysconfig/subsys/mysqld - prog="MySQL" +datadir="/var/lib/mysql" + start(){ touch /var/log/mysqld.log chown mysql.mysql /var/log/mysqld.log chmod 0640 /var/log/mysqld.log - if [ ! -d /var/lib/mysql/mysql ] ; then + if [ ! -d $datadir/mysql ] ; then action $"Initializing MySQL database: " /usr/bin/mysql_install_db ret=$? - chown -R mysql.mysql /var/lib/mysql + chown -R mysql.mysql $datadir if [ $ret -ne 0 ] ; then return $ret fi fi - chown -R mysql.mysql /var/lib/mysql - chmod 0755 /var/lib/mysql + chown -R mysql.mysql $datadir + chmod 0755 $datadir /usr/bin/safe_mysqld --defaults-file=/etc/my.cnf >/dev/null 2>&1 & ret=$? if [ $ret -eq 0 ]; then @@ -55,7 +54,7 @@ stop(){ action $"Stopping $prog: " /bin/false fi [ $ret -eq 0 ] && rm -f /var/lock/subsys/mysqld - [ $ret -eq 0 ] && rm -f /var/lib/mysql/mysql.sock + [ $ret -eq 0 ] && rm -f $datadir/mysql.sock return $ret } @@ -68,10 +67,6 @@ condrestart(){ [ -e /var/lock/subsys/mysqld ] && restart || : } -reload(){ - [ -e /var/lock/subsys/mysqld ] && mysqladmin reload -} - # See how we were called. case "$1" in start) @@ -83,9 +78,6 @@ case "$1" in status) status mysqld ;; - reload) - reload - ;; restart) restart ;; @@ -93,7 +85,7 @@ case "$1" in condrestart ;; *) - echo $"Usage: $0 {start|stop|status|reload|condrestart|restart}" + echo $"Usage: $0 {start|stop|status|condrestart|restart}" exit 1 esac diff --git a/mysql.spec b/mysql.spec index 6b90ab7..ca6f79b 100644 --- a/mysql.spec +++ b/mysql.spec @@ -1,22 +1,28 @@ Name: mysql -Version: 3.23.41 -Release: 3 +Version: 3.23.49 +Release: 0.7 Source0: http://www.mysql.com/Downloads/MySQL-3.23/mysql-%{version}.tar.bz2 Source1: mysql.init Source2: mysql.logrotate Source3: my.cnf +# Working around perl dependency checking bug in rpm FTTB. Remove later. +Source999: filter-requires-mysql.sh URL: http://www.mysql.com BuildRoot: %{_tmppath}/%{name}-%{version}-root Summary: MySQL client programs and shared library. License: GPL/LGPL Group: Applications/Databases Prereq: /sbin/ldconfig, /sbin/install-info, grep, fileutils, chkconfig -BuildRequires: gperf, perl, db3-devel, readline-devel +BuildRequires: gperf, perl, readline-devel BuildRequires: gcc-c++, ncurses-devel, zlib-devel -Requires: bash >= 2 +Requires: bash Conflicts: MySQL Obsoletes: mysql-client mysql-bench mysql-perl +# Working around perl dependency checking bug in rpm FTTB. Remove later. +%define __find_requires %{SOURCE999} + + %description MySQL is a multi-user, multi-threaded SQL database server. MySQL is a client/server implementation consisting of a server daemon (mysqld) @@ -58,7 +64,8 @@ developing MySQL applications. %build CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" -CXXFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" +CXXFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -fno-rtti -fno-exceptions" +CXX=gcc %configure --without-debug \ --without-readline \ @@ -69,7 +76,7 @@ CXXFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" --with-unix-socket-path=/var/lib/mysql/mysql.sock \ --with-mysqld-user="mysql" \ --with-extra-charsets=all \ - --disable-assember \ + --with-innodb \ %ifnarch alpha --with-berkeley-db --enable-large-files=yes --enable-largefile=yes \ %endif @@ -78,7 +85,7 @@ CXXFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" make make check -%ifnarch s390 s390x ia64 +%ifnarch s390 s390x make test %endif @@ -199,13 +206,48 @@ fi /usr/lib/mysql/libmysqlclient*.so %changelog -* Thu May 02 2002 Philip Copeland 3.23.41-3 -- Although this *IS* 3.23.41-2 we need to - slot it in between 7.2-ent/7.3 for RHN hence the - version number bump for alpha. +* Sun Feb 17 2002 Trond Eivind Glomsrød 3.23.49-1 +- 3.23.49 -* Wed Sep 12 2001 Tim Powers -- rebuild with new gcc and binutils +* Thu Feb 14 2002 Trond Eivind Glomsrød 3.23.48-2 +- work around perl dependency bug. + +* Mon Feb 11 2002 Trond Eivind Glomsrød 3.23.48-1 +- 3.23.48 + +* Thu Jan 17 2002 Trond Eivind Glomsrød 3.23.47-4 +- Use kill, not mysqladmin, to flush logs and shut down. Thus, + an admin password can be set with no problems. +- Remove reload from init script + +* Wed Jan 16 2002 Trond Eivind Glomsrød 3.23.47-3 +- remove db3-devel from buildrequires, + MySQL has had its own bundled copy since the mid thirties + +* Sun Jan 6 2002 Trond Eivind Glomsrød 3.23.47-1 +- 3.23.47 +- Don't build for alpha, toolchain immature. + +* Mon Dec 3 2001 Trond Eivind Glomsrød 3.23.46-1 +- 3.23.46 +- use -fno-rtti and -fno-exceptions, and set CXX to increase stability. + Recommended by mysql developers. + +* Sun Nov 25 2001 Trond Eivind Glomsrød 3.23.45-1 +- 3.23.45 + +* Wed Nov 14 2001 Trond Eivind Glomsrød 3.23.44-2 +- centralize definition of datadir in the initscript (#55873) + +* Fri Nov 2 2001 Trond Eivind Glomsrød 3.23.44-1 +- 3.23.44 + +* Thu Oct 4 2001 Trond Eivind Glomsrød 3.23.43-1 +- 3.23.43 + +* Mon Sep 10 2001 Trond Eivind Glomsrød 3.23.42-1 +- 3.23.42 +- reenable innodb * Tue Aug 14 2001 Trond Eivind Glomsrød 3.23.41-1 - 3.23.41 bugfix release @@ -228,7 +270,7 @@ fi - 3.23.29 - enable innodb - enable assembly again -- disable tests for now.. +- disable tests for now... * Tue May 15 2001 Trond Eivind Glomsrød - 3.23.38 diff --git a/sources b/sources index c065322..ab9b763 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0775889ab8e757ae0dac5c96437509ca mysql-3.23.41.tar.bz2 +f2cc97874a593d1bf84db21b56ee3a68 mysql-3.23.49.tar.bz2