From f982be45e81588a27383cd1a3eb12789b8498904 Mon Sep 17 00:00:00 2001 From: cvs2svn Date: Wed, 19 Nov 2008 10:43:57 +0000 Subject: This commit was manufactured by cvs2svn to create tag 'RELEASE_6_4_0'. --- .../files/patch-scripts_mysqld_safe.sh | 24 ---------------------- 1 file changed, 24 deletions(-) delete mode 100644 databases/mysql55-server/files/patch-scripts_mysqld_safe.sh (limited to 'databases/mysql55-server/files/patch-scripts_mysqld_safe.sh') diff --git a/databases/mysql55-server/files/patch-scripts_mysqld_safe.sh b/databases/mysql55-server/files/patch-scripts_mysqld_safe.sh deleted file mode 100644 index 2a30469922f0..000000000000 --- a/databases/mysql55-server/files/patch-scripts_mysqld_safe.sh +++ /dev/null @@ -1,24 +0,0 @@ ---- 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 -- cgit v1.2.3