Attachment 49485 Details for Bug 75565 – mysql41-server.patch

[patch] mysql41-server.patch

mysql41-server.patch (text/plain), 10.99 KB, created by Marcus Grando on 2004-12-28 04:20:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Grando

Created: 2004-12-28 04:20:20 UTC

Size: 10.99 KB

patch

obsolete

>diff -ruN mysql41-server.old/Makefile mysql41-server/Makefile
>--- mysql41-server.old/Makefile	Wed Dec 15 08:04:32 2004
>+++ mysql41-server/Makefile	Tue Dec 28 02:02:17 2004
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME?=	mysql
>-PORTVERSION=	4.1.7
>+PORTVERSION=	4.1.8
> PORTREVISION?=	0
> CATEGORIES=	databases
> MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \
>@@ -21,6 +21,7 @@
> 		http://mysql.proserve.nl/Downloads/MySQL-4.1/ \
> 		ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.1/
> PKGNAMESUFFIX?=	-server
>+DISTNAME=	${PORTNAME}-${PORTVERSION}a
> 
> MAINTAINER=	ale@FreeBSD.org
> COMMENT?=	Multithreaded SQL database (server)
>@@ -112,7 +113,7 @@
> CONFLICTS=	mysql-server-3.* mysql-server-4.[02-9].* mysql-server-5.*
> 
> PLIST_SUB=	DB_DIR=${DB_DIR} \
>-		VER=${PORTVERSION}
>+		VER=${PORTVERSION}a
> 
> MAN1=		isamchk.1 isamlog.1 mysqld.1 \
> 		mysqld_safe.1 perror.1 replace.1
>@@ -197,7 +198,7 @@
> CONFIGURE_ARGS+=--without-server
> 
> post-patch:
>-	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ scripts man|g" ${WRKSRC}/Makefile.in
>+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include strings regex @sql_client_dirs@ scripts man|g" ${WRKSRC}/Makefile.in
> 	@${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in
> 	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = mysql_config mysql_fix_privilege_tables mysqlbug|g" ${WRKSRC}/scripts/Makefile.in
> 	@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in
>diff -ruN mysql41-server.old/distinfo mysql41-server/distinfo
>--- mysql41-server.old/distinfo	Wed Oct 27 17:36:20 2004
>+++ mysql41-server/distinfo	Tue Dec 28 02:02:17 2004
>@@ -1,2 +1,2 @@
>-MD5 (mysql-4.1.7.tar.gz) = 04c08d2a5cc39050d9fa4727f8f197e8
>-SIZE (mysql-4.1.7.tar.gz) = 19849046
>+MD5 (mysql-4.1.8a.tar.gz) = 2886edbe5cc826727fbb79a79d41145c
>+SIZE (mysql-4.1.8a.tar.gz) = 22945198
>diff -ruN mysql41-server.old/files/patch-Docs::Makefile.in mysql41-server/files/patch-Docs::Makefile.in
>--- mysql41-server.old/files/patch-Docs::Makefile.in	Thu Sep  2 18:27:54 2004
>+++ mysql41-server/files/patch-Docs::Makefile.in	Tue Dec 28 02:02:17 2004
>@@ -1,6 +1,6 @@
>---- Docs/Makefile.in.orig	Fri Mar  5 15:59:43 2004
>-+++ Docs/Makefile.in	Fri Mar  5 16:00:00 2004
>-@@ -446,7 +446,7 @@
>+--- Docs/Makefile.in.orig	Mon Dec 27 18:59:33 2004
>++++ Docs/Makefile.in	Mon Dec 27 18:59:40 2004
>+@@ -775,7 +775,7 @@
>  
>  all:			$(targets) txt_files
>  
>@@ -9,7 +9,7 @@
>  			INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
>  
>  CLEAN_FILES:		$(BUILD_SOURCES)
>-@@ -609,9 +609,6 @@
>+@@ -935,9 +935,6 @@
>  
>  ../INSTALL-SOURCE:	mysql.info $(GT)
>  	perl -w $(GT) mysql.info "Installing" "Tutorial" > $@
>diff -ruN mysql41-server.old/files/patch-Makefile.in mysql41-server/files/patch-Makefile.in
>--- mysql41-server.old/files/patch-Makefile.in	Thu Sep  2 18:27:54 2004
>+++ mysql41-server/files/patch-Makefile.in	Tue Dec 28 02:02:17 2004
>@@ -1,16 +1,16 @@
>---- Makefile.in.orig	Thu Aug 26 23:47:06 2004
>-+++ Makefile.in	Thu Sep  2 12:49:11 2004
>-@@ -297,12 +297,7 @@
>+--- Makefile.in.orig	Mon Dec 27 14:47:38 2004
>++++ Makefile.in	Mon Dec 27 18:50:50 2004
>+@@ -338,12 +338,7 @@
>  
>  # These are built from source in the Docs directory
>  EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
> -SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
> -			@readline_topdir@ sql-common \
>--			@thread_dirs@ pstack @sql_client_dirs@ \
>--			@sql_server_dirs@ scripts man tests \
>+-			@thread_dirs@ pstack \
>+-			@sql_server_dirs@ @sql_client_dirs@ scripts man tests \
> -			netware @libmysqld_dirs@ \
> -			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
>-+SUBDIRS =
>- 
>++SUBDIRS = 
>  
>  DIST_SUBDIRS = . include @docs_dirs@ zlib \
>+ 			@readline_topdir@ sql-common \
>diff -ruN mysql41-server.old/files/patch-configure mysql41-server/files/patch-configure
>--- mysql41-server.old/files/patch-configure	Mon Jul  5 07:16:55 2004
>+++ mysql41-server/files/patch-configure	Tue Dec 28 02:02:17 2004
>@@ -1,6 +1,6 @@
>---- configure.orig	Fri Jul  2 11:24:14 2004
>-+++ configure	Fri Jul  2 11:24:37 2004
>-@@ -18829,8 +18829,6 @@
>+--- configure.orig	Mon Dec 27 14:48:08 2004
>++++ configure	Mon Dec 27 19:02:55 2004
>+@@ -19664,8 +19664,6 @@
>  # This can be used to rebuild libtool when needed
>  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
>  
>@@ -9,7 +9,7 @@
>  
>  # Prevent multiple expansion
>  
>-@@ -23783,8 +23781,8 @@
>+@@ -25065,8 +25063,8 @@
>  # Some system specific hacks
>  #
>  
>@@ -18,5 +18,5 @@
> +MAX_C_OPTIMIZE=""
> +MAX_CXX_OPTIMIZE=""
>  
>- case $SYSTEM_TYPE in
>-   *solaris2.7*)
>+ case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_c_compiler_gnu in
>+ # workaround for Sun Forte/x86 see BUG#4681
>diff -ruN mysql41-server.old/files/patch-man::Makefile.in mysql41-server/files/patch-man::Makefile.in
>--- mysql41-server.old/files/patch-man::Makefile.in	Sun Feb 29 05:44:12 2004
>+++ mysql41-server/files/patch-man::Makefile.in	Tue Dec 28 02:02:17 2004
>@@ -1,13 +1,13 @@
>---- man/Makefile.in.orig	Mon Feb 23 14:54:10 2004
>-+++ man/Makefile.in	Mon Feb 23 14:54:34 2004
>-@@ -272,9 +272,7 @@
>+--- man/Makefile.in.orig	Mon Dec 27 14:47:43 2004
>++++ man/Makefile.in	Mon Dec 27 18:58:03 2004
>+@@ -313,9 +313,7 @@
>  vio_dir = @vio_dir@
>  vio_libs = @vio_libs@
>- 
>+ zlib_dir = @zlib_dir@
> -man_MANS = mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \
> -		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \
> -		perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1
>-+man_MANS =
>- 
>++man_MANS = 
>  
>  EXTRA_DIST = mysql.1.in isamchk.1.in isamlog.1.in mysql_zap.1.in \
>+ 		mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \
>diff -ruN mysql41-server.old/files/patch-scripts::Makefile.in mysql41-server/files/patch-scripts::Makefile.in
>--- mysql41-server.old/files/patch-scripts::Makefile.in	Tue Jun  1 04:15:09 2004
>+++ mysql41-server/files/patch-scripts::Makefile.in	Tue Dec 28 02:02:17 2004
>@@ -1,9 +1,9 @@
>---- scripts/Makefile.in.orig	Fri May 28 21:38:37 2004
>-+++ scripts/Makefile.in	Mon May 31 15:14:31 2004
>-@@ -276,26 +276,7 @@
>+--- scripts/Makefile.in.orig	Mon Dec 27 14:48:03 2004
>++++ scripts/Makefile.in	Mon Dec 27 18:56:27 2004
>+@@ -316,26 +316,7 @@
>  vio_dir = @vio_dir@
>  vio_libs = @vio_libs@
>- 
>+ zlib_dir = @zlib_dir@
> -bin_SCRIPTS = @server_scripts@ \
> -			msql2mysql \
> -			mysql_config \
>@@ -24,20 +24,20 @@
> -			make_win_src_distribution \
> -			make_win_binary_distribution \
> -			mysql_create_system_tables
>-+bin_SCRIPTS =
>- 
>++bin_SCRIPTS = 
>  
>  EXTRA_SCRIPTS = make_binary_distribution.sh \
>-@@ -329,7 +310,7 @@
>+ 			make_sharedlib_distribution.sh \
>+@@ -366,7 +347,7 @@
>+ 			mysqlaccess.conf \
>  			mysqlbug
>  
>- 
> -dist_pkgdata_DATA = fill_help_tables.sql mysql_fix_privilege_tables.sql
> +dist_pkgdata_DATA =
>  
>  # mysqlbug should be distributed built so that people can report build
>  # failures with it.
>-@@ -605,8 +586,6 @@
>+@@ -652,8 +633,6 @@
>  
>  all: fill_help_tables.sql make_win_src_distribution make_binary_distribution make_sharedlib_distribution
>  
>diff -ruN mysql41-server.old/files/patch-sql::Makefile.in mysql41-server/files/patch-sql::Makefile.in
>--- mysql41-server.old/files/patch-sql::Makefile.in	Wed Sep 22 19:22:32 2004
>+++ mysql41-server/files/patch-sql::Makefile.in	Tue Dec 28 02:02:17 2004
>@@ -1,15 +1,6 @@
>---- sql/Makefile.in.orig	Thu Aug 26 22:47:18 2004
>-+++ sql/Makefile.in		Sun Sep 19 15:03:56 2004
>-@@ -378,7 +378,7 @@
>- 			gstream.cc spatial.cc sql_help.cc protocol_cursor.cc \
>- 			tztime.cc my_time.c \
>- 			examples/ha_example.cc examples/ha_archive.cc \
>--			examples/ha_tina.cc
>-+			examples/ha_tina.cc mylibwrap.c
>- 
>- 
>- gen_lex_hash_SOURCES = gen_lex_hash.cc
>-@@ -450,7 +450,8 @@
>+--- sql/Makefile.in.orig	Mon Dec 27 14:48:04 2004
>++++ sql/Makefile.in	Mon Dec 27 18:54:26 2004
>+@@ -126,7 +126,8 @@
>  	pack.$(OBJEXT) stacktrace.$(OBJEXT) repl_failsafe.$(OBJEXT) \
>  	gstream.$(OBJEXT) spatial.$(OBJEXT) sql_help.$(OBJEXT) \
>  	protocol_cursor.$(OBJEXT) tztime.$(OBJEXT) my_time.$(OBJEXT) \
>@@ -17,9 +8,9 @@
> +	ha_example.$(OBJEXT) ha_archive.$(OBJEXT) ha_tina.$(OBJEXT) \
> +	mylibwrap.$(OBJEXT)
>  mysqld_OBJECTS = $(am_mysqld_OBJECTS)
>- mysqld_DEPENDENCIES = $(top_builddir)/myisam/libmyisam.a \
>- 	$(top_builddir)/myisammrg/libmyisammrg.a \
>-@@ -518,7 +519,8 @@
>+ mysqld_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
>+ 	$(am__DEPENDENCIES_2)
>+@@ -194,7 +195,8 @@
>  @AMDEP_TRUE@	./$(DEPDIR)/stacktrace.Po ./$(DEPDIR)/strfunc.Po \
>  @AMDEP_TRUE@	./$(DEPDIR)/table.Po ./$(DEPDIR)/thr_malloc.Po \
>  @AMDEP_TRUE@	./$(DEPDIR)/time.Po ./$(DEPDIR)/tztime.Po \
>@@ -28,12 +19,21 @@
> +@AMDEP_TRUE@	./$(DEPDIR)/mylibwrap.Po
>  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
>  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
>- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
>-@@ -748,6 +750,7 @@
>+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
>+@@ -552,7 +554,7 @@
>+ 			gstream.cc spatial.cc sql_help.cc protocol_cursor.cc \
>+ 			tztime.cc my_time.c \
>+ 			examples/ha_example.cc examples/ha_archive.cc \
>+-			examples/ha_tina.cc
>++			examples/ha_tina.cc mylibwrap.c
>+ 
>+ gen_lex_hash_SOURCES = gen_lex_hash.cc
>+ gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS)
>+@@ -776,6 +778,7 @@
>  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tztime.Po@am__quote@
>  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uniques.Po@am__quote@
>  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unireg.Po@am__quote@
> +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mylibwrap.Po@am__quote@
>  
>- distclean-depend:
>- 	-rm -rf ./$(DEPDIR)
>+ .c.o:
>+ @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
>diff -ruN mysql41-server.old/files/patch-sql::mysqld.cc mysql41-server/files/patch-sql::mysqld.cc
>--- mysql41-server.old/files/patch-sql::mysqld.cc	Wed Sep 22 19:22:32 2004
>+++ mysql41-server/files/patch-sql::mysqld.cc	Tue Dec 28 02:02:17 2004
>@@ -1,6 +1,6 @@
>---- sql/mysqld.cc.orig	Thu Sep 16 23:47:47 2004
>-+++ sql/mysqld.cc	Tue Sep 21 23:56:49 2004
>-@@ -115,15 +115,7 @@
>+--- sql/mysqld.cc.orig	Tue Dec 14 10:40:36 2004
>++++ sql/mysqld.cc	Mon Dec 27 19:05:15 2004
>+@@ -136,15 +136,7 @@
>  int allow_severity = LOG_INFO;
>  int deny_severity = LOG_WARNING;
>  
>diff -ruN mysql41-server.old/pkg-plist mysql41-server/pkg-plist
>--- mysql41-server.old/pkg-plist	Tue Oct 19 11:14:07 2004
>+++ mysql41-server/pkg-plist	Tue Dec 28 02:03:02 2004
>@@ -21,6 +21,7 @@
> bin/ndb_select_count
> bin/ndb_show_tables
> bin/ndb_waiter
>+bin/ndb_test_platform
> bin/pack_isam
> bin/perror
> bin/replace
>@@ -29,6 +30,8 @@
> etc/rc.d/mysql-server.sh
> include/mysql/ndb/mgmapi/mgmapi.h
> include/mysql/ndb/mgmapi/mgmapi_debug.h
>+include/mysql/ndb/mgmapi/mgmapi_config_parameters.h
>+include/mysql/ndb/mgmapi/mgmapi_config_parameters_debug.h
> include/mysql/ndb/ndb_types.h
> include/mysql/ndb/ndb_version.h
> include/mysql/ndb/ndbapi/Ndb.hpp
>diff -ruN mysql41-server.old/pkg-plist.client mysql41-server/pkg-plist.client
>--- mysql41-server.old/pkg-plist.client	Tue Oct 19 11:14:07 2004
>+++ mysql41-server/pkg-plist.client	Tue Dec 28 02:02:17 2004
>@@ -48,6 +48,7 @@
> lib/mysql/libmysqlclient_r.a
> lib/mysql/libmysqlclient_r.so
> lib/mysql/libmysqlclient_r.so.14
>+lib/mysql/libmystrings.a
> %%DATADIR%%/mysql_fix_privilege_tables.sql
> @dirrm include/mysql
> @dirrm lib/mysql

Actions: View | Diff

Attachments on bug 75565: 49485