rpms/mysql/devel .cvsignore, 1.32, 1.33 mysql-errno.patch, 1.3, 1.4 mysql-install-test.patch, 1.5, 1.6 mysql-testing.patch, 1.10, 1.11 mysql.spec, 1.107, 1.108 sources, 1.32, 1.33 mysql-innodb-crash.patch, 1.2, NONE mysql-ss-test.patch, 1.1, NONE mysql-ssl.patch, 1.1, NONE

Tom Lane tgl at fedoraproject.org
Sat Aug 23 20:31:49 UTC 2008 

Author: tgl

Update of /cvs/pkgs/rpms/mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10371

Modified Files:
	.cvsignore mysql-errno.patch mysql-install-test.patch 
	mysql-testing.patch mysql.spec sources 
Removed Files:
	mysql-innodb-crash.patch mysql-ss-test.patch mysql-ssl.patch 
Log Message:
Update to mysql version 5.0.67


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	4 Mar 2008 02:46:54 -0000	1.32
+++ .cvsignore	23 Aug 2008 20:31:19 -0000	1.33
@@ -1 +1 @@
-mysql-5.0.51a.tar.gz
+mysql-5.0.67.tar.gz

mysql-errno.patch:

Index: mysql-errno.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-errno.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mysql-errno.patch	3 Nov 2005 03:30:48 -0000	1.3
+++ mysql-errno.patch	23 Aug 2008 20:31:19 -0000	1.4
@@ -1,14 +1,21 @@
-diff -Naur mysql-5.0.15.orig/include/my_global.h mysql-5.0.15/include/my_global.h
---- mysql-5.0.15.orig/include/my_global.h	2005-10-16 21:27:27.000000000 -0400
-+++ mysql-5.0.15/include/my_global.h	2005-11-02 16:16:37.000000000 -0500
-@@ -107,6 +107,10 @@
- #define _GNU_SOURCE 1
+"extern int errno" is just a really bad idea.
+
+
+diff -Naur mysql-5.0.67.orig/include/my_sys.h mysql-5.0.67/include/my_sys.h
+--- mysql-5.0.67.orig/include/my_sys.h	2008-08-04 08:19:12.000000000 -0400
++++ mysql-5.0.67/include/my_sys.h	2008-08-23 14:39:08.000000000 -0400
+@@ -208,13 +208,8 @@
  #endif
+ #endif /* MSDOS */
  
-+#ifdef __linux__
-+#define HAVE_ERRNO_AS_DEFINE
-+#endif
+-#ifndef errno				/* did we already get it? */
+-#ifdef HAVE_ERRNO_AS_DEFINE
+ #include <errno.h>			/* errno is a define */
+-#else
+-extern int errno;			/* declare errno */
+-#endif
+-#endif					/* #ifndef errno */
 +
- /*
-   Temporary solution to solve bug#7156. Include "sys/types.h" before
-   the thread headers, else the function madvise() will not be defined
+ extern char NEAR errbuff[NRERRBUFFS][ERRMSGSIZE];
+ extern char *home_dir;			/* Home directory for user */
+ extern const char *my_progname;		/* program-name (printed in errors) */

mysql-install-test.patch:

Index: mysql-install-test.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-install-test.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mysql-install-test.patch	27 Jul 2008 17:54:30 -0000	1.5
+++ mysql-install-test.patch	23 Aug 2008 20:31:19 -0000	1.6
@@ -4,10 +4,10 @@
 This patch also improves the documentation a tad.
 
 
-diff -Naur mysql-5.0.40.orig/mysql-test/README mysql-5.0.40/mysql-test/README
---- mysql-5.0.40.orig/mysql-test/README	2007-04-20 10:14:42.000000000 -0400
-+++ mysql-5.0.40/mysql-test/README	2007-05-23 14:41:03.000000000 -0400
-@@ -6,6 +6,17 @@
+diff -Naur mysql-5.0.67.orig/mysql-test/README mysql-5.0.67/mysql-test/README
+--- mysql-5.0.67.orig/mysql-test/README	2008-08-04 08:19:20.000000000 -0400
++++ mysql-5.0.67/mysql-test/README	2008-08-23 16:25:14.000000000 -0400
+@@ -6,6 +6,19 @@
  actually have a co-existing MySQL installation. The tests will not
  conflict with it.
  
@@ -20,12 +20,14 @@
 +so you need not start the mysqld service beforehand.  If you have not
 +installed mysql-cluster, use
 +	sudo -u mysql ./mysql-test-run --skip-ndbcluster
-+to skip the cluster-related tests.
++to skip the cluster-related tests.  To clean up afterwards, remove the
++created "var" subdirectory, eg
++	sudo -u mysql rm -rf /usr/share/mysql-test/var
 +
  All tests must pass. If one or more of them fail on your system, please
  read the following manual section for instructions on how to report the
  problem:
-@@ -25,7 +36,8 @@
+@@ -25,7 +38,8 @@
  
  With no test cases named on the command line, mysql-test-run falls back
  to the normal "non-extern" behavior. The reason for this is that some
@@ -35,9 +37,9 @@
  
  
  You can create your own test cases. To create a test case, create a new
-diff -Naur mysql-5.0.40.orig/mysql-test/install_test_db.sh mysql-5.0.40/mysql-test/install_test_db.sh
---- mysql-5.0.40.orig/mysql-test/install_test_db.sh	2007-04-20 10:14:31.000000000 -0400
-+++ mysql-5.0.40/mysql-test/install_test_db.sh	2007-05-23 14:39:44.000000000 -0400
+diff -Naur mysql-5.0.67.orig/mysql-test/install_test_db.sh mysql-5.0.67/mysql-test/install_test_db.sh
+--- mysql-5.0.67.orig/mysql-test/install_test_db.sh	2008-08-04 08:19:21.000000000 -0400
++++ mysql-5.0.67/mysql-test/install_test_db.sh	2008-08-23 16:21:59.000000000 -0400
 @@ -26,18 +26,15 @@
    libexecdir=../libexec
  

mysql-testing.patch:

Index: mysql-testing.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-testing.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mysql-testing.patch	22 Jul 2007 20:35:24 -0000	1.10
+++ mysql-testing.patch	23 Aug 2008 20:31:19 -0000	1.11
@@ -9,27 +9,27 @@
 without this, the build-time test works but the mysql-test RPM doesn't.
 
 
-diff -Naur mysql-5.0.40.orig/Makefile.am mysql-5.0.40/Makefile.am
---- mysql-5.0.40.orig/Makefile.am	2007-04-20 10:14:34.000000000 -0400
-+++ mysql-5.0.40/Makefile.am	2007-05-23 12:59:49.000000000 -0400
-@@ -126,11 +126,11 @@
+diff -Naur mysql-5.0.67.orig/Makefile.am mysql-5.0.67/Makefile.am
+--- mysql-5.0.67.orig/Makefile.am	2008-08-04 08:18:47.000000000 -0400
++++ mysql-5.0.67/Makefile.am	2008-08-23 13:49:56.000000000 -0400
+@@ -127,11 +127,11 @@
  
  test-ps:
  	cd mysql-test ; \
--	@PERL@ ./mysql-test-run.pl $(force) $(mem) --ps-protocol
-+	@PERL@ ./mysql-test-run.pl $(force) $(mem) --ssl --ps-protocol
+-	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --ps-protocol
++	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --ssl --ps-protocol
  
  test-ns:
  	cd mysql-test ; \
--	@PERL@ ./mysql-test-run.pl $(force) $(mem)
-+	@PERL@ ./mysql-test-run.pl $(force) $(mem) --ssl
+-	    @PERL@ ./mysql-test-run.pl $(force) $(mem)
++	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --ssl
  
  test:	test-ns test-ps
  
-diff -Naur mysql-5.0.40.orig/mysql-test/lib/mtr_process.pl mysql-5.0.40/mysql-test/lib/mtr_process.pl
---- mysql-5.0.40.orig/mysql-test/lib/mtr_process.pl	2007-04-20 10:39:41.000000000 -0400
-+++ mysql-5.0.40/mysql-test/lib/mtr_process.pl	2007-05-23 12:59:49.000000000 -0400
-@@ -148,6 +148,9 @@
+diff -Naur mysql-5.0.67.orig/mysql-test/lib/mtr_process.pl mysql-5.0.67/mysql-test/lib/mtr_process.pl
+--- mysql-5.0.67.orig/mysql-test/lib/mtr_process.pl	2008-08-04 08:32:17.000000000 -0400
++++ mysql-5.0.67/mysql-test/lib/mtr_process.pl	2008-08-23 13:48:23.000000000 -0400
+@@ -150,6 +150,9 @@
      {
        # Child, redirect output and exec
  
@@ -39,10 +39,10 @@
        $SIG{INT}= 'DEFAULT';         # Parent do some stuff, we don't
  
        my $log_file_open_mode = '>';
-diff -Naur mysql-5.0.40.orig/mysql-test/mysql-test-run.pl mysql-5.0.40/mysql-test/mysql-test-run.pl
---- mysql-5.0.40.orig/mysql-test/mysql-test-run.pl	2007-04-20 10:14:30.000000000 -0400
-+++ mysql-5.0.40/mysql-test/mysql-test-run.pl	2007-05-23 13:02:12.000000000 -0400
-@@ -1465,13 +1465,15 @@
+diff -Naur mysql-5.0.67.orig/mysql-test/mysql-test-run.pl mysql-5.0.67/mysql-test/mysql-test-run.pl
+--- mysql-5.0.67.orig/mysql-test/mysql-test-run.pl	2008-08-04 08:19:21.000000000 -0400
++++ mysql-5.0.67/mysql-test/mysql-test-run.pl	2008-08-23 13:48:23.000000000 -0400
+@@ -1510,13 +1510,15 @@
  
    $exe_ndbd=
      mtr_exe_maybe_exists("$ndb_path/src/kernel/ndbd",
@@ -60,7 +60,7 @@
    $exe_ndb_waiter=
      mtr_exe_maybe_exists("$ndb_path/tools/ndb_waiter",
  			 "$ndb_path/ndb_waiter");
-@@ -1572,7 +1574,8 @@
+@@ -1617,7 +1619,8 @@
      # Look for mysql_fix_privilege_tables.sql script
      $file_mysql_fix_privilege_tables=
        mtr_file_exists("$glob_basedir/scripts/mysql_fix_privilege_tables.sql",
@@ -70,7 +70,7 @@
  
      if ( ! $opt_skip_ndbcluster and executable_setup_ndb()) {
        mtr_warning("Could not find all required ndb binaries, " .
-@@ -3999,7 +4002,7 @@
+@@ -4094,7 +4097,7 @@
  
    if ( defined $exe )
    {


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- mysql.spec	27 Jul 2008 17:54:30 -0000	1.107
+++ mysql.spec	23 Aug 2008 20:31:19 -0000	1.108
@@ -1,6 +1,6 @@
 Name: mysql
-Version: 5.0.51a
-Release: 2%{?dist}
+Version: 5.0.67
+Release: 1%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -31,10 +31,7 @@
 Patch8: mysql-install-test.patch
 Patch9: mysql-bdb-link.patch
 Patch10: mysql-bdb-open.patch
-Patch11: mysql-innodb-crash.patch
-Patch12: mysql-ssl.patch
 Patch13: mysql-no-dbug.patch
-Patch14: mysql-ss-test.patch
 Patch15: mysql-stack-guard.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -157,10 +154,7 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
-%patch12 -p1
 %patch13 -p1
-%patch14 -p1
 %patch15 -p1
 
 libtoolize --force
@@ -385,6 +379,7 @@
 %{_infodir}/*
 
 %{_mandir}/man1/mysql.1*
+%{_mandir}/man1/mysql_config.1*
 %{_mandir}/man1/mysql_find_rows.1*
 %{_mandir}/man1/mysql_tableinfo.1*
 %{_mandir}/man1/mysql_waitpid.1*
@@ -479,7 +474,6 @@
 %{_mandir}/man1/mysql_convert_table_format.1*
 %{_mandir}/man1/myisam_ftdump.1*
 %{_mandir}/man1/mysql.server.1*
-%{_mandir}/man1/mysql_config.1*
 %{_mandir}/man1/mysql_explain_log.1*
 %{_mandir}/man1/mysql_fix_extensions.1*
 %{_mandir}/man1/mysql_fix_privilege_tables.1*
@@ -487,6 +481,7 @@
 %{_mandir}/man1/mysql_secure_installation.1*
 %{_mandir}/man1/mysql_upgrade.1*
 %{_mandir}/man1/mysql_zap.1*
+%{_mandir}/man1/mysqlbug.1*
 %{_mandir}/man1/mysqlbinlog.1*
 %{_mandir}/man1/mysqlcheck.1*
 %{_mandir}/man1/mysqld_multi.1*
@@ -554,7 +549,6 @@
 %{_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*
@@ -564,7 +558,8 @@
 %{_mandir}/man1/ndb_show_tables.1*
 #%{_mandir}/man1/ndb_size.pl.1*
 %{_mandir}/man1/ndb_waiter.1*
-%{_mandir}/man1/ndbd.1*
+%{_mandir}/man8/ndbd.8*
+%{_mandir}/man8/ndb_mgmd.8*
 
 %files devel
 %defattr(-,root,root)
@@ -585,6 +580,11 @@
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Sat Aug 23 2008 Tom Lane <tgl at redhat.com> 5.0.67-1
+- Update to mysql version 5.0.67
+- Move mysql_config's man page to base package, again (apparently I synced
+  that change the wrong way while importing specfile changes for ndbcluster)
+
 * Sun Jul 27 2008 Tom Lane <tgl at redhat.com> 5.0.51a-2
 - Enable ndbcluster support
 Resolves: #163758


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	4 Mar 2008 02:46:54 -0000	1.32
+++ sources	23 Aug 2008 20:31:19 -0000	1.33
@@ -1 +1 @@
-a83dbdbb91267daf73d2297a9c283dd1  mysql-5.0.51a.tar.gz
+7164483a5ffb8f7aa59b761c13cdbd6e  mysql-5.0.67.tar.gz


--- mysql-innodb-crash.patch DELETED ---


--- mysql-ss-test.patch DELETED ---


--- mysql-ssl.patch DELETED ---

More information about the scm-commits mailing list