diff options
| author | ale <ale@FreeBSD.org> | 2007-12-12 17:09:53 +0800 |
|---|---|---|
| committer | ale <ale@FreeBSD.org> | 2007-12-12 17:09:53 +0800 |
| commit | 63256430feb856c3896fcd01c59469c93818fb27 (patch) | |
| tree | 588027dba0455b19f10d1c7b62d1c44c36d150f3 /databases | |
| parent | bc325b210b876819d0c301394ae2213c6c1a01db (diff) | |
| download | freebsd-ports-gnome-63256430feb856c3896fcd01c59469c93818fb27.tar.gz freebsd-ports-gnome-63256430feb856c3896fcd01c59469c93818fb27.tar.zst freebsd-ports-gnome-63256430feb856c3896fcd01c59469c93818fb27.zip | |
Backport a couple of small enhancement from mysql 5.1 port.
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql50-server/files/patch-client_mysql_upgrade.c | 13 | ||||
| -rw-r--r-- | databases/mysql50-server/files/patch-scripts_mysqld_safe.sh | 24 |
2 files changed, 37 insertions, 0 deletions
diff --git a/databases/mysql50-server/files/patch-client_mysql_upgrade.c b/databases/mysql50-server/files/patch-client_mysql_upgrade.c new file mode 100644 index 000000000000..36cdf88f450e --- /dev/null +++ b/databases/mysql50-server/files/patch-client_mysql_upgrade.c @@ -0,0 +1,13 @@ +--- client/mysql_upgrade.c.orig 2007-11-15 15:06:52.000000000 +0100 ++++ client/mysql_upgrade.c 2007-12-12 10:07:23.000000000 +0100 +@@ -411,10 +411,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 + */ diff --git a/databases/mysql50-server/files/patch-scripts_mysqld_safe.sh b/databases/mysql50-server/files/patch-scripts_mysqld_safe.sh new file mode 100644 index 000000000000..960a8458d37a --- /dev/null +++ b/databases/mysql50-server/files/patch-scripts_mysqld_safe.sh @@ -0,0 +1,24 @@ +--- scripts/mysqld_safe.sh.orig 2007-12-12 10:04:16.000000000 +0100 ++++ scripts/mysqld_safe.sh 2007-12-12 10:04:52.000000000 +0100 +@@ -152,10 +152,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 + echo "WARNING: Found two instances of my.cnf -" +- echo "$MY_BASEDIR_VERSION/my.cnf and" ++ echo "$MY_BASEDIR_VERSION/etc/my.cnf and" + echo "$DATADIR/my.cnf" + echo "IGNORING $DATADIR/my.cnf" + echo +@@ -163,7 +163,7 @@ + elif test -r "$DATADIR/my.cnf" + then + echo "WARNING: Found $DATADIR/my.cnf" +- echo "Datadir is deprecated place for my.cnf, please move it to $MY_BASEDIR_VERSION" ++ echo "Datadir is deprecated place for my.cnf, please move it to $MY_BASEDIR_VERSION/etc" + echo + MYSQL_HOME=$DATADIR + else |