1999-01-05 23:43:28 +00:00
|
|
|
--- scripts/mysql_install_db.sh.orig Fri Jan 1 15:33:33 1999
|
|
|
|
+++ scripts/mysql_install_db.sh Wed Jan 6 00:10:55 1999
|
|
|
|
@@ -13,8 +13,8 @@
|
|
|
|
execdir=@libexecdir@
|
|
|
|
bindir=@bindir@
|
1998-12-22 18:01:44 +00:00
|
|
|
|
1998-12-24 01:14:13 +00:00
|
|
|
-# Are we doing an rpm install?
|
1998-11-21 20:13:52 +00:00
|
|
|
-if test "$1" = "-IN-RPM"; then IN_RPM=1; shift; fi
|
1998-12-22 18:01:44 +00:00
|
|
|
+# pretend we're doing an RPM install
|
|
|
|
+IN_RPM=1
|
1998-03-16 02:46:42 +00:00
|
|
|
|
1999-01-05 23:43:28 +00:00
|
|
|
# Get mysqld/safe_mysqld options from /etc/my.cnf or ~/.my.cnf
|
|
|
|
if test -w /
|
|
|
|
@@ -57,8 +57,6 @@
|
1998-12-24 01:14:13 +00:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
-# On IRIX hostname is in /usr/bsd so add this to the path
|
|
|
|
-PATH=$PATH:/usr/bsd
|
1998-09-06 19:58:26 +00:00
|
|
|
hostname=`hostname` # Install this too in the user table
|
|
|
|
|
1998-12-24 01:14:13 +00:00
|
|
|
# Check if hostname is valid
|
1999-01-05 23:43:28 +00:00
|
|
|
@@ -74,14 +72,11 @@
|
1998-12-24 01:14:13 +00:00
|
|
|
fi
|
|
|
|
|
1998-11-21 20:13:52 +00:00
|
|
|
# Create database directories mysql & test
|
1998-12-22 18:01:44 +00:00
|
|
|
-if test -z "$IN_RPM"
|
|
|
|
-then
|
1998-12-24 01:14:13 +00:00
|
|
|
- if test ! -d $ldata; then mkdir $ldata; fi
|
|
|
|
- if test ! -d $ldata/mysql; then mkdir $ldata/mysql; fi
|
|
|
|
- if test ! -d $ldata/test; then mkdir $ldata/test; fi
|
1999-01-05 23:43:28 +00:00
|
|
|
- if test -w / -a ! -z "$user"; then
|
|
|
|
- chown $user $ldata $ldata/mysql $ldata/test;
|
|
|
|
- fi
|
1998-12-24 01:14:13 +00:00
|
|
|
+if test ! -d $ldata; then mkdir $ldata; fi
|
|
|
|
+if test ! -d $ldata/mysql; then mkdir $ldata/mysql; fi
|
|
|
|
+if test ! -d $ldata/test; then mkdir $ldata/test; fi
|
1999-01-05 23:43:28 +00:00
|
|
|
+if test -w / -a ! -z "$user"; then
|
|
|
|
+ chown $user $ldata $ldata/mysql $ldata/test;
|
|
|
|
fi
|
1998-12-22 18:01:44 +00:00
|
|
|
|
|
|
|
# Initialize variables
|