diff --git a/.cvsignore b/.cvsignore index 43ccb21..bf0abc3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mysql-3.23.26-beta.tar.gz +mysql-3.23.32.tar.bz2 diff --git a/my.cnf b/my.cnf new file mode 100644 index 0000000..2a915fc --- /dev/null +++ b/my.cnf @@ -0,0 +1,11 @@ +[mysqld] +datadir=/var/lib/mysql +socket=/var/lib/mysql/mysql.sock + +[mysql.server] +user=mysql +basedir=/var/lib + +[safe_mysqld] +err-log=/var/log/mysqld.log +pid-file=/var/run/mysqld/mysqld.pid diff --git a/mysql.init b/mysql.init index 5ed5384..81d0983 100644 --- a/mysql.init +++ b/mysql.init @@ -3,11 +3,11 @@ # mysqld This shell script takes care of starting and stopping # the MySQL subsystem (mysqld). # -# chkconfig: - 85 15 +# chkconfig: - 78 12 # description: MySQL database server. # processname: mysqld # config: /etc/my.cnf -# pidfile: /var/run/mysqld.pid +# pidfile: /var/run/mysqld/mysqld.pid # Source function library. . /etc/rc.d/init.d/functions @@ -21,6 +21,7 @@ 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 action "Initializing MySQL database" /usr/bin/mysql_install_db ret=$? @@ -29,8 +30,7 @@ start(){ return $ret fi fi - /usr/bin/safe_mysqld --user=mysql --log=/var/log/mysqld.log \ - --pid-file=/var/run/mysqld.pid >/dev/null 2>&1 & + /usr/bin/safe_mysqld --defaults-file=/etc/my.cnf >/dev/null 2>&1 & ret=$? if [ $ret -eq 0 ]; then action "Starting MySQL: " /bin/true @@ -42,14 +42,16 @@ start(){ } stop(){ - echo -n "Shutting down MySQL server" - killproc safe_mysqld - killproc mysqld + /usr/bin/mysqladmin shutdown > /dev/null 2>&1 + ret=$? + if [ $ret -eq 0 ]; then + action "Stopping MySQL: " /bin/true + else + action "Stopping MySQL: " /bin/false + fi ret=$? [ $ret -eq 0 ] && rm -f /var/lock/subsys/mysqld [ $ret -eq 0 ] && rm -f /var/lib/mysql/mysql.sock - mysqladmin shutdown > /dev/null 2>& 1 - echo return $ret } diff --git a/mysql.spec b/mysql.spec index 86db44a..51c27f7 100644 --- a/mysql.spec +++ b/mysql.spec @@ -1,17 +1,18 @@ Name: mysql -Version: 3.23.26 -Release: 1 -Source0: http://www.mysql.com/Downloads/MySQL-3.23/mysql-%{version}-beta.tar.gz +Version: 3.23.32 +Release: 1.7 +Source0: http://www.mysql.com/Downloads/MySQL-3.23/mysql-%{version}.tar.bz2 Source1: mysql.init Source2: mysql.logrotate -Source3: safe_mysqld +Source3: my.cnf URL: http://www.mysql.com BuildRoot: %{_tmppath}/mysql-%{version}-root Summary: MySQL client program and shared library License: GPL/LGPL Group: Applications/Databases -Prereq: /sbin/ldconfig, /sbin/install-info, grep -ExcludeArch: ia64 sparc +Prereq: /sbin/ldconfig, /sbin/install-info, grep, fileutils, chkconfig +BuildRequires: gperf, perl, db3-devel +Requires: glibc >= 2.2, libstdc++ >= 2.96-69 %description MySQL is a multi-user, multi-threaded SQL database server. SQL is @@ -26,7 +27,7 @@ Summary: MySQL server License: GPL Group: Applications/Databases Prereq: /sbin/chkconfig, /usr/sbin/useradd, /usr/sbin/userdel -Requires: mysql = %{version} +Requires: mysql = %{version}, sh-utils %description server MySQL is a true multi-user, multi-threaded SQL database server. SQL is @@ -51,10 +52,10 @@ header files that are needed for developing your own MySQL applications. %prep -%setup -q -n mysql-%{version}-beta - +%setup -q %build + %configure --without-debug \ --without-readline \ --enable-shared \ @@ -62,10 +63,11 @@ header files that are needed for developing your own MySQL applications. --without-bench \ --localstatedir=/var/lib/mysql \ --with-unix-socket-path=/var/lib/mysql/mysql.sock \ - --enable-assembler \ - --with-mysqld-user="mysql" + --with-mysqld-user="mysql" \ + --with-extra-charsets=all # --with-mysqld-ldflags=-all-static +# --enable-assembler \ make @@ -73,7 +75,9 @@ make rm -rf $RPM_BUILD_ROOT %makeinstall -install -m755 %{SOURCE3} $RPM_BUILD_ROOT/usr/bin/safe_mysqld +install -m 644 include/my_config.h $RPM_BUILD_ROOT/usr/include/mysql/ +mkdir -p $RPM_BUILD_ROOT/var/log +touch $RPM_BUILD_ROOT/var/log/mysqld.log # List the installed tree for RPM package maintenance purposes. find $RPM_BUILD_ROOT -print | sed "s|^$RPM_BUILD_ROOT||" | sort > ROOTFILES @@ -83,10 +87,11 @@ rm -f $RPM_BUILD_ROOT/usr/share/mysql/mysql-log-rotate mkdir -p $RPM_BUILD_ROOT/etc/{rc.d/init.d,logrotate.d} +mkdir -p $RPM_BUILD_ROOT/var/run/mysqld install -m 0755 -d $RPM_BUILD_ROOT/var/lib/mysql install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/mysqld install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/mysqld -touch $RPM_BUILD_ROOT/etc/my.cnf +install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/etc/my.cnf rm -f $RPM_BUILD_ROOT/%{_infodir}/dir* %clean @@ -108,6 +113,7 @@ fi if [ $1 = 1 ]; then /sbin/chkconfig --add mysqld fi +/bin/chmod 0755 /var/lib/mysql %preun @@ -170,10 +176,11 @@ fi /usr/bin/mysqladmin /usr/bin/safe_mysqld /usr/libexec/* - -%config /etc/rc.d/init.d/mysqld +/etc/rc.d/init.d/mysqld +%attr(0755,mysql,mysql) %dir /var/run/mysqld %config /etc/logrotate.d/mysqld %attr(0755,mysql,mysql) %dir /var/lib/mysql +%ghost %attr(0640,mysql,mysql) /var/log/mysqld.log %files devel %defattr(-,root,root) @@ -183,10 +190,80 @@ fi /usr/lib/mysql/libmysqlclient*.so %changelog +* Mon Jan 21 2001 Trond Eivind Glomsrød +- 3.23.32 +- fix logrotate script, so it doesn't return "false" if + mysqld isn't running (#24589) + +* Thu Jan 18 2001 Trond Eivind Glomsrød +- 3.23.31 + +* Wed Jan 17 2001 Trond Eivind Glomsrød +- move the items in Requires(post): to Requires: in preparation + for an errata for 7.0 when 3.23.31 is released + +* Tue Jan 16 2001 Trond Eivind Glomsrød +- add the log file to the rpm database, and make it 0640 + (#24116) +- as above in logrotate script +- changes to the init sequence - put most of the data + in /etc/my.cnf instead of hardcoding in the init script +- use /var/run/mysqld/mysqld.pid instead of + /var/run/mysqld/pid +- use standard safe_mysqld +- shut down cleaner + +* Mon Jan 08 2001 Trond Eivind Glomsrød +- 3.23.30 +- do an explicit chmod on /var/lib/mysql in post, to avoid + any problems with broken permissons. There is a report + of rm not changing this on its own (#22989) + +* Mon Jan 01 2001 Trond Eivind Glomsrød +- bzipped source +- changed from 85 to 78 in startup, so it starts before + apache (which can use modules requiring mysql) + +* Wed Dec 27 2000 Trond Eivind Glomsrød +- 3.23.29a + +* Tue Dec 19 2000 Trond Eivind Glomsrød +- add requirement for new libstdc++, build for errata + +* Mon Dec 18 2000 Trond Eivind Glomsrød +- 3.23.29 + +* Mon Nov 27 2000 Trond Eivind Glomsrød +- 3.23.28 (gamma) +- remove old patches, as they are now upstreamed + +* Thu Nov 14 2000 Trond Eivind Glomsrød +- Add a requirement for a new glibc (#20735) +- build on IA64 + +* Wed Nov 1 2000 Trond Eivind Glomsrød +- disable more assembly + +* Wed Nov 1 2000 Jakub Jelinek +- fix mysql on SPARC (#20124) + +* Tue Oct 31 2000 Trond Eivind Glomsrød +- 3.23.27 + +* Wed Oct 25 2000 Trond Eivind Glomsrød +- add patch for fixing bogus aliasing in mysql from Jakub, + which should fix #18905 and #18620 + +* Mon Oct 23 2000 Trond Eivind Glomsrød +- check for negative niceness values, and negate it + if present (#17899) +- redefine optflags on IA32 FTTB + * Wed Oct 18 2000 Trond Eivind Glomsrød - 3.23.26, which among other fixes now uses mkstemp() instead of tempnam(). -- revert changes made yesterday, Jakub fixed the compiler +- revert changes made yesterday, the problem is now + isolated * Tue Oct 17 2000 Trond Eivind Glomsrød - use the compat C++ compiler FTTB. Argh. diff --git a/sources b/sources index 3967ce9..7967f6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b24fa6bb945d53f739b2dfa815abc992 mysql-3.23.26-beta.tar.gz +284f902e8248fdd0248da1ffcfc33183 mysql-3.23.32.tar.bz2