OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Nov-2005 18:13:44
Branch: HEAD Handle: 2005110717134300
Modified files:
openpkg-src/mysql mysql.patch mysql.spec
Log:
move DATADIR subst into mysql.patch to be more in sync with the
remaining MySQL patching
Summary:
Revision Changes Path
1.19 +21 -9 openpkg-src/mysql/mysql.patch
1.133 +1 -2 openpkg-src/mysql/mysql.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.patch
============================================================================
$ cvs diff -u -r1.18 -r1.19 mysql.patch
--- openpkg-src/mysql/mysql.patch 7 Oct 2005 21:51:06 -0000 1.18
+++ openpkg-src/mysql/mysql.patch 7 Nov 2005 17:13:43 -0000 1.19
@@ -1,6 +1,6 @@
Index: include/Makefile.in
---- include/Makefile.in.orig 2005-08-17 19:07:18.000000000 +0200
-+++ include/Makefile.in 2005-10-07 22:33:25.711132965 +0200
+--- include/Makefile.in.orig 2005-10-10 00:47:19 +0200
++++ include/Makefile.in 2005-11-07 18:12:04 +0100
@@ -330,14 +330,14 @@
errmsg.h my_global.h my_net.h my_alloc.h \
my_getopt.h sslopt-longopts.h my_dir.h typelib.h \
@@ -20,9 +20,9 @@
mysql_version.h.in my_handler.h my_time.h
Index: include/my_global.h
---- include/my_global.h.orig 2005-08-17 19:06:28.000000000 +0200
-+++ include/my_global.h 2005-10-07 22:58:45.677758340 +0200
-@@ -676,9 +676,8 @@
+--- include/my_global.h.orig 2005-10-10 00:46:23 +0200
++++ include/my_global.h 2005-11-07 18:12:04 +0100
+@@ -680,9 +680,8 @@
#define FLT_MAX ((float)3.40282346638528860e+38)
#endif
@@ -34,8 +34,8 @@
/*
Max size that must be added to a so that we know Size to make
Index: scripts/mysql_config.sh
---- scripts/mysql_config.sh.orig 2005-08-17 19:06:30.000000000 +0200
-+++ scripts/mysql_config.sh 2005-10-07 22:33:25.711956605 +0200
+--- scripts/mysql_config.sh.orig 2005-10-10 00:46:25 +0200
++++ scripts/mysql_config.sh 2005-11-07 18:12:04 +0100
@@ -93,11 +93,11 @@
# Create options
@@ -51,8 +51,8 @@
cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
include="-I$pkgincludedir"
Index: scripts/mysql_create_system_tables.sh
---- scripts/mysql_create_system_tables.sh.orig 2005-08-17
19:06:38.000000000 +0200
-+++ scripts/mysql_create_system_tables.sh 2005-10-07 22:33:25.712540957
+0200
+--- scripts/mysql_create_system_tables.sh.orig 2005-10-10 00:46:35
+0200
++++ scripts/mysql_create_system_tables.sh 2005-11-07 18:12:04 +0100
@@ -71,9 +71,6 @@
c_d="$c_d ) engine=MyISAM"
c_d="$c_d CHARACTER SET utf8 COLLATE utf8_bin"
@@ -83,3 +83,15 @@
else
i_u="$i_u
INSERT INTO user VALUES
('localhost','','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);"
+Index: scripts/mysqld_safe.sh
+--- scripts/mysqld_safe.sh.orig 2005-10-10 00:46:44 +0200
++++ scripts/mysqld_safe.sh 2005-11-07 18:12:04 +0100
+@@ -121,7 +121,7 @@
+ # Next try where the source installs put it
+ elif test -d $MY_BASEDIR_VERSION/var/mysql
+ then
+- DATADIR=$MY_BASEDIR_VERSION/var
++ DATADIR=$MY_BASEDIR_VERSION/var/mysql
+ # Or just give up and use our compiled-in default
+ else
+ [EMAIL PROTECTED]@
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.spec
============================================================================
$ cvs diff -u -r1.132 -r1.133 mysql.spec
--- openpkg-src/mysql/mysql.spec 29 Oct 2005 15:39:45 -0000 1.132
+++ openpkg-src/mysql/mysql.spec 7 Nov 2005 17:13:43 -0000 1.133
@@ -39,7 +39,7 @@
Group: Database
License: GPL
Version: %{V_opkg}
-Release: 20051029
+Release: 20051107
# package options
%option with_server yes
@@ -88,7 +88,6 @@
%prep
%setup -q
%patch -p0
- %{l_shtool} subst -e 's;\(DATADIR=.*/var$\);\1/mysql;'
scripts/mysqld_safe.sh
%build
# patch file search path
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
