[csw-devel] SF.net SVN: gar:[15874] csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw

[wahwah at users.sourceforge.net]

Revision: 15874
          http://gar.svn.sourceforge.net/gar/?rev=15874&view=rev
Author:   wahwah
Date:     2011-10-05 22:37:18 +0000 (Wed, 05 Oct 2011)
Log Message:
-----------
pkg/mysql5/branches/mysql-5.1.x-optcsw: versioned datadir

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile

Added Paths:
-----------
    csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0008-versioned-datadir-in-mysql_install_db-5.1.patch

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile	2011-10-05 22:32:13 UTC (rev 15873)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile	2011-10-05 22:37:18 UTC (rev 15874)
@@ -138,6 +138,7 @@
 # Perhaps using sed would be better, but we have a patch for now.
 # PATCHFILES += 0006-Use-my_print_defaults-$(BASE_VERSION).patch
 PATCHFILES += 0007-versioned-mysqld-during-db-init-5.1.patch
+PATCHFILES += 0008-versioned-datadir-in-mysql_install_db-5.1.patch
 
 # Enable 64 bits build
 BUILD64 = 1

Added: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0008-versioned-datadir-in-mysql_install_db-5.1.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0008-versioned-datadir-in-mysql_install_db-5.1.patch	                        (rev 0)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0008-versioned-datadir-in-mysql_install_db-5.1.patch	2011-10-05 22:37:18 UTC (rev 15874)
@@ -0,0 +1,32 @@
+From 2af244ab762435df59046f19ad492bd6d8862e62 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Thu, 6 Oct 2011 00:34:17 +0200
+Subject: [PATCH] versioned datadir in mysql_install_db 5.1
+
+---
+ scripts/mysql_install_db.sh |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
+index 1a00691..8792c2b 100644
+--- a/scripts/mysql_install_db.sh
++++ b/scripts/mysql_install_db.sh
+@@ -265,13 +265,13 @@ then
+     cannot_find_file mysqld-5.1 $basedir/libexec $basedir/sbin $basedir/bin
+     exit 1
+   fi
+-  langdir=`find_in_basedir --dir errmsg.sys share/english share/mysql/english`
++  langdir=`find_in_basedir --dir errmsg.sys share/english share/mysql/english share/mysql/5.1/mysql/english`
+   if test -z "$langdir"
+   then
+     cannot_find_file errmsg.sys $basedir/share/english $basedir/share/mysql/english
+     exit 1
+   fi
+-  pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql`
++  pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql share/mysql/5.1/mysql`
+   if test -z "$pkgdatadir"
+   then
+     cannot_find_file fill_help_tables.sql $basedir/share $basedir/share/mysql
+-- 
+1.7.6.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.