Attachment 28545 Details for Bug 47945 – mysql40-server.diff

[patch] mysql40-server.diff

mysql40-server.diff (text/plain), 2.60 KB, created by Alex Dupre on 2003-02-05 10:40:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Dupre

Created: 2003-02-05 10:40:10 UTC

Size: 2.60 KB

patch

obsolete

>diff -ruN mysql40-server.orig/Makefile mysql40-server/Makefile
>--- mysql40-server.orig/Makefile	Tue Feb  4 15:13:33 2003
>+++ mysql40-server/Makefile	Wed Feb  5 11:35:21 2003
>@@ -39,7 +39,6 @@
> 		--without-bench \
> 		--without-extra-tools \
> 		--with-libwrap \
>-		--with-raid \
> 		--with-mysqlfs \
> 		--with-vio \
> 		--with-low-memory \
>@@ -102,8 +101,7 @@
> 	@${ECHO} "	WITH_OPENSSL=yes	Enable secure connections."
> 	@${ECHO} "	DB_DIR=directory	Set alternate directory for database files"
> 	@${ECHO} "				(default is /var/db/mysql)."
>-	@${ECHO} "	SKIP_INSTALL_DB=yes	Skip database initialization"
>-	@${ECHO} "				(useful for upgrades)."
>+	@${ECHO} "	OVERWRITE_DB=yes	Re-initialize default databases"
> 	@${ECHO} "	SKIP_DNS_CHECK=yes	Don't run resolveip to do an additional"
> 	@${ECHO} "				DNS check before inserting local hostname to"
> 	@${ECHO} "				mysql database"
>@@ -118,27 +116,12 @@
> 	@${FALSE}
> .endif
> 
>-.if exists(${DB_DIR}) && !defined(PACKAGE_BUILDING) && !defined(OVERWRITE_DB) && !defined(SKIP_INSTALL_DB)
>-pre-install:
>-	@${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}."
>-	@${ECHO} ""
>-	@${ECHO} "In order to preserve your existing data, you should:"
>-	@${ECHO} "	- dump all your databases"
>-	@${ECHO} "	- kill mysql if it is running"
>-	@${ECHO} "	- delete the ${DB_DIR} directory"
>-	@${ECHO} "	- run 'make install'"
>-	@${ECHO} "	- start up mysql"
>-	@${ECHO} "	- re-create all of your database"
>-	@${ECHO} "	- re-load your data"
>-	@${ECHO} ""
>-	@${ECHO} "If you understand the consequences of this upgrade, please re-build this"
>-	@${ECHO} "port with the environment variable OVERWRITE_DB defined."
>-	@${FALSE}
>-.endif
>-
> post-install:
> .if !defined(PACKAGE_BUILDING)
>-.if !defined(SKIP_INSTALL_DB)
>+.if exists(${DB_DIR}) && defined(OVERWRITE_DB)
>+	@${RM} -r ${DB_DIR}/mysql ${DB_DIR}/test 2>/dev/null || true
>+.endif
>+.if !exists(${DB_DIR}) || defined(OVERWRITE_DB)
> .if defined(SKIP_DNS_CHECK)
> 	${PREFIX}/bin/mysql_install_db --force
> .else
>diff -ruN mysql40-server.orig/files/patch-sql::mysqld.cc mysql40-server/files/patch-sql::mysqld.cc
>--- mysql40-server.orig/files/patch-sql::mysqld.cc	Thu Jan  1 01:00:00 1970
>+++ mysql40-server/files/patch-sql::mysqld.cc	Wed Feb  5 09:22:15 2003
>@@ -0,0 +1,12 @@
>+--- sql/mysqld.cc.orig	Wed Feb  5 01:55:03 2003
>++++ sql/mysqld.cc	Wed Feb  5 01:57:06 2003
>+@@ -104,7 +104,8 @@
>+ int allow_severity = LOG_INFO;
>+ int deny_severity = LOG_WARNING;
>+ 
>+-#ifdef __STDC__
>++#include <osreldate.h>
>++#if defined(__STDC__) && __FreeBSD_version < 500000
>+ #define my_fromhost(A)	   fromhost(A)
>+ #define my_hosts_access(A) hosts_access(A)
>+ #define my_eval_client(A)  eval_client(A)

Actions: View | Diff

Attachments on bug 47945: 28545