auto-import changelog data from mysql-3.23.36-1.src.rpm

Wed Mar 28 2001 Trond Eivind Glomsrød <teg@redhat.com>
- Make it obsolete our 6.2 PowerTools packages
- 3.23.36 bugfix release - fixes some security issues which didn't apply to
    our standard configuration
- Make "make test" part of the build process, except on IA64 (it fails
    there)
Tue Mar 20 2001 Trond Eivind Glomsrød <teg@redhat.com>
- 3.23.35 bugfix release
- Don't delete the mysql user on uninstall
Tue Mar 13 2001 Trond Eivind Glomsrød <teg@redhat.com>
- 3.23.34a bugfix release
Wed Feb 07 2001 Trond Eivind Glomsrød <teg@redhat.com>
- added readline-devel to BuildRequires:
Tue Feb 06 2001 Trond Eivind Glomsrød <teg@redhat.com>
- small i18n-fixes to initscript (action needs $)
Tue Jan 30 2001 Trond Eivind Glomsrød <teg@redhat.com>
- make it shut down and rotate logs without using mysqladmin (from #24909)
Mon Jan 29 2001 Trond Eivind Glomsrød <teg@redhat.com>
- conflict with "MySQL"
Tue Jan 23 2001 Trond Eivind Glomsrød <teg@redhat.com>
- improve gettextizing
Mon Jan 22 2001 Trond Eivind Glomsrød <teg@redhat.com>
- 3.23.32
- fix logrotate script (#24589)

.cvsignore

@@ -1 +1 @@
-mysql-3.23.32.tar.bz2
+mysql-3.23.36.tar.bz2

mysql.init

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # mysqld	This shell script takes care of starting and stopping
 #		the MySQL subsystem (mysqld).
@@ -18,43 +18,47 @@
 # Source subsystem configuration.
 [ -f /etc/sysconfig/subsys/mysqld ] && . /etc/sysconfig/subsys/mysqld
 
+
+prog="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
-	    action "Initializing MySQL database" /usr/bin/mysql_install_db
+	    action $"Initializing MySQL database: " /usr/bin/mysql_install_db
 	    ret=$?
 	    chown -R mysql.mysql /var/lib/mysql
 	    if [ $ret -ne 0 ] ; then
 	    	return $ret
 	    fi
 	fi
+	chown mysql.mysql /var/lib/mysql
+	chmod 0755 /var/lib/mysql
 	/usr/bin/safe_mysqld  --defaults-file=/etc/my.cnf >/dev/null 2>&1 &
 	ret=$?
 	if [ $ret -eq 0 ]; then
-	    action "Starting MySQL: " /bin/true
+	    action $"Starting $prog: " /bin/true
 	else
-    	    action "Starting MySQL: " /bin/false
+    	    action $"Starting $prog: " /bin/false
 	fi
 	[ $ret -eq 0 ] && touch /var/lock/subsys/mysqld
 	return $ret
 }
 
 stop(){
-        /usr/bin/mysqladmin shutdown > /dev/null 2>&1
+        /bin/kill `cat /var/run/mysqld/mysqld.pid  2> /dev/null ` > /dev/null 2>&1
-        ret=$?
-        if [ $ret -eq 0 ]; then
-            action "Stopping MySQL: " /bin/true
-        else
-            action "Stopping MySQL: " /bin/false
-        fi
 	ret=$?
+	if [ $ret -eq 0 ]; then
+	    action $"Stopping $prog: " /bin/true
+	else
+    	    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
 	return $ret
 }
-
+ 
 restart(){
     stop
     start
@@ -89,7 +93,7 @@ case "$1" in
     condrestart
     ;;
   *)
-    echo "Usage: $0 {start|stop|status|reload|condrestart|restart}"
+    echo $"Usage: $0 {start|stop|status|reload|condrestart|restart}"
     exit 1
 esac
 

mysql.spec

@@ -1,6 +1,6 @@
 Name: mysql
-Version: 3.23.32
+Version: 3.23.36
-Release: 1.7
+Release: 1
 Source0: http://www.mysql.com/Downloads/MySQL-3.23/mysql-%{version}.tar.bz2
 Source1: mysql.init
 Source2: mysql.logrotate
@@ -11,8 +11,10 @@ Summary: MySQL client program and shared library
 License: GPL/LGPL
 Group: Applications/Databases
 Prereq: /sbin/ldconfig, /sbin/install-info, grep,  fileutils, chkconfig
-BuildRequires: gperf, perl, db3-devel
+BuildRequires: gperf, perl, db3-devel, readline-devel
-Requires: glibc >= 2.2, libstdc++ >= 2.96-69
+Requires: bash >= 2
+Conflicts: MySQL
+Obsoletes: mysql-client mysql-bench mysql-perl
 
 %description
 MySQL is a multi-user, multi-threaded SQL database server.  SQL is
@@ -28,6 +30,7 @@ License: GPL
 Group: Applications/Databases
 Prereq: /sbin/chkconfig, /usr/sbin/useradd, /usr/sbin/userdel
 Requires: mysql = %{version}, sh-utils
+Conflicts: MySQL-server
 
 %description server
 MySQL is a true multi-user, multi-threaded SQL database server.  SQL is
@@ -42,6 +45,7 @@ Summary: MySQL devel
 License: LGPL
 Group: Applications/Databases
 Requires: %{name} = %{version}
+Conflicts: MySQL-devel
 
 %description devel
 MySQL is a true multi-user, multi-threaded SQL database server.  SQL is
@@ -52,7 +56,7 @@ header files that are needed for developing your own MySQL applications.
 
 
 %prep
-%setup -q
+%setup -q 
 
 %build
 
@@ -60,16 +64,18 @@ header files that are needed for developing your own MySQL applications.
 	--without-readline \
 	--enable-shared \
 	--with-extra-charsets=complex \
-	--without-bench \
+	--with-bench \
 	--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-berkeley-db
-#	--with-mysqld-ldflags=-all-static 
-#	--enable-assembler \
 
 make
+make check
+%ifnarch ia64
+make test
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -138,9 +144,6 @@ if [ $1 = 0 ] ; then
 fi
 
 %postun server
-if [ $1 = 0 ] ; then
-	/usr/sbin/userdel mysql > /dev/null 2>&1 || : 
-fi
 if [ $1 -ge 1 ]; then
     /sbin/service mysqld condrestart >/dev/null 2>&1 || :
 fi
@@ -190,17 +193,45 @@ fi
 /usr/lib/mysql/libmysqlclient*.so
 
 %changelog
-* Mon Jan 21 2001 Trond Eivind Glomsrød <teg@redhat.com>
+* Wed Mar 28 2001 Trond Eivind Glomsrød <teg@redhat.com>
-- 3.23.32
+- Make it obsolete our 6.2 PowerTools packages
-- fix logrotate script, so it doesn't return "false" if
+- 3.23.36 bugfix release - fixes some security issues
-  mysqld isn't running (#24589)
+  which didn't apply to our standard configuration
+- Make "make test" part of the build process, except on IA64
+  (it fails there)
 
-* Thu Jan 18 2001 Trond Eivind Glomsrød <teg@redhat.com>
+* Tue Mar 20 2001 Trond Eivind Glomsrød <teg@redhat.com>
-- 3.23.31 
+- 3.23.35 bugfix release
+- Don't delete the mysql user on uninstall
+
+* Tue Mar 13 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- 3.23.34a bugfix release
+
+* Wed Feb  7 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- added readline-devel to BuildRequires:
+
+* Tue Feb  6 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- small i18n-fixes to initscript (action needs $)
+
+* Tue Jan 30 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- make it shut down and rotate logs without using mysqladmin 
+  (from #24909)
+
+* Mon Jan 29 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- conflict with "MySQL"
+
+* Tue Jan 23 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- improve gettextizing
+
+* Mon Jan 22 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- 3.23.32
+- fix logrotate script (#24589)
 
 * Wed Jan 17 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- gettextize
 - move the items in Requires(post): to Requires: in preparation
   for an errata for 7.0 when 3.23.31 is released
+- 3.23.31
 
 * Tue Jan 16 2001 Trond Eivind Glomsrød <teg@redhat.com>
 - add the log file to the rpm database, and make it 0640

sources

@@ -1 +1 @@
-284f902e8248fdd0248da1ffcfc33183  mysql-3.23.32.tar.bz2
+41bab3965d6aa60b437a4f236fab1907  mysql-3.23.36.tar.bz2