--- a/components/mysql-5-6/mysql-56.p5m Sat Jun 25 10:48:59 2016 -0700
+++ b/components/mysql-5-6/mysql-56.p5m Sat Jun 25 11:17:54 2016 -0700
@@ -18,12 +18,10 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
-<transform file path=usr/mysql/5.6/bin/.+ -> set pkg.depend.bypass-generate .*>
-<transform file path=usr/mysql/5.6/lib/.+ -> set pkg.depend.bypass-generate .*>
set name=pkg.fmri \
value=pkg:/database/mysql-56@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="MySQL 5.6 Database Management System"
@@ -45,6 +43,7 @@
# Regular mysql-56 files
file path=usr/mysql/5.6/COPYING
+file path=usr/mysql/5.6/INSTALL-BINARY
file path=usr/mysql/5.6/README
file path=usr/mysql/5.6/bin/$(MACH32)/mysql_config
file path=usr/mysql/5.6/bin/innochecksum
@@ -76,7 +75,6 @@
file path=usr/mysql/5.6/docs/ChangeLog
file path=usr/mysql/5.6/docs/INFO_BIN
file path=usr/mysql/5.6/docs/INFO_SRC
-file path=usr/mysql/5.6/docs/INSTALL-BINARY
file path=usr/mysql/5.6/include/big_endian.h
file path=usr/mysql/5.6/include/byte_order_generic.h
file path=usr/mysql/5.6/include/byte_order_generic_x86.h
@@ -104,17 +102,13 @@
file path=usr/mysql/5.6/include/mysql.h
file path=usr/mysql/5.6/include/mysql/client_authentication.h
file path=usr/mysql/5.6/include/mysql/client_plugin.h
-file path=usr/mysql/5.6/include/mysql/client_plugin.h.pp
file path=usr/mysql/5.6/include/mysql/get_password.h
file path=usr/mysql/5.6/include/mysql/innodb_priv.h
file path=usr/mysql/5.6/include/mysql/plugin.h
file path=usr/mysql/5.6/include/mysql/plugin_audit.h
-file path=usr/mysql/5.6/include/mysql/plugin_audit.h.pp
file path=usr/mysql/5.6/include/mysql/plugin_auth.h
-file path=usr/mysql/5.6/include/mysql/plugin_auth.h.pp
file path=usr/mysql/5.6/include/mysql/plugin_auth_common.h
file path=usr/mysql/5.6/include/mysql/plugin_ftparser.h
-file path=usr/mysql/5.6/include/mysql/plugin_ftparser.h.pp
file path=usr/mysql/5.6/include/mysql/plugin_validate_password.h
file path=usr/mysql/5.6/include/mysql/psi/mysql_file.h
file path=usr/mysql/5.6/include/mysql/psi/mysql_idle.h
@@ -142,7 +136,6 @@
file path=usr/mysql/5.6/include/plugin.h
file path=usr/mysql/5.6/include/plugin_audit.h
file path=usr/mysql/5.6/include/plugin_ftparser.h
-file path=usr/mysql/5.6/include/plugin_validate_password.h
file path=usr/mysql/5.6/include/sql_common.h
file path=usr/mysql/5.6/include/sql_state.h
file path=usr/mysql/5.6/include/sslopt-case.h
@@ -156,7 +149,6 @@
file path=usr/mysql/5.6/lib/$(MACH64)/plugin/ha_example.so
file path=usr/mysql/5.6/lib/$(MACH64)/plugin/libdaemon_example.so
file path=usr/mysql/5.6/lib/$(MACH64)/plugin/mypluglib.so
-file path=usr/mysql/5.6/lib/$(MACH64)/plugin/mysql_no_login.so
file path=usr/mysql/5.6/lib/$(MACH64)/plugin/qa_auth_client.so
file path=usr/mysql/5.6/lib/$(MACH64)/plugin/qa_auth_interface.so
file path=usr/mysql/5.6/lib/$(MACH64)/plugin/qa_auth_server.so
@@ -164,14 +156,12 @@
file path=usr/mysql/5.6/lib/$(MACH64)/plugin/semisync_slave.so
file path=usr/mysql/5.6/lib/$(MACH64)/plugin/validate_password.so
file path=usr/mysql/5.6/lib/plugin/adt_null.so
-file path=usr/mysql/5.6/lib/plugin/adt_null.so
file path=usr/mysql/5.6/lib/plugin/auth.so
file path=usr/mysql/5.6/lib/plugin/auth_test_plugin.so
file path=usr/mysql/5.6/lib/plugin/daemon_example.ini
file path=usr/mysql/5.6/lib/plugin/ha_example.so
file path=usr/mysql/5.6/lib/plugin/libdaemon_example.so
file path=usr/mysql/5.6/lib/plugin/mypluglib.so
-file path=usr/mysql/5.6/lib/plugin/mysql_no_login.so
file path=usr/mysql/5.6/lib/plugin/qa_auth_client.so
file path=usr/mysql/5.6/lib/plugin/qa_auth_interface.so
file path=usr/mysql/5.6/lib/plugin/qa_auth_server.so
@@ -185,7 +175,6 @@
file path=usr/mysql/5.6/man/man1/myisamchk.1
file path=usr/mysql/5.6/man/man1/myisamlog.1
file path=usr/mysql/5.6/man/man1/myisampack.1
-file path=usr/mysql/5.6/man/man1/mysql-test-run.pl.1
file path=usr/mysql/5.6/man/man1/mysql.server.1
file path=usr/mysql/5.6/man/man1/mysql_config.1
file path=usr/mysql/5.6/man/man1/mysql_convert_table_format.1
@@ -196,7 +185,6 @@
file path=usr/mysql/5.6/man/man1/mysql_tzinfo_to_sql.1
file path=usr/mysql/5.6/man/man1/mysql_upgrade.1
file path=usr/mysql/5.6/man/man1/mysql_zap.1
-file path=usr/mysql/5.6/man/man1/mysqlbug.1
file path=usr/mysql/5.6/man/man1/mysqld_multi.1
file path=usr/mysql/5.6/man/man1/mysqld_safe.1
file path=usr/mysql/5.6/man/man1/mysqlhotcopy.1
@@ -266,14 +254,16 @@
file path=usr/mysql/5.6/share/spanish/errmsg.sys
file path=usr/mysql/5.6/share/swedish/errmsg.sys
file path=usr/mysql/5.6/share/ukrainian/errmsg.sys
+file path=usr/mysql/5.6/support-files/binary-configure
+file path=usr/mysql/5.6/support-files/magic
file path=usr/mysql/5.6/support-files/my-default.cnf mode=0644 preserve=true
+file path=usr/mysql/5.6/support-files/mysql-log-rotate
+file path=usr/mysql/5.6/support-files/mysql.server
+file path=usr/mysql/5.6/support-files/mysqld_multi.server
# added ownership of var/mysql/* to mysql user/ group
dir path=var/mysql owner=mysql group=mysql mode=0700
dir path=var/mysql/5.6 owner=mysql group=mysql mode=0700
dir path=var/mysql/5.6/data owner=mysql group=mysql mode=0700
license mysql-56.license license=GPLv2
-
-# added dependency on mysql-common and mysql-56/client package
-depend type=require fmri=database/mysql-56/client
depend type=require fmri=database/mysql-common