--- a/components/mysql-5-5/mysql-55.p5m Fri Jan 23 17:31:40 2015 -0800
+++ b/components/mysql-5-5/mysql-55.p5m Tue Feb 03 19:24:25 2015 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -28,26 +28,17 @@
set name=com.oracle.info.description \
value="MySQL is a fast, stable and true multi-user, multi-threaded SQL database server."
set name=info.classification \
- value="org.opensolaris.category.2008:Development/Databases"
+ value=org.opensolaris.category.2008:Development/Databases
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2013/333
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license mysql-55.license license=GPLv2
-
-# added dependency on mysql-common package
-depend fmri=database/[email protected],5.12-5.12.0.0.0.35.0 type=require
-depend fmri=database/[email protected],5.12-5.12.0.0.0.35.0 type=optional
-
-# added ownership of var/mysql/* to mysql user/ group
-dir path=var/mysql group=mysql mode=0700 owner=mysql
-dir path=var/mysql/5.5 group=mysql mode=0700 owner=mysql
-dir path=var/mysql/5.5/data group=mysql mode=0700 owner=mysql
+file usr/mysql/5.5/support-files/my-small.cnf path=etc/mysql/5.5/my.cnf \
+ mode=0644 preserve=renamenew
# SMF Configuration
file Solaris/mysql_55.xml \
- path=lib/svc/manifest/application/database/mysql_55.xml
+ path=lib/svc/manifest/application/database/mysql_55.xml
file Solaris/mysql_55 path=lib/svc/method/mysql_55 mode=0555
# Regular mysql-55 files
@@ -138,6 +129,18 @@
file path=usr/mysql/5.5/include/sslopt-longopts.h
file path=usr/mysql/5.5/include/sslopt-vars.h
file path=usr/mysql/5.5/include/typelib.h
+file path=usr/mysql/5.5/lib/$(MACH64)/plugin/adt_null.so
+file path=usr/mysql/5.5/lib/$(MACH64)/plugin/auth.so
+file path=usr/mysql/5.5/lib/$(MACH64)/plugin/auth_test_plugin.so
+file path=usr/mysql/5.5/lib/$(MACH64)/plugin/daemon_example.ini
+file path=usr/mysql/5.5/lib/$(MACH64)/plugin/ha_example.so
+file path=usr/mysql/5.5/lib/$(MACH64)/plugin/libdaemon_example.so
+file path=usr/mysql/5.5/lib/$(MACH64)/plugin/mypluglib.so
+file path=usr/mysql/5.5/lib/$(MACH64)/plugin/qa_auth_client.so
+file path=usr/mysql/5.5/lib/$(MACH64)/plugin/qa_auth_interface.so
+file path=usr/mysql/5.5/lib/$(MACH64)/plugin/qa_auth_server.so
+file path=usr/mysql/5.5/lib/$(MACH64)/plugin/semisync_master.so
+file path=usr/mysql/5.5/lib/$(MACH64)/plugin/semisync_slave.so
file path=usr/mysql/5.5/lib/plugin/adt_null.so
file path=usr/mysql/5.5/lib/plugin/auth.so
file path=usr/mysql/5.5/lib/plugin/auth_test_plugin.so
@@ -150,22 +153,10 @@
file path=usr/mysql/5.5/lib/plugin/qa_auth_server.so
file path=usr/mysql/5.5/lib/plugin/semisync_master.so
file path=usr/mysql/5.5/lib/plugin/semisync_slave.so
-file path=usr/mysql/5.5/lib/$(MACH64)/plugin/adt_null.so
-file path=usr/mysql/5.5/lib/$(MACH64)/plugin/auth.so
-file path=usr/mysql/5.5/lib/$(MACH64)/plugin/auth_test_plugin.so
-file path=usr/mysql/5.5/lib/$(MACH64)/plugin/daemon_example.ini
-file path=usr/mysql/5.5/lib/$(MACH64)/plugin/ha_example.so
-file path=usr/mysql/5.5/lib/$(MACH64)/plugin/libdaemon_example.so
-file path=usr/mysql/5.5/lib/$(MACH64)/plugin/mypluglib.so
-file path=usr/mysql/5.5/lib/$(MACH64)/plugin/qa_auth_client.so
-file path=usr/mysql/5.5/lib/$(MACH64)/plugin/qa_auth_interface.so
-file path=usr/mysql/5.5/lib/$(MACH64)/plugin/qa_auth_server.so
-file path=usr/mysql/5.5/lib/$(MACH64)/plugin/semisync_master.so
-file path=usr/mysql/5.5/lib/$(MACH64)/plugin/semisync_slave.so
+file path=usr/mysql/5.5/man/man1/comp_err.1
file path=usr/mysql/5.5/man/man1/innochecksum.1
+file path=usr/mysql/5.5/man/man1/my_print_defaults.1
file path=usr/mysql/5.5/man/man1/myisam_ftdump.1
-file path=usr/mysql/5.5/man/man1/comp_err.1
-file path=usr/mysql/5.5/man/man1/my_print_defaults.1
file path=usr/mysql/5.5/man/man1/myisamchk.1
file path=usr/mysql/5.5/man/man1/myisamlog.1
file path=usr/mysql/5.5/man/man1/myisampack.1
@@ -252,13 +243,22 @@
file path=usr/mysql/5.5/support-files/config.small.ini
file path=usr/mysql/5.5/support-files/magic
file path=usr/mysql/5.5/support-files/my-huge.cnf mode=0644 preserve=true
-file path=usr/mysql/5.5/support-files/my-innodb-heavy-4G.cnf mode=0644 preserve=true
+file path=usr/mysql/5.5/support-files/my-innodb-heavy-4G.cnf mode=0644 \
+ preserve=true
file path=usr/mysql/5.5/support-files/my-large.cnf mode=0644 preserve=true
file path=usr/mysql/5.5/support-files/my-medium.cnf mode=0644 preserve=true
file path=usr/mysql/5.5/support-files/my-small.cnf mode=0644 preserve=true
-file usr/mysql/5.5/support-files/my-small.cnf path=etc/mysql/5.5/my.cnf \
- mode=0644 preserve=renamenew
file path=usr/mysql/5.5/support-files/mysql-log-rotate
file path=usr/mysql/5.5/support-files/mysql.server
file path=usr/mysql/5.5/support-files/mysqld_multi.server
file path=usr/mysql/5.5/support-files/ndb-config-2-node.ini
+
+# added ownership of var/mysql/* to mysql user/ group
+dir path=var/mysql owner=mysql group=mysql mode=0700
+dir path=var/mysql/5.5 owner=mysql group=mysql mode=0700
+dir path=var/mysql/5.5/data owner=mysql group=mysql mode=0700
+license mysql-55.license license=GPLv2
+depend type=optional fmri=database/[email protected],5.12-5.12.0.0.0.35.0
+
+# added dependency on mysql-common package
+depend type=require fmri=database/[email protected],5.12-5.12.0.0.0.35.0