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

[lblume at users.sourceforge.net]

Revision: 25358
          http://sourceforge.net/p/gar/code/25358
Author:   lblume
Date:     2015-11-04 13:06:03 +0000 (Wed, 04 Nov 2015)
Log Message:
-----------
mysql5/branches/mysql-5.6.x: Switch the default operation mode to the kernel ISA

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/README.CSW
    csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/cswmysql56.tpl

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/README.CSW
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/README.CSW	2015-11-03 10:50:59 UTC (rev 25357)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/README.CSW	2015-11-04 13:06:03 UTC (rev 25358)
@@ -18,9 +18,6 @@
     Running MySQL is handled by the cswmysql56 service.
 
   * The preferred architecture can be set using mysql56_arch=<arch> in csw.conf:
-    the current default (no value) is to use the 32-bit version, to avoid 
-    changing the architecture without user interaction. Since 32-bit hardware
-    is becoming scarce, This may be modified in a future Mysql release (5.6) to
-    have the kernel ISA be the default.
+    the current default (no value) is to use the same ISA as the kernel.
     Possible value are: sparcv9 amd64
 

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/cswmysql56.tpl
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/cswmysql56.tpl	2015-11-03 10:50:59 UTC (rev 25357)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/cswmysql56.tpl	2015-11-04 13:06:03 UTC (rev 25358)
@@ -216,23 +216,38 @@
   fi
 fi
 
-# If a value was found
-if [ -n "$mysql56_arch" ]; then
-  if [ "$mysql56_arch" = "kernel" ]; then
-    # Use the system's default arch
-    mysql56_arch=`isainfo -k`
+# If no value, use the kernel
+if [ -z "$mysql56_arch" ]; then
+  mysql56_arch=kernel
+fi
+
+# At this point, it must have a value
+if [ "$mysql56_arch" = "kernel" ]; then
+  # Use the system's default arch
+  mysql56_arch=`isainfo -k`
+fi
+
+# Check the value selected is supported
+for a in `isainfo`; do
+  if [ "$a" = "$mysql56_arch" ]; then
+    arch_supported=1
   fi
 
-  # Add the architecture suffix to the executables' directories, if it exists
-  # The binaries themselves are tested below, so the script should fail
-  # mostly gracefully if a non-present arch is set up.
-  if [ -d "$bindir/$mysql56_arch" -a \
-       -d "$sbindir/$mysql56_arch" -a \
-       -d "$libexecdir/$mysql56_arch" ]; then
-    bindir="$bindir/$mysql56_arch"
-    sbindir="$sbindir/$mysql56_arch"
-    libexecdir="$libexecdir/$mysql56_arch"
+  if [ -z "$arch_supported" ]; then
+    echo "The selected value for mysql56_arch ($mysql56_arch) is invalid on this system."
+    exit 1
   fi
+done
+
+# Add the architecture suffix to the executables' directories, if it exists
+# The binaries themselves are tested below, so the script should fail
+# mostly gracefully if a non-present arch is set up.
+if [ -d "$bindir/$mysql56_arch" -a \
+     -d "$sbindir/$mysql56_arch" -a \
+     -d "$libexecdir/$mysql56_arch" ]; then
+  bindir="$bindir/$mysql56_arch"
+  sbindir="$sbindir/$mysql56_arch"
+  libexecdir="$libexecdir/$mysql56_arch"
 fi
 ### END OPENCSW ARCHITECTURE SELECTION
 

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