Attachment 50989 Details for Bug 77566 – mysql41-server.patch

[patch] mysql41-server.patch

mysql41-server.patch (text/plain), 5.56 KB, created by Marcus Grando on 2005-02-15 18:20:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Grando

Created: 2005-02-15 18:20:20 UTC

Size: 5.56 KB

patch

obsolete

>diff -ruN mysql41-server.old/Makefile mysql41-server/Makefile
>--- mysql41-server.old/Makefile	Sun Jan 16 08:24:45 2005
>+++ mysql41-server/Makefile	Tue Feb 15 14:55:08 2005
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME?=	mysql
>-PORTVERSION=	4.1.9
>+PORTVERSION=	4.1.10
> PORTREVISION?=	0
> CATEGORIES=	databases
> MASTER_SITES=	${MASTER_SITE_MYSQL}
>diff -ruN mysql41-server.old/distinfo mysql41-server/distinfo
>--- mysql41-server.old/distinfo	Sun Jan 16 08:24:45 2005
>+++ mysql41-server/distinfo	Tue Feb 15 14:57:42 2005
>@@ -1,2 +1,2 @@
>-MD5 (mysql-4.1.9.tar.gz) = 7bc44befe155d619c4e4705f68874278
>-SIZE (mysql-4.1.9.tar.gz) = 22308321
>+MD5 (mysql-4.1.10.tar.gz) = 27b27b74f430aaeb77fb8d4e6f32ac4d
>+SIZE (mysql-4.1.10.tar.gz) = 22563415
>diff -ruN mysql41-server.old/files/patch-scripts::mysqlaccess.sh mysql41-server/files/patch-scripts::mysqlaccess.sh
>--- mysql41-server.old/files/patch-scripts::mysqlaccess.sh	Sun Jan 16 20:45:48 2005
>+++ mysql41-server/files/patch-scripts::mysqlaccess.sh	Wed Dec 31 21:00:00 1969
>@@ -1,90 +0,0 @@
>---- scripts/mysqlaccess.sh.orig	2005-01-16 14:28:38 -08:00
>-+++ scripts/mysqlaccess.sh	2005-01-16 14:28:38 -08:00
>-@@ -2,7 +2,7 @@
>- # ****************************
>- package MySQLaccess;
>- #use strict;
>--use POSIX qw(tmpnam);
>-+use File::Temp qw(tempfile tmpnam);
>- use Fcntl;
>- 
>- BEGIN {
>-@@ -32,7 +32,6 @@
>- 	$ACCESS_U_BCK = 'user_backup';   
>- 	$ACCESS_D_BCK = 'db_backup';     
>-         $DIFF      = '/usr/bin/diff'; 
>--        $TMP_PATH  = '/tmp';             #path to writable tmp-directory
>-         $MYSQLDUMP = '@bindir@/mysqldump';
>-                                          #path to mysqldump executable
>- 
>-@@ -432,7 +431,7 @@
>- # no caching on STDOUT
>- 	$|=1;
>- 
>--	$MYSQL_CNF = POSIX::tmpnam();
>-+	$MYSQL_CNF = tmpnam();
>- 	%MYSQL_CNF = (client    => { },
>-                       mysql     => { },
>-                       mysqldump => { },
>-@@ -577,8 +576,6 @@
>- push(@MySQLaccess::Grant::Error,'not_found_mysql')     if !(-x $MYSQL);
>- push(@MySQLaccess::Grant::Error,'not_found_diff')      if !(-x $DIFF);
>- push(@MySQLaccess::Grant::Error,'not_found_mysqldump') if !(-x $MYSQLDUMP);
>--push(@MySQLaccess::Grant::Error,'not_found_tmp')       if !(-d $TMP_PATH);
>--push(@MySQLaccess::Grant::Error,'write_err_tmp')       if !(-w $TMP_PATH);
>- if (@MySQLaccess::Grant::Error) {
>-    MySQLaccess::Report::Print_Error_Messages() ;
>-    exit 0;
>-@@ -1777,17 +1774,15 @@
>-    @before = sort(@before);
>-    @after  = sort(@after);
>- 
>--   $before = "$MySQLaccess::TMP_PATH/$MySQLaccess::script.before.$$";
>--   $after  = "$MySQLaccess::TMP_PATH/$MySQLaccess::script.after.$$";
>--   #$after = "/tmp/t0";
>--   open(BEFORE,"> $before") ||
>--    push(@MySQLaccess::Report::Errors,"Can't open temporary file $before for writing");
>--   open(AFTER,"> $after") ||
>--    push(@MySQLaccess::Report::Errors,"Can't open temporary file $after for writing");
>--   print BEFORE join("\n",@before);
>--   print AFTER  join("\n",@after);
>--   close(BEFORE);
>--   close(AFTER);
>-+   ($hb, $before) = tempfile("$MySQLaccess::script.XXXXXX") or
>-+    push(@MySQLaccess::Report::Errors,"Can't create temporary file: $!");
>-+   ($ha, $after)  = tempfile("$MySQLaccess::script.XXXXXX") or
>-+    push(@MySQLaccess::Report::Errors,"Can't create temporary file: $!");
>-+
>-+   print $hb join("\n",@before);
>-+   print $ha join("\n",@after);
>-+   close $hb;
>-+   close $ha;
>- 
>-    # ----------------------------------
>-    # compute difference
>-@@ -1800,8 +1795,8 @@
>- 
>-    # ----------------------------------
>-    # cleanup temp. files
>--   unlink(BEFORE);
>--   unlink(AFTER);
>-+   unlink($before);
>-+   unlink($after);
>- 
>-    return \@diffs;
>- }
>-@@ -2316,14 +2311,6 @@
>-    => "The diff program <$MySQLaccess::DIFF> could not be found.\n"
>-      ."+ Check your path, or\n"
>-      ."+ edit the source of this script to point \$DIFF to the diff program.\n"
>-- ,'not_found_tmp'
>--   => "The temporary directory <$MySQLaccess::TMP_PATH> could not be found.\n"
>--     ."+ create this directory (writeable!), or\n"
>--     ."+ edit the source of this script to point \$TMP_PATH to the right directory.\n"
>-- ,'write_err_tmp'
>--   => "The temporary directory <$MySQLaccess::TMP_PATH> is not writable.\n"
>--     ."+ make this directory writeable!, or\n"
>--     ."+ edit the source of this script to point \$TMP_PATH to another directory.\n"
>-  ,'Unrecognized_option'
>-    => "Sorry,\n"
>-      ."You are using an old version of the mysql-program,\n"
>diff -ruN mysql41-server.old/pkg-plist mysql41-server/pkg-plist
>--- mysql41-server.old/pkg-plist	Tue Jan 18 09:48:14 2005
>+++ mysql41-server/pkg-plist	Tue Feb 15 15:53:39 2005
>@@ -55,6 +55,7 @@
> %%NDB%%include/mysql/ndb/ndbapi/ndb_cluster_connection.hpp
> %%NDB%%include/mysql/ndb/ndbapi/ndbapi_limits.h
> %%NDB%%include/mysql/ndb/ndbapi/ndberror.h
>+%%NDB%%include/mysql/ndb/ndbapi/ndb_opt_defaults.h
> lib/mysql/libdbug.a
> lib/mysql/libheap.a
> lib/mysql/libmerge.a
>@@ -126,6 +127,8 @@
> %%DATADIR%%/italian/errmsg.txt
> %%DATADIR%%/japanese/errmsg.sys
> %%DATADIR%%/japanese/errmsg.txt
>+%%DATADIR%%/japanese-sjis/errmsg.sys
>+%%DATADIR%%/japanese-sjis/errmsg.txt
> %%DATADIR%%/korean/errmsg.sys
> %%DATADIR%%/korean/errmsg.txt
> %%DATADIR%%/mi_test_all
>@@ -160,6 +163,7 @@
> %%DATADIR%%/swedish/errmsg.txt
> %%DATADIR%%/ukrainian/errmsg.sys
> %%DATADIR%%/ukrainian/errmsg.txt
>+%%NDB%%%%DATADIR%%/ndb-config-2-node.ini
> %%NDB%%@dirrm include/mysql/ndb/mgmapi
> %%NDB%%@dirrm include/mysql/ndb/ndbapi
> %%NDB%%@dirrm include/mysql/ndb
>@@ -177,6 +181,7 @@
> @dirrm %%DATADIR%%/hungarian
> @dirrm %%DATADIR%%/italian
> @dirrm %%DATADIR%%/japanese
>+@dirrm %%DATADIR%%/japanese-sjis
> @dirrm %%DATADIR%%/korean
> @dirrm %%DATADIR%%/norwegian
> @dirrm %%DATADIR%%/norwegian-ny

Actions: View | Diff

Attachments on bug 77566: 50989 | 50990 | 50991 | 50992