Explorar el Código

missing files from previous commit

Michael van Elst hace 23 años
padre
commit
78d56069d4
Se han modificado 2 ficheros con 55 adiciones y 0 borrados
  1. 3 0
      mysql/my.pwd
  2. 52 0
      mysql/mysql-initdb.patch

+ 3 - 0
mysql/my.pwd

@@ -0,0 +1,3 @@
+[mysqladmin]
+user     = root
+password = 

+ 52 - 0
mysql/mysql-initdb.patch

@@ -0,0 +1,52 @@
+--- mysql/scripts/mysql_install_db.sh    Mon Dec  2 17:40:15 2002
++++ mysql.new/scripts/mysql_install_db.sh Mon Dec  2 17:41:41 2002
+@@ -133,14 +133,13 @@
+   fi
+ fi
+ 
+-# Create database directories mysql & test
++# Create database directories mysql
+ if test "$IN_RPM" -eq 0
+ 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
+ 
+@@ -176,8 +175,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');
+-  INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y');"
+ fi
+ 
+ if test ! -f $mdata/host.frm
+@@ -232,10 +229,8 @@
+   INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
+   
+   REPLACE INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
+-  REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
++  REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');"
+   
+-  INSERT INTO user VALUES ('localhost','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N');
+-  INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N');"
+ fi
+ 
+ if test ! -f $mdata/func.frm
+@@ -333,10 +328,8 @@
+   if test "$IN_RPM" -eq 0
+   then
+     echo "You can start the MySQL daemon with:"
+-    echo "cd @prefix@ ; $bindir/safe_mysqld &"
++    echo "@l_prefix@/etc/rc mysql start"
+     echo
+-    echo "You can test the MySQL daemon with the benchmarks in the 'sql-bench' directory:"
+-    echo "cd sql-bench ; run-all-tests"
+     echo
+   fi
+   echo "Please report any problems with the @scriptdir@/mysqlbug script!"