View | Details | Raw Unified | Return to bug 47945
Collapse All | Expand All

(-)mysql40-server/Makefile (-22 / +5 lines)
Lines 39-45 Link Here
39 
		--without-bench \
 39 
		--without-bench \
40 
		--without-extra-tools \
 40 
		--without-extra-tools \
41 
		--with-libwrap \
 41 
		--with-libwrap \
42 
		--with-raid \
43 
		--with-mysqlfs \
 42 
		--with-mysqlfs \
44 
		--with-vio \
 43 
		--with-vio \
45 
		--with-low-memory \
 44 
		--with-low-memory \
Lines 102-109 Link Here
102 
	@${ECHO} "	WITH_OPENSSL=yes	Enable secure connections."
 101 
	@${ECHO} "	WITH_OPENSSL=yes	Enable secure connections."
103 
	@${ECHO} "	DB_DIR=directory	Set alternate directory for database files"
 102 
	@${ECHO} "	DB_DIR=directory	Set alternate directory for database files"
104 
	@${ECHO} "				(default is /var/db/mysql)."
 103 
	@${ECHO} "				(default is /var/db/mysql)."
105 
	@${ECHO} "	SKIP_INSTALL_DB=yes	Skip database initialization"
 104 
	@${ECHO} "	OVERWRITE_DB=yes	Re-initialize default databases"
106 
	@${ECHO} "				(useful for upgrades)."
107 
	@${ECHO} "	SKIP_DNS_CHECK=yes	Don't run resolveip to do an additional"
 105 
	@${ECHO} "	SKIP_DNS_CHECK=yes	Don't run resolveip to do an additional"
108 
	@${ECHO} "				DNS check before inserting local hostname to"
 106 
	@${ECHO} "				DNS check before inserting local hostname to"
109 
	@${ECHO} "				mysql database"
 107 
	@${ECHO} "				mysql database"
Lines 118-144 Link Here
118 
	@${FALSE}
 116 
	@${FALSE}
119 
.endif
 117 
.endif
120 

          118
          

        

            

              121
              
.if exists(${DB_DIR}) && !defined(PACKAGE_BUILDING) && !defined(OVERWRITE_DB) && !defined(SKIP_INSTALL_DB)

              
              
            

            

              122
              
pre-install:

            

            

              123
              
	@${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}."

            

            

              124
              
	@${ECHO} ""

            

            

              125
              
	@${ECHO} "In order to preserve your existing data, you should:"

            

            

              126
              
	@${ECHO} "	- dump all your databases"

            

            

              127
              
	@${ECHO} "	- kill mysql if it is running"

            

            

              128
              
	@${ECHO} "	- delete the ${DB_DIR} directory"

            

            

              129
              
	@${ECHO} "	- run 'make install'"

            

            

              130
              
	@${ECHO} "	- start up mysql"

            

            

              131
              
	@${ECHO} "	- re-create all of your database"

            

            

              132
              
	@${ECHO} "	- re-load your data"

            

            

              133
              
	@${ECHO} ""

            

            

              134
              
	@${ECHO} "If you understand the consequences of this upgrade, please re-build this"

            

            

              135
              
	@${ECHO} "port with the environment variable OVERWRITE_DB defined."

            

            

              136
              
	@${FALSE}

            

            

              137
              
.endif

            

            

              138
              

            

        

          139
          
post-install:

          119
          
post-install:

        

        

          140
          
.if !defined(PACKAGE_BUILDING)

          120
          
.if !defined(PACKAGE_BUILDING)

        

          
            

              141
              
.if !defined(SKIP_INSTALL_DB)


              121
              
.if exists(${DB_DIR}) && defined(OVERWRITE_DB)

            

            

              
              

              122
              
	@${RM} -r ${DB_DIR}/mysql ${DB_DIR}/test 2>/dev/null || true

            

            


              123
              
.endif

            

            


              124
              
.if !exists(${DB_DIR}) || defined(OVERWRITE_DB)

            

        

          142
          
.if defined(SKIP_DNS_CHECK)

          125
          
.if defined(SKIP_DNS_CHECK)

        

        

          143
          
	${PREFIX}/bin/mysql_install_db --force

          126
          
	${PREFIX}/bin/mysql_install_db --force

        

        

          144
          
.else

          127
          
.else

        



(-)mysql40-server/files/patch-sql::mysqld.cc
      (+12 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
--- sql/mysqld.cc.orig	Wed Feb  5 01:55:03 2003

            

            

              2
              
+++ sql/mysqld.cc	Wed Feb  5 01:57:06 2003

            

            

              3
              
@@ -104,7 +104,8 @@

            

            

              4
              
 int allow_severity = LOG_INFO;

            

            

              5
              
 int deny_severity = LOG_WARNING;

            

            

              6
              
 

            

            

              7
              
-#ifdef __STDC__

            

            

              8
              
+#include <osreldate.h>

            

            

              9
              
+#if defined(__STDC__) && __FreeBSD_version < 500000

            

            

              10
              
 #define my_fromhost(A)	   fromhost(A)

            

            

              11
              
 #define my_hosts_access(A) hosts_access(A)

            

            

              12
              
 #define my_eval_client(A)  eval_client(A)

            






  

  Return to bug 47945