[csw-devel] SF.net SVN: gar:[10727] csw/mgar/pkg/mysql5/branches/mysql-5.1.x
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Thu Aug 12 12:06:43 CEST 2010
Revision: 10727
http://gar.svn.sourceforge.net/gar/?rev=10727&view=rev
Author: wahwah
Date: 2010-08-12 10:06:43 +0000 (Thu, 12 Aug 2010)
Log Message:
-----------
mysql-5.1: Update to the my.cnf patch.
Modified Paths:
--------------
csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile
csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums
Added Paths:
-----------
csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch
Removed Paths:
-------------
csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-basedir-and-datadir-in-the-cnf-files.patch
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile 2010-08-12 08:21:26 UTC (rev 10726)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile 2010-08-12 10:06:43 UTC (rev 10727)
@@ -42,7 +42,7 @@
PATCHFILES = 0001-Use-libc-not-libcrypt.patch
PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch
PATCHFILES += 0003-OpenCSW-perl-for-tests.patch
-PATCHFILES += 0004-basedir-and-datadir-in-the-cnf-files.patch
+PATCHFILES += 0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch
SPKG_DESC_CSW$(GARNAME) = Multithreaded SQL database
SPKG_DESC_CSW$(GARNAME)bench = MySQL $(BASE_VERSION) benchmarking
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums 2010-08-12 08:21:26 UTC (rev 10726)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums 2010-08-12 10:06:43 UTC (rev 10727)
@@ -1,7 +1,7 @@
8940e0673e599689932e94fec906aec9 0001-Use-libc-not-libcrypt.patch
1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch
5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch
-8303cd39dd86f9f01f1f0f01b15fe37d 0004-basedir-and-datadir-in-the-cnf-files.patch
+0cea0d771ff324ccdd31de4b6311b12f 0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch
a1008df3aee0528449eb18f39bc21603 CSWmysql51.postinstall
fe58fe0af20a51143893495b56964682 CSWmysql51.preinstall
e691b0cf00a3925ac55c1844045d6e30 ChangeLog
Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-basedir-and-datadir-in-the-cnf-files.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-basedir-and-datadir-in-the-cnf-files.patch 2010-08-12 08:21:26 UTC (rev 10726)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-basedir-and-datadir-in-the-cnf-files.patch 2010-08-12 10:06:43 UTC (rev 10727)
@@ -1,81 +0,0 @@
-From 194dbf9ff230f747bb093970831fbdf4cb0f0674 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= <blizinski at google.com>
-Date: Wed, 16 Sep 2009 01:38:35 +0100
-Subject: [PATCH 4/4] basedir and datadir in the cnf files
-
----
- support-files/my-huge.cnf.sh | 2 ++
- support-files/my-innodb-heavy-4G.cnf.sh | 2 ++
- support-files/my-large.cnf.sh | 2 ++
- support-files/my-medium.cnf.sh | 2 ++
- support-files/my-small.cnf.sh | 2 ++
- 5 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh
-index e4747ac..907b41d 100644
---- a/support-files/my-huge.cnf.sh
-+++ b/support-files/my-huge.cnf.sh
-@@ -23,6 +23,8 @@ socket = @MYSQL_UNIX_ADDR@
-
- # The MySQL server
- [mysqld]
-+basedir = /opt/csw/mysql51
-+datadir = /var/opt/csw/mysql51
- port = @MYSQL_TCP_PORT@
- socket = @MYSQL_UNIX_ADDR@
- skip-locking
-diff --git a/support-files/my-innodb-heavy-4G.cnf.sh b/support-files/my-innodb-heavy-4G.cnf.sh
-index cda11d6..a9d5514 100644
---- a/support-files/my-innodb-heavy-4G.cnf.sh
-+++ b/support-files/my-innodb-heavy-4G.cnf.sh
-@@ -39,6 +39,8 @@ socket = @MYSQL_UNIX_ADDR@
- # The MySQL server
- #
- [mysqld]
-+basedir = /opt/csw/mysql51
-+datadir = /var/opt/csw/mysql51
-
- # generic configuration options
- port = @MYSQL_TCP_PORT@
-diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh
-index 981b137..8b890fb 100644
---- a/support-files/my-large.cnf.sh
-+++ b/support-files/my-large.cnf.sh
-@@ -23,6 +23,8 @@ socket = @MYSQL_UNIX_ADDR@
-
- # The MySQL server
- [mysqld]
-+basedir = /opt/csw/mysql51
-+datadir = /var/opt/csw/mysql51
- port = @MYSQL_TCP_PORT@
- socket = @MYSQL_UNIX_ADDR@
- skip-locking
-diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh
-index c3135ea..ef841db 100644
---- a/support-files/my-medium.cnf.sh
-+++ b/support-files/my-medium.cnf.sh
-@@ -24,6 +24,8 @@ socket = @MYSQL_UNIX_ADDR@
-
- # The MySQL server
- [mysqld]
-+basedir = /opt/csw/mysql51
-+datadir = /var/opt/csw/mysql51
- port = @MYSQL_TCP_PORT@
- socket = @MYSQL_UNIX_ADDR@
- skip-locking
-diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh
-index 24c0840..89299dd 100644
---- a/support-files/my-small.cnf.sh
-+++ b/support-files/my-small.cnf.sh
-@@ -24,7 +24,8 @@ socket = @MYSQL_UNIX_ADDR@
-
- # The MySQL server
- [mysqld]
-+basedir = /opt/csw/mysql51
-+datadir = /var/opt/csw/mysql51
- port = @MYSQL_TCP_PORT@
- socket = @MYSQL_UNIX_ADDR@
- skip-locking
---
-1.6.3.2
-
Added: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch (rev 0)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch 2010-08-12 10:06:43 UTC (rev 10727)
@@ -0,0 +1,81 @@
+From b46fd72320554ec86a256a859006a04de8e68564 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Thu, 12 Aug 2010 12:00:14 +0200
+Subject: [PATCH] /var/opt/csw/mysql51 for datadir in my-*.cnf
+
+---
+ support-files/my-huge.cnf.sh | 2 ++
+ support-files/my-innodb-heavy-4G.cnf.sh | 2 ++
+ support-files/my-large.cnf.sh | 2 ++
+ support-files/my-medium.cnf.sh | 2 ++
+ support-files/my-small.cnf.sh | 2 ++
+ 5 files changed, 10 insertions(+), 0 deletions(-)
+
+diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh
+index 17a7ddb..51c0531 100644
+--- a/support-files/my-huge.cnf.sh
++++ b/support-files/my-huge.cnf.sh
+@@ -23,6 +23,8 @@ socket = @MYSQL_UNIX_ADDR@
+
+ # The MySQL server
+ [mysqld]
++basedir = /opt/csw/mysql51
++datadir = /var/opt/csw/mysql51
+ port = @MYSQL_TCP_PORT@
+ socket = @MYSQL_UNIX_ADDR@
+ skip-locking
+diff --git a/support-files/my-innodb-heavy-4G.cnf.sh b/support-files/my-innodb-heavy-4G.cnf.sh
+index e9390a5..fb62231 100644
+--- a/support-files/my-innodb-heavy-4G.cnf.sh
++++ b/support-files/my-innodb-heavy-4G.cnf.sh
+@@ -39,6 +39,8 @@ socket = @MYSQL_UNIX_ADDR@
+ # The MySQL server
+ #
+ [mysqld]
++basedir = /opt/csw/mysql51
++datadir = /var/opt/csw/mysql51
+
+ # generic configuration options
+ port = @MYSQL_TCP_PORT@
+diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh
+index bbdfdb3..f3dec5d 100644
+--- a/support-files/my-large.cnf.sh
++++ b/support-files/my-large.cnf.sh
+@@ -23,6 +23,8 @@ socket = @MYSQL_UNIX_ADDR@
+
+ # The MySQL server
+ [mysqld]
++basedir = /opt/csw/mysql51
++datadir = /var/opt/csw/mysql51
+ port = @MYSQL_TCP_PORT@
+ socket = @MYSQL_UNIX_ADDR@
+ skip-locking
+diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh
+index 88113d0..18f6405 100644
+--- a/support-files/my-medium.cnf.sh
++++ b/support-files/my-medium.cnf.sh
+@@ -24,6 +24,8 @@ socket = @MYSQL_UNIX_ADDR@
+
+ # The MySQL server
+ [mysqld]
++basedir = /opt/csw/mysql51
++datadir = /var/opt/csw/mysql51
+ port = @MYSQL_TCP_PORT@
+ socket = @MYSQL_UNIX_ADDR@
+ skip-locking
+diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh
+index 3bfa08d..a20fdc5 100644
+--- a/support-files/my-small.cnf.sh
++++ b/support-files/my-small.cnf.sh
+@@ -24,6 +24,8 @@ socket = @MYSQL_UNIX_ADDR@
+
+ # The MySQL server
+ [mysqld]
++basedir = /opt/csw/mysql51
++datadir = /var/opt/csw/mysql51
+ port = @MYSQL_TCP_PORT@
+ socket = @MYSQL_UNIX_ADDR@
+ skip-locking
+--
+1.7.1
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list