OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 19-Mar-2003 08:58:41
Branch: OPENPKG_1_1_SOLID Handle: 2003031907584000
Modified files: (Branch: OPENPKG_1_1_SOLID)
openpkg-src/mysql my.cnf mysql.patch
Log:
add missing fix from 3.23.56
Summary:
Revision Changes Path
1.2.2.2 +1 -1 openpkg-src/mysql/my.cnf
1.1.2.2 +31 -2 openpkg-src/mysql/mysql.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/my.cnf
============================================================================
$ cvs diff -u -r1.2.2.1 -r1.2.2.2 my.cnf
--- openpkg-src/mysql/my.cnf 18 Mar 2003 15:33:58 -0000 1.2.2.1
+++ openpkg-src/mysql/my.cnf 19 Mar 2003 07:58:40 -0000 1.2.2.2
@@ -1,6 +1,6 @@
[safe_mysqld]
-datadir = @l_prefix@/var/mysql/db
+datadir = @l_prefix@/var/mysql
socket = @l_prefix@/var/mysql/mysqld.sock
set-variable = [EMAIL PROTECTED]@/var/mysql/mysqld.pid
set-variable = max_connections=1000
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.patch
============================================================================
$ cvs diff -u -r1.1.2.1 -r1.1.2.2 mysql.patch
--- openpkg-src/mysql/mysql.patch 18 Mar 2003 15:33:58 -0000 1.1.2.1
+++ openpkg-src/mysql/mysql.patch 19 Mar 2003 07:58:40 -0000 1.1.2.2
@@ -70,8 +70,16 @@
errmsg = "Failed copying .GMD file: errno = %d";
error= HA_ADMIN_FAILED;
--- mysys/default.c.dist Tue Mar 18 10:44:27 2003
-+++ mysys/default.c Tue Mar 18 12:30:06 2003
-@@ -48,7 +48,7 @@
++++ mysys/default.c Wed Mar 19 01:26:07 2003
+@@ -39,6 +39,7 @@
+ #include "mysys_priv.h"
+ #include "m_string.h"
+ #include "m_ctype.h"
++#include <my_dir.h>
+
+ char *defaults_extra_file=0;
+
+@@ -48,7 +49,7 @@
#ifdef __WIN__
"C:/",
#else
@@ -80,6 +88,27 @@
#endif
#ifdef DATADIR
DATADIR,
+@@ -241,6 +242,20 @@
+ {
+ strmov(name,config_file);
+ }
++ fn_format(name,name,"","",4);
++#if !defined(__WIN__) && !defined(OS2)
++ {
++ MY_STAT stat_info;
++ if (!my_stat(name,&stat_info,MYF(0)))
++ return 0;
++ if (stat_info.st_mode & S_IWOTH) /* ignore world-writeable files */
++ {
++ fprintf(stderr, "warning: World-writeable config file %s is ignored\n",
++ name);
++ return 0;
++ }
++ }
++#endif
+ if (!(fp = my_fopen(fn_format(name,name,"","",4),O_RDONLY,MYF(0))))
+ return 0; /* Ignore wrong files */
+
--- mysys/my_copy.c.dist Tue Mar 18 10:44:36 2003
+++ mysys/my_copy.c Tue Mar 18 12:25:16 2003
@@ -32,17 +32,29 @@
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
