openpkg-packages/mysql/mysql.patch

--- scripts/mysql_install_db.sh.dist	Wed Jan 29 12:29:21 2003
+++ scripts/mysql_install_db.sh	Wed Feb  5 09:56:12 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 mysql start"
     echo
   fi
   echo "Please report any problems with the @scriptdir@/mysqlbug script!"
--- scripts/msql2mysql.sh.dist	Tue Feb 11 09:50:29 2003
+++ scripts/msql2mysql.sh	Tue Feb 11 09:53:08 2003
@@ -13,4 +13,4 @@
 # described in the License.  Among other things, the License requires that
 # the copyright notice and this notice be preserved on all copies.
 
-@bindir@/replace msqlConnect mysql_connect msqlListDBs  mysql_list_dbs msqlNumRows mysql_num_rows msqlFetchRow mysql_fetch_row msqlFetchField mysql_fetch_field msqlFreeResult mysql_free_result msqlListFields mysql_list_fields msqlListTables mysql_list_tables msqlErrMsg 'mysql_error(mysql)' msqlStoreResult mysql_store_result msqlQuery mysql_query msqlField mysql_field msqlSelect mysql_select msqlSelectDB mysql_select_db msqlNumFields mysql_num_fields msqlClose mysql_close msqlDataSeek mysql_data_seek m_field MYSQL_FIELD m_result MYSQL_RES m_row MYSQL_ROW msql mysql mSQL mySQL MSQL MYSQL msqlCreateDB mysql_create_db msqlDropDB mysql_drop_db msqlFieldSeek mysql_field_seek -- $*
+@libexecdir@/replace msqlConnect mysql_connect msqlListDBs  mysql_list_dbs msqlNumRows mysql_num_rows msqlFetchRow mysql_fetch_row msqlFetchField mysql_fetch_field msqlFreeResult mysql_free_result msqlListFields mysql_list_fields msqlListTables mysql_list_tables msqlErrMsg 'mysql_error(mysql)' msqlStoreResult mysql_store_result msqlQuery mysql_query msqlField mysql_field msqlSelect mysql_select msqlSelectDB mysql_select_db msqlNumFields mysql_num_fields msqlClose mysql_close msqlDataSeek mysql_data_seek m_field MYSQL_FIELD m_result MYSQL_RES m_row MYSQL_ROW msql mysql mSQL mySQL MSQL MYSQL msqlCreateDB mysql_create_db msqlDropDB mysql_drop_db msqlFieldSeek mysql_field_seek -- $*
--- mysys/default.c.dist	Wed Jan 29 12:29:20 2003
+++ mysys/default.c	Wed Feb  5 09:58:40 2003
@@ -49,7 +49,7 @@
 #elif defined(__NETWARE__)
 "sys:/etc/",
 #else
-"/etc/",
+"@l_prefix@/etc/mysql/",
 #endif
 #ifdef DATADIR
 DATADIR,

=============================================================================

Fix two security bugs
OpenPKG-2004.014-mysql, CAN-2004-0381, CAN-2004-0388

Index: scripts/mysqlbug.sh
--- scripts/mysqlbug.sh.orig	2004-02-10 19:15:54.000000000 +0100
+++ scripts/mysqlbug.sh	2004-04-14 21:12:44.000000000 +0200
@@ -254,7 +254,7 @@
 if cmp -s $TEMP $TEMP.x
 then
   echo "File not changed, no bug report submitted."
-  cp $TEMP /tmp/failed-mysql-bugreport
+  mv -f $TEMP /tmp/failed-mysql-bugreport
   echo "The raw bug report exists in /tmp/failed-mysql-bugreport"
   echo "If you use this remember that the first lines of the report now is a lie.."
   exit 1
Index: scripts/mysqld_multi.sh
--- scripts/mysqld_multi.sh.orig	2004-02-10 19:16:06.000000000 +0100
+++ scripts/mysqld_multi.sh	2004-04-14 22:08:34.000000000 +0200
@@ -9,7 +9,7 @@
 $opt_config_file   = undef();
 $opt_example       = 0;
 $opt_help          = 0;
-$opt_log           = "/tmp/mysqld_multi.log";
+$opt_log           = "$ENV{HOME}/mysqld_multi.log";
 $opt_mysqladmin    = "@bindir@/mysqladmin";
 $opt_mysqld        = "@libexecdir@/mysqld";
 $opt_no_log        = 0;