rpms/mysql/FC-6 mysql-info-schema.patch, NONE, 1.1 mysql-stack.patch, NONE, 1.1 .cvsignore, 1.28, 1.29 mysql-install-test.patch, 1.2, 1.3 mysql-ssl-bugs.patch, 1.1, 1.2 mysql-testing.patch, 1.7, 1.8 mysql.init, 1.19, 1.20 mysql.spec, 1.81, 1.82 sources, 1.28, 1.29 mysql-libtool.patch, 1.6, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Mar 20 01:05:55 UTC 2007


Author: tgl

Update of /cvs/dist/rpms/mysql/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv24029

Modified Files:
	.cvsignore mysql-install-test.patch mysql-ssl-bugs.patch 
	mysql-testing.patch mysql.init mysql.spec sources 
Added Files:
	mysql-info-schema.patch mysql-stack.patch 
Removed Files:
	mysql-libtool.patch 
Log Message:
Update to mysql 5.0.37.  Minor initscript and specfile fixes.
Resolves: #231838, #232604, #223713
Related: #221085

mysql-info-schema.patch:
 information_schema.result |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mysql-info-schema.patch ---
Crude workaround for upstream bug #27035 ... don't these people even run
their own regression tests before making releases?


diff -Naur mysql-5.0.37.orig/mysql-test/r/information_schema.result mysql-5.0.37/mysql-test/r/information_schema.result
--- mysql-5.0.37.orig/mysql-test/r/information_schema.result	2007-03-05 14:40:30.000000000 -0500
+++ mysql-5.0.37/mysql-test/r/information_schema.result	2007-03-12 11:48:12.000000000 -0400
@@ -1096,7 +1096,7 @@
 group by column_type order by num;
 column_type	group_concat(table_schema, '.', table_name)	num
 varchar(20)	information_schema.COLUMNS,information_schema.PROFILING	2
-varchar(7)	information_schema.PROFILING,information_schema.PROFILING,information_schema.PROFILING,information_schema.ROUTINES,information_schema.VIEWS	5
+varchar(7)	information_schema.ROUTINES,information_schema.VIEWS	2
 create table t1(f1 char(1) not null, f2 char(9) not null)
 default character set utf8;
 select CHARACTER_MAXIMUM_LENGTH, CHARACTER_OCTET_LENGTH from

mysql-stack.patch:
 mysql_priv.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mysql-stack.patch ---
Talk about silly byte-shaving ... the "stock" value does not work on s390x,
and probably not on some other platforms either.  Knock it up to twice the
pre-5.0.33 value to have some margin for future changes in compiler, glibc,
etc.  Suspect this number if "execution_constants" regression test fails.


diff -Naur mysql-5.0.33.orig/sql/mysql_priv.h mysql-5.0.33/sql/mysql_priv.h
--- mysql-5.0.33.orig/sql/mysql_priv.h	2007-01-09 07:51:48.000000000 -0500
+++ mysql-5.0.33/sql/mysql_priv.h	2007-02-09 19:06:51.000000000 -0500
@@ -154,7 +154,7 @@
  Feel free to raise this by the smallest amount you can to get the
  "execution_constants" test to pass.
  */
-#define STACK_MIN_SIZE          10788   // Abort if less stack during eval.
+#define STACK_MIN_SIZE          16384   // Abort if less stack during eval.
 
 #define STACK_MIN_SIZE_FOR_OPEN 1024*80
 #define STACK_BUFF_ALLOC	256	// For stack overrun checks


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mysql/FC-6/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	22 Nov 2006 23:09:54 -0000	1.28
+++ .cvsignore	20 Mar 2007 01:05:53 -0000	1.29
@@ -1 +1 @@
-mysql-5.0.27.tar.gz
+mysql-5.0.37.tar.gz

mysql-install-test.patch:
 README             |   11 ++++++++++-
 install_test_db.sh |   18 ++++++++----------
 2 files changed, 18 insertions(+), 11 deletions(-)

Index: mysql-install-test.patch
===================================================================
RCS file: /cvs/dist/rpms/mysql/FC-6/mysql-install-test.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mysql-install-test.patch	2 May 2006 03:37:40 -0000	1.2
+++ mysql-install-test.patch	20 Mar 2007 01:05:53 -0000	1.3
@@ -1,12 +1,12 @@
 mysql's idea of a suitable place to install the regression tests is
 /usr/mysql-test.  To relocate this to a reasonably FHS-compliant place
-like /usr/share/mysql-test, we have to hack up the paths in install_test_db
-and mysql-test-run.  This patch also improves the documentation a tad.
+like /usr/share/mysql-test, we have to hack up the paths in install_test_db.
+This patch also improves the documentation a tad.
 
 
-diff -Naur mysql-5.0.21.orig/mysql-test/README mysql-5.0.21/mysql-test/README
---- mysql-5.0.21.orig/mysql-test/README	2006-04-26 14:31:03.000000000 -0400
-+++ mysql-5.0.21/mysql-test/README	2006-05-01 20:58:04.000000000 -0400
+diff -Naur mysql-5.0.33.orig/mysql-test/README mysql-5.0.33/mysql-test/README
+--- mysql-5.0.33.orig/mysql-test/README	2007-01-09 07:51:08.000000000 -0500
++++ mysql-5.0.33/mysql-test/README	2007-02-09 12:27:08.000000000 -0500
 @@ -6,6 +6,14 @@
  actually have a co-existing MySQL installation. The tests will not
  conflict with it.
@@ -32,34 +32,35 @@
  
  
  You can create your own test cases. To create a test case, create a new
-diff -Naur mysql-5.0.21.orig/mysql-test/install_test_db.sh mysql-5.0.21/mysql-test/install_test_db.sh
---- mysql-5.0.21.orig/mysql-test/install_test_db.sh	2006-04-26 14:31:03.000000000 -0400
-+++ mysql-5.0.21/mysql-test/install_test_db.sh	2006-05-01 20:56:05.000000000 -0400
-@@ -9,17 +9,17 @@
-   shift 1
+diff -Naur mysql-5.0.33.orig/mysql-test/install_test_db.sh mysql-5.0.33/mysql-test/install_test_db.sh
+--- mysql-5.0.33.orig/mysql-test/install_test_db.sh	2007-01-09 07:51:07.000000000 -0500
++++ mysql-5.0.33/mysql-test/install_test_db.sh	2007-02-09 12:32:00.000000000 -0500
+@@ -14,18 +14,15 @@
+   libexecdir=../libexec
  
    # Check if it's a binary distribution or a 'make install'
 -  if test -x ../libexec/mysqld
 +  if test -x /usr/libexec/mysqld
    then
 -    execdir=../libexec
+-  elif test -x ../../sbin/mysqld  # RPM installation
+-  then
+-    execdir=../../sbin
+-    bindir=../../bin
+-    scriptdir=../../bin
+-    libexecdir=../../libexec
 +    execdir=/usr/libexec
    else
 -    execdir=../bin
 +    execdir=/usr/bin
    fi
--  bindir=../bin
 +  bindir=/usr/bin
-   BINARY_DIST=1
-   fix_bin=mysql-test
--  scriptdir=../bin
--  libexecdir=../libexec
 +  scriptdir=/usr/bin
 +  libexecdir=/usr/libexec
+   fix_bin=mysql-test
  else
    execdir=../sql
-   bindir=../client
-@@ -75,7 +75,8 @@
+@@ -82,7 +79,8 @@
  
  #for error messages
  if [ x$BINARY_DIST = x1 ] ; then
@@ -69,15 +70,3 @@
  else
  basedir=.
  EXTRA_ARG="--language=../sql/share/english/ --character-sets-dir=../sql/share/charsets/"
-diff -Naur mysql-5.0.21.orig/mysql-test/mysql-test-run.sh mysql-5.0.21/mysql-test/mysql-test-run.sh
---- mysql-5.0.21.orig/mysql-test/mysql-test-run.sh	2006-04-26 14:31:05.000000000 -0400
-+++ mysql-5.0.21/mysql-test/mysql-test-run.sh	2006-05-01 20:56:05.000000000 -0400
-@@ -740,6 +740,8 @@
-  # currently all binaries are in "bin", for a MySQL AB packaging
-  # some are in "tests".
- 
-+ BASEDIR="/usr"
-+
-  if test -x "$BASEDIR/libexec/mysqld"
-  then
-    MYSQLD="$VALGRIND $BASEDIR/libexec/mysqld"

mysql-ssl-bugs.patch:
 client.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: mysql-ssl-bugs.patch
===================================================================
RCS file: /cvs/dist/rpms/mysql/FC-6/mysql-ssl-bugs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mysql-ssl-bugs.patch	22 Nov 2006 23:09:54 -0000	1.1
+++ mysql-ssl-bugs.patch	20 Mar 2007 01:05:53 -0000	1.2
@@ -1,22 +1,11 @@
-Workarounds for recently-introduced SSL breakage, filed as upstream bugs
-#24121, #24148, and #24157.
+Workaround for recently-introduced SSL breakage, filed as upstream bug
+#24121 (why is this still not fixed in 5.0.37?)
 
-I believe the client.c fix is actually correct.
 
-The viossl.c patch is just a crude reversion to the 5.0.22 approach to work
-around brain death in close_connection().  I don't know the mysql code well
-enough to venture changing the locking logic in close_connection(), though.
-
-Also, change openssl_1 test to agree with the test certificate included in the
-distribution.  And in viosslfactories.c, suppress ERR_print_errors_fp which
-gives system-dependent error messages, since that breaks the openssl_1 test
-(which has evidently only been tested with yassl, if at all).
-
-
-diff -Naur mysql-5.0.27.orig/sql-common/client.c mysql-5.0.27/sql-common/client.c
---- mysql-5.0.27.orig/sql-common/client.c	2006-10-20 20:22:26.000000000 -0400
-+++ mysql-5.0.27/sql-common/client.c	2006-11-08 19:20:49.000000000 -0500
-@@ -2949,7 +2949,7 @@
+diff -Naur mysql-5.0.33.orig/sql-common/client.c mysql-5.0.33/sql-common/client.c
+--- mysql-5.0.33.orig/sql-common/client.c	2007-01-09 07:51:07.000000000 -0500
++++ mysql-5.0.33/sql-common/client.c	2007-02-09 12:36:17.000000000 -0500
+@@ -3017,7 +3017,7 @@
      mysql->reconnect= *(my_bool *) arg;
      break;
    case MYSQL_OPT_SSL_VERIFY_SERVER_CERT:
@@ -25,77 +14,3 @@
        mysql->options.client_flag|= CLIENT_SSL_VERIFY_SERVER_CERT;
      else
        mysql->options.client_flag&= ~CLIENT_SSL_VERIFY_SERVER_CERT;
-diff -Naur mysql-5.0.27.orig/vio/viossl.c mysql-5.0.27/vio/viossl.c
---- mysql-5.0.27.orig/vio/viossl.c	2006-10-20 20:23:11.000000000 -0400
-+++ mysql-5.0.27/vio/viossl.c	2006-11-09 13:57:32.000000000 -0500
-@@ -119,19 +119,10 @@
- 
-   if (ssl)
-   {
--    switch ((r= SSL_shutdown(ssl)))
--    {
--    case 1: /* Shutdown successful */
--      break;
--    case 0: /* Shutdown not yet finished, call it again */
--      if ((r= SSL_shutdown(ssl) >= 0))
--        break;
--      /* Fallthrough */
--    default: /* Shutdown failed */
-+    r = SSL_shutdown(ssl);
-+    if (r < 0)
-       DBUG_PRINT("vio_error", ("SSL_shutdown() failed, error: %s",
-                                SSL_get_error(ssl, r)));
--      break;
--    }
-     SSL_free(ssl);
-     vio->ssl_arg= 0;
-   }
-diff -Naur mysql-5.0.27.orig/mysql-test/r/openssl_1.result mysql-5.0.27/mysql-test/r/openssl_1.result
---- mysql-5.0.27.orig/mysql-test/r/openssl_1.result	2006-10-20 20:36:44.000000000 -0400
-+++ mysql-5.0.27/mysql-test/r/openssl_1.result	2006-11-09 15:11:47.000000000 -0500
-@@ -3,8 +3,8 @@
- insert into t1 values (5);
- grant select on test.* to ssl_user1 at localhost require SSL;
- grant select on test.* to ssl_user2 at localhost require cipher "DHE-RSA-AES256-SHA";
--grant select on test.* to ssl_user3 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";
--grant select on test.* to ssl_user4 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";
-+grant select on test.* to ssl_user3 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com";
-+grant select on test.* to ssl_user4 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";
- grant select on test.* to ssl_user5 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx";
- flush privileges;
- connect(localhost,ssl_user5,,test,MASTER_PORT,MASTER_SOCKET);
-diff -Naur mysql-5.0.27.orig/mysql-test/t/openssl_1.test mysql-5.0.27/mysql-test/t/openssl_1.test
---- mysql-5.0.27.orig/mysql-test/t/openssl_1.test	2006-10-20 20:36:43.000000000 -0400
-+++ mysql-5.0.27/mysql-test/t/openssl_1.test	2006-11-09 15:10:29.000000000 -0500
-@@ -10,8 +10,8 @@
- 
- grant select on test.* to ssl_user1 at localhost require SSL;
- grant select on test.* to ssl_user2 at localhost require cipher "DHE-RSA-AES256-SHA";
--grant select on test.* to ssl_user3 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";
--grant select on test.* to ssl_user4 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";
-+grant select on test.* to ssl_user3 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com";
-+grant select on test.* to ssl_user4 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";
- grant select on test.* to ssl_user5 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx";
- flush privileges;
- 
-diff -Naur mysql-5.0.27.orig/vio/viosslfactories.c mysql-5.0.27/vio/viosslfactories.c
---- mysql-5.0.27.orig/vio/viosslfactories.c	2006-10-20 20:22:39.000000000 -0400
-+++ mysql-5.0.27/vio/viosslfactories.c	2006-11-09 16:02:14.000000000 -0500
-@@ -88,7 +88,7 @@
-       DBUG_PRINT("error",("unable to get certificate from '%s'\n", cert_file));
-       /* FIX stderr */
-       fprintf(stderr,"Error when connection to server using SSL:");
--      ERR_print_errors_fp(stderr);
-+      DBUG_EXECUTE("error",ERR_print_errors_fp(stderr););
-       fprintf(stderr,"Unable to get certificate from '%s'\n", cert_file);
-       fflush(stderr);
-       DBUG_RETURN(1);
-@@ -102,7 +102,7 @@
-       DBUG_PRINT("error", ("unable to get private key from '%s'\n", key_file));
-       /* FIX stderr */
-       fprintf(stderr,"Error when connection to server using SSL:");
--      ERR_print_errors_fp(stderr);
-+      DBUG_EXECUTE("error",ERR_print_errors_fp(stderr););
-       fprintf(stderr,"Unable to get private key from '%s'\n", key_file);
-       fflush(stderr);
-       DBUG_RETURN(1);

mysql-testing.patch:
 Makefile.am                   |    4 ++--
 mysql-test/lib/mtr_process.pl |    3 +++
 mysql-test/mysql-test-run.pl  |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

Index: mysql-testing.patch
===================================================================
RCS file: /cvs/dist/rpms/mysql/FC-6/mysql-testing.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mysql-testing.patch	10 Jun 2006 17:43:55 -0000	1.7
+++ mysql-testing.patch	20 Mar 2007 01:05:53 -0000	1.8
@@ -1,68 +1,50 @@
-This patch is needed to improve the probability that the MySQL tests pass
-in Red Hat's build environment.  The 32-bit and 64-bit variants of a single
-architecture may be built on the same machine at the same time, so we have
-to ensure that the tests use different port numbers on each arch, else they
-will interfere with each other.  Also, it's been observed that sometimes
-the build environment fails to kill a test mysql daemon when a build is
-stopped early due to build failure on another machine.  To ensure subsequent
-tests can succeed, kill off any such daemons.
+Hack the top-level Makefile to enable the openssl regression tests.
+(Why doesn't this happen automatically given the configure option??)
 
-We also have to hack the top-level Makefile to enable the openssl regression
-tests.  (Why doesn't this happen automatically given the configure option??)
+Also, tweak the Perl test script so that the mysqld daemon gets detached
+from the calling terminal session.  Without this, the ssl_des test hangs up
+because OpenSSL tries to read a PEM key from /dev/tty.
 
-Note: keep an eye on which version of "mysql-test-run" gets invoked by
-the "make test" target.  In the 4.1 branch this is now defaulting to the
-perl script, but 5.0 is not (yet?) doing that; they also seem to be fooling
-with a C-code version.  Besides this patch, mysql-libtool.patch
-would need to be changed to use either one.
 
-
-diff -Naur mysql-5.0.22.orig/Makefile.am mysql-5.0.22/Makefile.am
---- mysql-5.0.22.orig/Makefile.am	2006-05-25 04:56:41.000000000 -0400
-+++ mysql-5.0.22/Makefile.am	2006-06-10 13:13:34.000000000 -0400
-@@ -106,8 +106,8 @@
+diff -Naur mysql-5.0.37.orig/Makefile.am mysql-5.0.37/Makefile.am
+--- mysql-5.0.37.orig/Makefile.am	2007-03-05 14:21:11.000000000 -0500
++++ mysql-5.0.37/Makefile.am	2007-03-12 11:19:05.000000000 -0400
+@@ -124,11 +124,11 @@
  
- test:
+ test-ps:
  	cd mysql-test ; \
--	./mysql-test-run && \
--	./mysql-test-run --ps-protocol
-+	./mysql-test-run --with-openssl && \
-+	./mysql-test-run --ps-protocol --with-openssl
- 
- test-force:
- 	cd mysql-test; \
-diff -Naur mysql-5.0.22.orig/mysql-test/mysql-test-run.sh mysql-5.0.22/mysql-test/mysql-test-run.sh
---- mysql-5.0.22.orig/mysql-test/mysql-test-run.sh	2006-05-25 04:56:49.000000000 -0400
-+++ mysql-5.0.22/mysql-test/mysql-test-run.sh	2006-06-10 13:36:32.000000000 -0400
-@@ -252,6 +252,16 @@
- # 5.1 test run, even if different MTR_BUILD_THREAD is used. This means
- # all port numbers might not be used in this version of the script.
- #
-+# hack to allow 32- and 64-bit tests to run concurrently on same build machine
-+case `uname -m` in
-+  ppc64 | s390x | x86_64)
-+    MTR_BUILD_THREAD=7
-+    ;;
-+  *)
-+    MTR_BUILD_THREAD=11
-+    ;;
-+esac
-+
- if [ -n "$MTR_BUILD_THREAD" ] ; then
-   MASTER_MYPORT=`expr $MTR_BUILD_THREAD '*' 10 + 10000`
-   MYSQL_MANAGER_PORT=`expr $MASTER_MYPORT + 2`
-@@ -265,6 +275,14 @@
-   echo "Using NDBCLUSTER_PORT    = $NDBCLUSTER_PORT"
- fi
- 
-+#
-+# If a previous build attempt failed it's possible that mysql daemons
-+# launched by previous run of this script are still hanging around.
-+# Kill 'em so we can re-use the ports.
-+#
-+ps auxww | grep "/sql/mysqld .*port=$MASTER_MYPORT" | awk '{print $2}' | xargs kill
-+ps auxww | grep "/sql/mysqld .*port=$SLAVE_MYPORT" | awk '{print $2}' | xargs kill
+-	@PERL@ ./mysql-test-run.pl $(force) --ps-protocol
++	@PERL@ ./mysql-test-run.pl $(force) --ssl --ps-protocol
+ 
+ test-ns:
+ 	cd mysql-test ; \
+-	@PERL@ ./mysql-test-run.pl $(force)
++	@PERL@ ./mysql-test-run.pl $(force) --ssl
+ 
+ test:	test-ns test-ps
+ 
+diff -Naur mysql-5.0.37.orig/mysql-test/lib/mtr_process.pl mysql-5.0.37/mysql-test/lib/mtr_process.pl
+--- mysql-5.0.37.orig/mysql-test/lib/mtr_process.pl	2007-03-05 14:40:33.000000000 -0500
++++ mysql-5.0.37/mysql-test/lib/mtr_process.pl	2007-03-12 11:17:52.000000000 -0400
+@@ -161,6 +161,9 @@
+       # became a deamon as well, and was hard to kill ;-)
+       # Need to catch SIGCHLD and do waitpid or something instead......
+ 
++      # dunno, it works for me ...
++      POSIX::setsid();
 +
- NO_SLAVE=0
- USER_TEST=
- FAILED_CASES=
+       $SIG{INT}= 'DEFAULT';         # Parent do some stuff, we don't
+ 
+       my $log_file_open_mode = '>';
+diff -Naur mysql-5.0.37.orig/mysql-test/mysql-test-run.pl mysql-5.0.37/mysql-test/mysql-test-run.pl
+--- mysql-5.0.37.orig/mysql-test/mysql-test-run.pl	2007-03-05 14:21:11.000000000 -0500
++++ mysql-5.0.37/mysql-test/mysql-test-run.pl	2007-03-12 11:17:52.000000000 -0400
+@@ -3906,7 +3906,7 @@
+ 
+   if ( defined $exe )
+   {
+-    $pid= mtr_spawn($exe, $args, "",
++    $pid= mtr_spawn($exe, $args, '/dev/null',
+ 		    $mysqld->{'path_myerr'},
+ 		    $mysqld->{'path_myerr'},
+ 		    "",


Index: mysql.init
===================================================================
RCS file: /cvs/dist/rpms/mysql/FC-6/mysql.init,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mysql.init	22 Nov 2006 23:09:54 -0000	1.19
+++ mysql.init	20 Mar 2007 01:05:53 -0000	1.20
@@ -65,7 +65,7 @@
 		return $ret
 	    fi
 	fi
-	chown -R mysql:mysql "$datadir"
+	chown mysql:mysql "$datadir"
 	chmod 0755 "$datadir"
 	# The reason for explicitly specifying --pid-file is that there may
 	# be no such entry in my.cnf, and the default behavior will be to not


Index: mysql.spec
===================================================================
RCS file: /cvs/dist/rpms/mysql/FC-6/mysql.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- mysql.spec	22 Nov 2006 23:09:54 -0000	1.81
+++ mysql.spec	20 Mar 2007 01:05:53 -0000	1.82
@@ -1,7 +1,7 @@
 Name: mysql
-Version: 5.0.27
+Version: 5.0.37
 Release: 1%{?dist}
-Summary: MySQL client programs and shared libraries.
+Summary: MySQL client programs and shared libraries
 License: GPL
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -18,7 +18,7 @@
 Source999: filter-requires-mysql.sh 
 Patch1: mysql-libdir.patch
 Patch2: mysql-errno.patch
-Patch3: mysql-libtool.patch
+Patch3: mysql-stack.patch
 Patch4: mysql-testing.patch
 Patch5: mysql-no-atomic.patch
 Patch6: mysql-rpl_ddl.patch
@@ -26,17 +26,19 @@
 Patch8: mysql-install-test.patch
 Patch9: mysql-bdb-link.patch
 Patch10: mysql-ssl-bugs.patch
+Patch11: mysql-info-schema.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Prereq: /sbin/ldconfig, /sbin/install-info, grep, fileutils, chkconfig
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gperf, perl, readline-devel, openssl-devel
 BuildRequires: gcc-c++, ncurses-devel, zlib-devel
 BuildRequires: libtool automake autoconf
+# make test requires time
+BuildRequires: time
+
+Prereq: /sbin/ldconfig, /sbin/install-info, grep, fileutils, chkconfig
 Requires: bash
 Conflicts: MySQL
 Obsoletes: mysql-client mysql-perl
-# make test requires time
-BuildRequires: time
 
 # Working around perl dependency checking bug in rpm FTTB. Remove later.
 %define __perl_requires %{SOURCE999}
@@ -50,7 +52,7 @@
 
 %package server
 
-Summary: The MySQL server and related files.
+Summary: The MySQL server and related files
 License: GPL
 Group: Applications/Databases
 Prereq: /sbin/chkconfig, /usr/sbin/useradd
@@ -67,7 +69,7 @@
 
 %package devel
 
-Summary: Files for development of MySQL applications.
+Summary: Files for development of MySQL applications
 License: GPL
 Group: Applications/Databases
 Requires: %{name} = %{version}-%{release}
@@ -81,7 +83,7 @@
 
 %package bench
 
-Summary: MySQL benchmark scripts and data.
+Summary: MySQL benchmark scripts and data
 License: GPL
 Group: Applications/Databases
 Requires: %{name} = %{version}-%{release}
@@ -94,7 +96,7 @@
 
 %package test
 
-Summary: The test suite distributed with MySQL.
+Summary: The test suite distributed with MySQL
 License: GPL
 Group: Applications/Databases
 Requires: %{name} = %{version}-%{release}
@@ -118,6 +120,7 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 libtoolize --force
 aclocal
@@ -168,6 +171,17 @@
 make check
 
 %if %runselftest
+  # hack to let 32- and 64-bit tests run concurrently on same build machine
+  case `uname -m` in
+    ppc64 | s390x | x86_64)
+      MTR_BUILD_THREAD=7
+      ;;
+    *)
+      MTR_BUILD_THREAD=11
+      ;;
+  esac
+  export MTR_BUILD_THREAD
+
   make test
 %endif
 
@@ -212,6 +226,7 @@
 rm -f ${RPM_BUILD_ROOT}%{_bindir}/comp_err
 rm -f ${RPM_BUILD_ROOT}%{_bindir}/make_win_binary_distribution
 rm -f ${RPM_BUILD_ROOT}%{_bindir}/make_win_src_distribution
+rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/make_win_bin_dist.1*
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqlclient*.la
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/binary-configure
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/make_binary_distribution
@@ -250,7 +265,7 @@
 
 %preun
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/mysql.info.gz %{_infodir}/dir
+    /sbin/install-info --delete %{_infodir}/mysql.info.gz %{_infodir}/dir || :
 fi
 
 %preun server
@@ -383,16 +398,36 @@
 %{_mandir}/man1/mysql_zap.1*
 %{_mandir}/man1/mysqlbinlog.1.gz
 %{_mandir}/man1/mysqlcheck.1.gz
-%{_mandir}/man1/mysqld.1*
 %{_mandir}/man1/mysqld_multi.1*
 %{_mandir}/man1/mysqld_safe.1*
 %{_mandir}/man1/mysqlhotcopy.1.gz
 %{_mandir}/man1/mysqlimport.1.gz
 %{_mandir}/man1/mysqlman.1.gz
-%{_mandir}/man1/mysqlmanager.1.gz
 %{_mandir}/man1/perror.1*
 %{_mandir}/man1/replace.1*
 %{_mandir}/man1/safe_mysqld.1*
+%{_mandir}/man1/my_print_defaults.1*
+%{_mandir}/man1/mysql_tzinfo_to_sql.1*
+%{_mandir}/man1/mysql_install_db.1*
+%{_mandir}/man1/ndb_config.1*
+%{_mandir}/man1/ndb_cpcd.1*
+%{_mandir}/man1/ndb_delete_all.1*
+%{_mandir}/man1/ndb_desc.1*
+%{_mandir}/man1/ndb_drop_index.1*
+%{_mandir}/man1/ndb_drop_table.1*
+%{_mandir}/man1/ndb_error_reporter.1*
+%{_mandir}/man1/ndb_mgm.1*
+%{_mandir}/man1/ndb_mgmd.1*
+%{_mandir}/man1/ndb_print_backup_file.1*
+%{_mandir}/man1/ndb_print_schema_file.1*
+%{_mandir}/man1/ndb_print_sys_file.1*
+%{_mandir}/man1/ndb_restore.1*
+%{_mandir}/man1/ndb_select_all.1*
+%{_mandir}/man1/ndb_select_count.1*
+%{_mandir}/man1/ndb_show_tables.1*
+%{_mandir}/man1/ndb_size.pl.1*
+%{_mandir}/man1/ndb_waiter.1*
+%{_mandir}/man1/ndbd.1*
 %{_mandir}/man8/mysqld.8*
 %{_mandir}/man8/mysqlmanager.8*
 
@@ -422,6 +457,14 @@
 %attr(-,mysql,mysql) %{_datadir}/mysql-test
 
 %changelog
+* Mon Mar 19 2007 Tom Lane <tgl at redhat.com> 5.0.37-1.fc6
+- Update to MySQL 5.0.37 (see CVE-2007-1420)
+Resolves: #231838, #232604
+- Don't chmod -R the entire database directory tree on every startup
+Related: #221085
+- Fix unsafe use of install-info
+Resolves: #223713
+
 * Wed Nov 22 2006 Tom Lane <tgl at redhat.com> 5.0.27-1.fc6
 - Update to MySQL 5.0.27 (see CVE-2006-4031, CVE-2006-4226, CVE-2006-4227)
 Resolves: #202675, #203428, #203434, #208641
@@ -707,178 +750,178 @@
 * Tue Nov 12 2002 Florian La Roche <Florian.LaRoche at redhat.de>
 - do not prereq userdel, not used at all
 
-* Mon Sep  9 2002 Trond Eivind Glomsrød <teg at redhat.com> 3.23.52-4
+* Mon Sep  9 2002 Trond Eivind Glomsrd <teg at redhat.com> 3.23.52-4
 - Use %%{_libdir}
 - Add patch for x86-64
 
 * Wed Sep  4 2002 Jakub Jelinek <jakub at redhat.com> 3.23.52-3
 - rebuilt with gcc-3.2-7
 
-* Thu Aug 29 2002 Trond Eivind Glomsrød <teg at redhat.com> 3.23.52-2
+* Thu Aug 29 2002 Trond Eivind Glomsrd <teg at redhat.com> 3.23.52-2
 - Add --enable-local-infile to configure - a new option
   which doesn't default to the old behaviour (#72885)
 
-* Fri Aug 23 2002 Trond Eivind Glomsrød <teg at redhat.com> 3.23.52-1
+* Fri Aug 23 2002 Trond Eivind Glomsrd <teg at redhat.com> 3.23.52-1
 - 3.23.52. Fixes a minor security problem, various bugfixes.
 
 * Sat Aug 10 2002 Elliot Lee <sopwith at redhat.com> 3.23.51-5
 - rebuilt with gcc-3.2 (we hope)
 
-* Mon Jul 22 2002 Trond Eivind Glomsrød <teg at redhat.com> 3.23.51-4
+* Mon Jul 22 2002 Trond Eivind Glomsrd <teg at redhat.com> 3.23.51-4
 - rebuild
 
-* Thu Jul 18 2002 Trond Eivind Glomsrød <teg at redhat.com> 3.23.51-3
+* Thu Jul 18 2002 Trond Eivind Glomsrd <teg at redhat.com> 3.23.51-3
 - Fix #63543 and #63542 
 
-* Thu Jul 11 2002 Trond Eivind Glomsrød <teg at redhat.com> 3.23.51-2
+* Thu Jul 11 2002 Trond Eivind Glomsrd <teg at redhat.com> 3.23.51-2
 - Turn off bdb on PPC(#68591)
 - Turn off the assembly optimizations, for safety. 
 
-* Wed Jun 26 2002 Trond Eivind Glomsrød <teg at redhat.com> 3.23.51-1
+* Wed Jun 26 2002 Trond Eivind Glomsrd <teg at redhat.com> 3.23.51-1
 - Work around annoying auto* thinking this is a crosscompile
 - 3.23.51
 
 * Fri Jun 21 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Mon Jun 10 2002 Trond Eivind Glomsrød <teg at redhat.com> 3.23.50-2
+* Mon Jun 10 2002 Trond Eivind Glomsrd <teg at redhat.com> 3.23.50-2
 - Add dependency on perl-DBI and perl-DBD-MySQL (#66349)
 
-* Thu May 30 2002 Trond Eivind Glomsrød <teg at redhat.com> 3.23.50-1
+* Thu May 30 2002 Trond Eivind Glomsrd <teg at redhat.com> 3.23.50-1
 - 3.23.50
 
 * Thu May 23 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Mon May 13 2002 Trond Eivind Glomsrød <teg at redhat.com> 3.23.49-4
+* Mon May 13 2002 Trond Eivind Glomsrd <teg at redhat.com> 3.23.49-4
 - Rebuild
 - Don't set CXX to gcc, it doesn't work anymore
 - Exclude Alpha
 
-* Mon Apr  8 2002 Trond Eivind Glomsrød <teg at redhat.com> 3.23.49-3
+* Mon Apr  8 2002 Trond Eivind Glomsrd <teg at redhat.com> 3.23.49-3
 - Add the various .cnf examples as doc files to mysql-server (#60349)
 - Don't include manual.ps, it's just 200 bytes with a URL inside (#60349)
 - Don't include random files in /usr/share/mysql (#60349)
 - langify (#60349)
 
-* Thu Feb 21 2002 Trond Eivind Glomsrød <teg at redhat.com> 3.23.49-2
+* Thu Feb 21 2002 Trond Eivind Glomsrd <teg at redhat.com> 3.23.49-2
 - Rebuild
 
-* Sun Feb 17 2002 Trond Eivind Glomsrød <teg at redhat.com> 3.23.49-1
+* Sun Feb 17 2002 Trond Eivind Glomsrd <teg at redhat.com> 3.23.49-1
 - 3.23.49
 
-* Thu Feb 14 2002 Trond Eivind Glomsrød <teg at redhat.com> 3.23.48-2
+* Thu Feb 14 2002 Trond Eivind Glomsrd <teg at redhat.com> 3.23.48-2
 - work around perl dependency bug.
 
-* Mon Feb 11 2002 Trond Eivind Glomsrød <teg at redhat.com> 3.23.48-1
+* Mon Feb 11 2002 Trond Eivind Glomsrd <teg at redhat.com> 3.23.48-1
 - 3.23.48
 
-* Thu Jan 17 2002 Trond Eivind Glomsrød <teg at redhat.com> 3.23.47-4
+* Thu Jan 17 2002 Trond Eivind Glomsrd <teg at redhat.com> 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 <teg at redhat.com> 3.23.47-3
+* Wed Jan 16 2002 Trond Eivind Glomsrd <teg at redhat.com> 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 <teg at redhat.com> 3.23.47-1
+* Sun Jan  6 2002 Trond Eivind Glomsrd <teg at redhat.com> 3.23.47-1
 - 3.23.47
 - Don't build for alpha, toolchain immature.
 
-* Mon Dec  3 2001 Trond Eivind Glomsrød <teg at redhat.com> 3.23.46-1
+* Mon Dec  3 2001 Trond Eivind Glomsrd <teg at redhat.com> 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 <teg at redhat.com> 3.23.45-1
+* Sun Nov 25 2001 Trond Eivind Glomsrd <teg at redhat.com> 3.23.45-1
 - 3.23.45
 
-* Wed Nov 14 2001 Trond Eivind Glomsrød <teg at redhat.com> 3.23.44-2
+* Wed Nov 14 2001 Trond Eivind Glomsrd <teg at redhat.com> 3.23.44-2
 - centralize definition of datadir in the initscript (#55873)
 
-* Fri Nov  2 2001 Trond Eivind Glomsrød <teg at redhat.com> 3.23.44-1
+* Fri Nov  2 2001 Trond Eivind Glomsrd <teg at redhat.com> 3.23.44-1
 - 3.23.44
 
-* Thu Oct  4 2001 Trond Eivind Glomsrød <teg at redhat.com> 3.23.43-1
+* Thu Oct  4 2001 Trond Eivind Glomsrd <teg at redhat.com> 3.23.43-1
 - 3.23.43
 
-* Mon Sep 10 2001 Trond Eivind Glomsrød <teg at redhat.com> 3.23.42-1
+* Mon Sep 10 2001 Trond Eivind Glomsrd <teg at redhat.com> 3.23.42-1
 - 3.23.42
 - reenable innodb
 
-* Tue Aug 14 2001 Trond Eivind Glomsrød <teg at redhat.com> 3.23.41-1
+* Tue Aug 14 2001 Trond Eivind Glomsrd <teg at redhat.com> 3.23.41-1
 - 3.23.41 bugfix release
 - disable innodb, to avoid the broken updates
 - Use "mysqladmin flush_logs" instead of kill -HUP in logrotate 
   script (#51711)
 
-* Sat Jul 21 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Sat Jul 21 2001 Trond Eivind Glomsrd <teg at redhat.com>
 - 3.23.40, bugfix release
 - Add zlib-devel to buildrequires:
 
-* Fri Jul 20 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Fri Jul 20 2001 Trond Eivind Glomsrd <teg at redhat.com>
 - BuildRequires-tweaking
 
-* Thu Jun 28 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Thu Jun 28 2001 Trond Eivind Glomsrd <teg at redhat.com>
 - Reenable test, but don't run them for s390, s390x or ia64
 - Make /etc/my.cnf config(noplace). Same for /etc/logrotate.d/mysqld
 
-* Thu Jun 14 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Thu Jun 14 2001 Trond Eivind Glomsrd <teg at redhat.com>
 - 3.23.29
 - enable innodb
 - enable assembly again
 - disable tests for now...
 
-* Tue May 15 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Tue May 15 2001 Trond Eivind Glomsrd <teg at redhat.com>
 - 3.23.38
 - Don't use BDB on Alpha - no fast mutexes
 
-* Tue Apr 24 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Tue Apr 24 2001 Trond Eivind Glomsrd <teg at redhat.com>
 - 3.23.37
 - Add _GNU_SOURCE to the compile flags
 
-* Wed Mar 28 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Wed Mar 28 2001 Trond Eivind Glomsrd <teg at 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 at redhat.com>
+* Tue Mar 20 2001 Trond Eivind Glomsrd <teg at redhat.com>
 - 3.23.35 bugfix release
 - Don't delete the mysql user on uninstall
 
-* Tue Mar 13 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Tue Mar 13 2001 Trond Eivind Glomsrd <teg at redhat.com>
 - 3.23.34a bugfix release
 
-* Wed Feb  7 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Wed Feb  7 2001 Trond Eivind Glomsrd <teg at redhat.com>
 - added readline-devel to BuildRequires:
 
-* Tue Feb  6 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Tue Feb  6 2001 Trond Eivind Glomsrd <teg at redhat.com>
 - small i18n-fixes to initscript (action needs $)
 
-* Tue Jan 30 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Tue Jan 30 2001 Trond Eivind Glomsrd <teg at redhat.com>
 - make it shut down and rotate logs without using mysqladmin 
   (from #24909)
 
-* Mon Jan 29 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Mon Jan 29 2001 Trond Eivind Glomsrd <teg at redhat.com>
 - conflict with "MySQL"
 
-* Tue Jan 23 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Tue Jan 23 2001 Trond Eivind Glomsrd <teg at redhat.com>
 - improve gettextizing
 
-* Mon Jan 22 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Mon Jan 22 2001 Trond Eivind Glomsrd <teg at redhat.com>
 - 3.23.32
 - fix logrotate script (#24589)
 
-* Wed Jan 17 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Wed Jan 17 2001 Trond Eivind Glomsrd <teg at 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 at redhat.com>
+* Tue Jan 16 2001 Trond Eivind Glomsrd <teg at redhat.com>
 - add the log file to the rpm database, and make it 0640
   (#24116)
 - as above in logrotate script
@@ -889,71 +932,71 @@
 - use standard safe_mysqld
 - shut down cleaner
 
-* Mon Jan 08 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Mon Jan 08 2001 Trond Eivind Glomsrd <teg at redhat.com>
 - 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 <teg at redhat.com>
+* Mon Jan 01 2001 Trond Eivind Glomsrd <teg at redhat.com>
 - 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 <teg at redhat.com>
+* Wed Dec 27 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - 3.23.29a
 
-* Tue Dec 19 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Tue Dec 19 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - add requirement for new libstdc++, build for errata
 
-* Mon Dec 18 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Mon Dec 18 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - 3.23.29
 
-* Mon Nov 27 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Mon Nov 27 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - 3.23.28 (gamma)
 - remove old patches, as they are now upstreamed
 
-* Thu Nov 14 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Thu Nov 14 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - Add a requirement for a new glibc (#20735)
 - build on IA64
 
-* Wed Nov  1 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Wed Nov  1 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - disable more assembly
 
 * Wed Nov  1 2000 Jakub Jelinek <jakub at redhat.com>
 - fix mysql on SPARC (#20124)
 
-* Tue Oct 31 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Tue Oct 31 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - 3.23.27
 
-* Wed Oct 25 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Wed Oct 25 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - add patch for fixing bogus aliasing in mysql from Jakub,
   which should fix #18905 and #18620
 
-* Mon Oct 23 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Mon Oct 23 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - check for negative niceness values, and negate it
   if present (#17899)
 - redefine optflags on IA32 FTTB
 
-* Wed Oct 18 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Wed Oct 18 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - 3.23.26, which among other fixes now uses mkstemp()
   instead of tempnam().
 - revert changes made yesterday, the problem is now
   isolated
  
-* Tue Oct 17 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Tue Oct 17 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - use the compat C++ compiler FTTB. Argh.
 - add requirement of ncurses4 (see above)
 
-* Sun Oct 01 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Sun Oct 01 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - 3.23.25
 - fix shutdown problem (#17956)
 
-* Tue Sep 26 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Tue Sep 26 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - Don't try to include no-longer-existing PUBLIC file
   as doc (#17532)
 
-* Thu Sep 12 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Thu Sep 12 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - rename config file to /etc/my.cnf, which is what
   mysqld wants... doh. (#17432)
 - include a changed safe_mysqld, so the pid file option
@@ -962,20 +1005,20 @@
   mysql socket. (#17432)
 - 3.23.24
 
-* Wed Sep 06 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Wed Sep 06 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - 3.23.23
 
-* Sun Aug 27 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Sun Aug 27 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - Add "|| :" to condrestart to avoid non-zero exit code
 
-* Thu Aug 24 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Thu Aug 24 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - it's mysql.com, not mysql.org and use correct path to 
   source (#16830)
 
-* Wed Aug 16 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Wed Aug 16 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - source file from /etc/rc.d, not /etc/rd.d. Doh.
 
-* Sun Aug 13 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Sun Aug 13 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - don't run ldconfig -n, it doesn't update ld.so.cache
   (#16034)
 - include some missing binaries
@@ -985,31 +1028,31 @@
 * Sat Aug 05 2000 Bill Nottingham <notting at redhat.com>
 - condrestart fixes
 
-* Mon Aug 01 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Mon Aug 01 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - 3.23.22. Disable the old patches, they're now in.
 
-* Thu Jul 27 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Thu Jul 27 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - bugfixes in the initscript
 - move the .so link to the devel package
 
-* Wed Jul 19 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Wed Jul 19 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - rebuild due to glibc changes
 
-* Tue Jul 18 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Tue Jul 18 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - disable compiler patch
 - don't include info directory file
 
-* Mon Jul 17 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Mon Jul 17 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - move back to /etc/rc.d/init.d
 
-* Fri Jul 14 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Fri Jul 14 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - more cleanups in initscript
 
-* Thu Jul 13 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Thu Jul 13 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - add a patch to work around compiler bug 
   (from monty at mysql.com) 
 
-* Wed Jul 12 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Wed Jul 12 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - don't build the SQL daemon statically (glibc problems)
 - fix the logrotate script - only flush log if mysql
   is running
@@ -1019,23 +1062,23 @@
 * Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
 - automatic rebuild
 
-* Mon Jul 10 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Mon Jul 10 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - try the new compiler again
 - build the SQL daemon statically
 - add compile time support for complex charsets
 - enable assembler
 - more cleanups in initscript
 
-* Sun Jul 09 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Sun Jul 09 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - use old C++ compiler
 - Exclusivearch x86
 
-* Sat Jul 08 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Sat Jul 08 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - move .so files to devel package
 - more cleanups
 - exclude sparc for now
 
-* Wed Jul 05 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Wed Jul 05 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - 3.23.21
 - remove file from /etc/sysconfig
 - Fix initscript a bit - initialization of databases doesn't
@@ -1047,7 +1090,7 @@
 * Tue Jul  2 2000 Jakub Jelinek <jakub at redhat.com>
 - Rebuild with new C++
 
-* Fri Jun 30 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Fri Jun 30 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - update to 3.23.20
 - use %%configure, %%makeinstall, %%{_tmppath}, %%{_mandir},
   %%{_infodir}, /etc/init.d


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mysql/FC-6/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	22 Nov 2006 23:09:54 -0000	1.28
+++ sources	20 Mar 2007 01:05:53 -0000	1.29
@@ -1 +1 @@
-584d423440a9d9c859678e3d4f2690b3  mysql-5.0.27.tar.gz
+26ed76facb58bdeae40c8310e337dde2  mysql-5.0.37.tar.gz


--- mysql-libtool.patch DELETED ---




More information about the fedora-cvs-commits mailing list