--- scripts/mysql_install_db.sh.dist	Thu Jan 16 13:44:25 2003
+++ scripts/mysql_install_db.sh	Thu Jan 16 13:59:19 2003
@@ -138,9 +138,8 @@
 then
   if test ! -d $ldata; then mkdir $ldata; chmod 700 $ldata ; fi
   if test ! -d $ldata/mysql; then mkdir $ldata/mysql;  chmod 700 $ldata/mysql ; fi
-  if test ! -d $ldata/test; then mkdir $ldata/test;  chmod 700 $ldata/test ; fi
   if test -w / -a ! -z "$user"; then
-    chown $user $ldata $ldata/mysql $ldata/test;
+    chown $user $ldata $ldata/mysql
   fi
 fi
 
@@ -178,8 +177,6 @@
   c_d="$c_d )"
   c_d="$c_d comment='Database privileges';"
   
-  i_d="INSERT INTO db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y');
-  INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y');"
 fi
 
 if test ! -f $mdata/host.frm
@@ -250,10 +247,7 @@
   INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
   
   REPLACE INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
-  REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
-  
-  INSERT INTO user (host,user) values ('localhost','');
-  INSERT INTO user (host,user) values ('$hostname','');"
+  REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);"
 fi
 
 if test ! -f $mdata/func.frm
@@ -351,10 +345,7 @@
   if test "$IN_RPM" -eq 0
   then
     echo "You can start the MySQL daemon with:"
-    echo "cd @prefix@ ; $bindir/mysqld_safe &"
-    echo
-    echo "You can test the MySQL daemon with the benchmarks in the 'sql-bench' directory:"
-    echo "cd sql-bench ; perl run-all-tests"
+    echo "@l_prefix@/etc/rc mysql4 start"
     echo
   fi
   echo "Please report any problems with the @scriptdir@/mysqlbug script!"
--- mysys/default.c.dist	Thu Jan 16 13:43:20 2003
+++ mysys/default.c	Thu Jan 16 13:57:57 2003
@@ -47,7 +47,7 @@
 #ifdef __WIN__
 "C:/",
 #else
-"/etc/",
+"@l_prefix@/etc/mysql4/",
 #endif
 #ifdef DATADIR
 DATADIR,