[Midnightbsd-cvs] mports: mysql51-server/files:

[laffer1 at midnightbsd.org]

Log Message:
-----------


Added Files:
-----------
    mports/databases/mysql51-server/files:
        patch-client_mysql_upgrade.c (r1.1)
        patch-scripts_mysqld_safe.sh (r1.1)

-------------- next part --------------
--- /dev/null
+++ databases/mysql51-server/files/patch-scripts_mysqld_safe.sh
@@ -0,0 +1,24 @@
+--- scripts/mysqld_safe.sh.orig	2007-10-08 10:39:23.000000000 +0200
++++ scripts/mysqld_safe.sh	2007-10-08 10:40:52.000000000 +0200
+@@ -242,10 +242,10 @@
+ 
+ if test -z "$MYSQL_HOME"
+ then 
+-  if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf"
++  if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf"
+   then
+     log_error "WARNING: Found two instances of my.cnf -
+-$MY_BASEDIR_VERSION/my.cnf and
++$MY_BASEDIR_VERSION/etc/my.cnf and
+ $DATADIR/my.cnf
+ IGNORING $DATADIR/my.cnf"
+ 
+@@ -254,7 +254,7 @@
+   then
+     log_error "WARNING: Found $DATADIR/my.cnf
+ The data directory is a deprecated location for my.cnf, please move it to
+-$MY_BASEDIR_VERSION/my.cnf"
++$MY_BASEDIR_VERSION/etc/my.cnf"
+     MYSQL_HOME=$DATADIR
+   else
+     MYSQL_HOME=$MY_BASEDIR_VERSION
--- /dev/null
+++ databases/mysql51-server/files/patch-client_mysql_upgrade.c
@@ -0,0 +1,13 @@
+--- client/mysql_upgrade.c.orig	2008-01-29 22:42:00.000000000 +0100
++++ client/mysql_upgrade.c	2008-02-14 08:29:52.000000000 +0100
+@@ -427,10 +427,6 @@
+ 
+   verbose("Looking for '%s' in: %s", tool_name, tool_path);
+ 
+-  /* Make sure the tool exists */
+-  if (my_access(tool_path, F_OK) != 0)
+-    die("Can't find '%s'", tool_path);
+-
+   /*
+     Make sure it can be executed
+   */