SF.net SVN: gar:[24105] csw/mgar/pkg/mysql5/branches/mysql-5.6.x

[lblume at users.sourceforge.net]

Revision: 24105
          http://sourceforge.net/p/gar/code/24105
Author:   lblume
Date:     2014-09-16 12:18:26 +0000 (Tue, 16 Sep 2014)
Log Message:
-----------
mysql5/branches/mysql-5.6.x: Add patch for default config location issue

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

Added Paths:
-----------
    csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/0006-default-cnf-location.patch

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile	2014-09-16 11:50:12 UTC (rev 24104)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile	2014-09-16 12:18:26 UTC (rev 24105)
@@ -44,6 +44,9 @@
   (Structured Query Language) database server.
 endef
 
+# DB install script looks at the wrong place
+PATCHFILES += 0006-default-cnf-location.patch
+
 # Comes from the MySQL5.5 recipe, though only one compiler will be kept in 5.6
 ### For GCC4
 EXTRA_CFLAGS_GCC4_sparc += -mno-app-regs

Added: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/0006-default-cnf-location.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/0006-default-cnf-location.patch	                        (rev 0)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/0006-default-cnf-location.patch	2014-09-16 12:18:26 UTC (rev 24105)
@@ -0,0 +1,15 @@
+diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in
+index 6a12a40..dfe2317 100644
+--- a/scripts/mysql_install_db.pl.in
++++ b/scripts/mysql_install_db.pl.in
+@@ -474,8 +474,8 @@ $config_file= "$basedir/my.$cnfext";
+ my $cfg_template= find_in_basedir($opt,"file","my-default.$cnfext",
+ 				  ".", "share","share/mysql","support-files");
+ # Distros might move files
+-if ((! -r $cfg_template) && (-r "@pkgdatadir@/my-default.cnf")) {
+-  $cfg_template = "@pkgdatadir@/my-default.cnf";
++if ((! -r $cfg_template) && (-r "@pkgdatadir@/support-files/my-default.cnf")) {
++  $cfg_template = "@pkgdatadir@/support-files/my-default.cnf";
+ }
+ 
+ -e $cfg_template or cannot_find_file("my-default.$cnfext");

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