18096640 Problems with files delivered by database/mysql-55/tests and database/mysql-55
--- a/components/mysql-5-5/mysql-55.p5m Mon Mar 10 10:09:50 2014 -0700
+++ b/components/mysql-5-5/mysql-55.p5m Wed Mar 12 01:01:18 2014 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -251,11 +251,11 @@
file path=usr/mysql/5.5/support-files/config.medium.ini
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
-file path=usr/mysql/5.5/support-files/my-innodb-heavy-4G.cnf
-file path=usr/mysql/5.5/support-files/my-large.cnf
-file path=usr/mysql/5.5/support-files/my-medium.cnf
-file path=usr/mysql/5.5/support-files/my-small.cnf
+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-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
--- a/components/mysql-5-5/mysql-55lib.p5m Mon Mar 10 10:09:50 2014 -0700
+++ b/components/mysql-5-5/mysql-55lib.p5m Wed Mar 12 01:01:18 2014 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -35,8 +35,9 @@
license mysql-55.license license=GPLv2
# added dependency on mysql-51/library package
-depend fmri=pkg:/database/mysql-51/[email protected],$(BUILD_VERSION) type=optional
+depend fmri=pkg:/database/mysql-51/[email protected],5.12-5.12.0.0.0.35.0 type=optional
+link path=usr/mysql/5.5/lib/64 target=$(MACH64)
link path=usr/mysql/5.5/lib/libmysqlclient.so \
target=libmysqlclient.so.18
link path=usr/mysql/5.5/lib/libmysqlclient.so.18 \
--- a/components/mysql-5-5/mysql-55test.p5m Mon Mar 10 10:09:50 2014 -0700
+++ b/components/mysql-5-5/mysql-55test.p5m Wed Mar 12 01:01:18 2014 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -39,6 +39,7 @@
# added dependency on mysql-55
depend fmri=__TBD pkg.debug.depend.file=usr/mysql/5.5/bin/mysql type=require
+depend fmri=database/mysql-55@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) type=require
file path=usr/mysql/5.5/mysql-test/CTestTestfile.cmake
file path=usr/mysql/5.5/mysql-test/Makefile
@@ -472,7 +473,7 @@
file path=usr/mysql/5.5/mysql-test/lib/My/Platform.pm
file path=usr/mysql/5.5/mysql-test/lib/My/SafeProcess.pm
file path=usr/mysql/5.5/mysql-test/lib/My/SafeProcess/Base.pm
-file path=usr/mysql/5.5/mysql-test/lib/My/SafeProcess/my_safe_process mode=0500
+file path=usr/mysql/5.5/mysql-test/lib/My/SafeProcess/my_safe_process mode=0555
file path=usr/mysql/5.5/mysql-test/lib/My/SysInfo.pm
file path=usr/mysql/5.5/mysql-test/lib/My/Test.pm
file path=usr/mysql/5.5/mysql-test/lib/mtr_cases.pm
@@ -500,12 +501,12 @@
file path=usr/mysql/5.5/mysql-test/lib/v1/mtr_stress.pl
file path=usr/mysql/5.5/mysql-test/lib/v1/mtr_timer.pl
file path=usr/mysql/5.5/mysql-test/lib/v1/mtr_unique.pl
-file path=usr/mysql/5.5/mysql-test/lib/v1/mysql-test-run.pl
+file path=usr/mysql/5.5/mysql-test/lib/v1/mysql-test-run.pl mode=0555
file path=usr/mysql/5.5/mysql-test/lib/v1/ndb_config_1_node.ini
file path=usr/mysql/5.5/mysql-test/lib/v1/ndb_config_2_node.ini
link path=usr/mysql/5.5/mysql-test/mtr target=./mysql-test-run.pl
-file path=usr/mysql/5.5/mysql-test/mysql-stress-test.pl
-file path=usr/mysql/5.5/mysql-test/mysql-test-run.pl mode=0500
+file path=usr/mysql/5.5/mysql-test/mysql-stress-test.pl mode=0555
+file path=usr/mysql/5.5/mysql-test/mysql-test-run.pl mode=0555
link path=usr/mysql/5.5/mysql-test/mysql-test-run target=./mysql-test-run.pl
file path=usr/mysql/5.5/mysql-test/purify.supp
file path=usr/mysql/5.5/mysql-test/r/1st.result
@@ -6149,18 +6150,18 @@
file path=usr/mysql/5.5/sql-bench/Data/Wisconsin/onek.data
file path=usr/mysql/5.5/sql-bench/Data/Wisconsin/tenk.data
file path=usr/mysql/5.5/sql-bench/README
-file path=usr/mysql/5.5/sql-bench/bench-count-distinct
-file path=usr/mysql/5.5/sql-bench/bench-init.pl
-file path=usr/mysql/5.5/sql-bench/compare-results
-file path=usr/mysql/5.5/sql-bench/copy-db
-file path=usr/mysql/5.5/sql-bench/crash-me
-file path=usr/mysql/5.5/sql-bench/graph-compare-results
-file path=usr/mysql/5.5/sql-bench/innotest1
-file path=usr/mysql/5.5/sql-bench/innotest1a
-file path=usr/mysql/5.5/sql-bench/innotest1b
-file path=usr/mysql/5.5/sql-bench/innotest2
-file path=usr/mysql/5.5/sql-bench/innotest2a
-file path=usr/mysql/5.5/sql-bench/innotest2b
+file path=usr/mysql/5.5/sql-bench/bench-count-distinct mode=0555
+file path=usr/mysql/5.5/sql-bench/bench-init.pl mode=0555
+file path=usr/mysql/5.5/sql-bench/compare-results mode=0555
+file path=usr/mysql/5.5/sql-bench/copy-db mode=0555
+file path=usr/mysql/5.5/sql-bench/crash-me mode=0555
+file path=usr/mysql/5.5/sql-bench/graph-compare-results mode=0555
+file path=usr/mysql/5.5/sql-bench/innotest1 mode=0555
+file path=usr/mysql/5.5/sql-bench/innotest1a mode=0555
+file path=usr/mysql/5.5/sql-bench/innotest1b mode=0555
+file path=usr/mysql/5.5/sql-bench/innotest2 mode=0555
+file path=usr/mysql/5.5/sql-bench/innotest2a mode=0555
+file path=usr/mysql/5.5/sql-bench/innotest2b mode=0555
file path=usr/mysql/5.5/sql-bench/limits/Adabas.cfg
file path=usr/mysql/5.5/sql-bench/limits/Informix.cfg
file path=usr/mysql/5.5/sql-bench/limits/access.cfg
@@ -6186,14 +6187,15 @@
file path=usr/mysql/5.5/sql-bench/limits/solid-nt4.cfg
file path=usr/mysql/5.5/sql-bench/limits/solid.cfg
file path=usr/mysql/5.5/sql-bench/limits/sybase.cfg
-file path=usr/mysql/5.5/sql-bench/run-all-tests
-file path=usr/mysql/5.5/sql-bench/server-cfg
-file path=usr/mysql/5.5/sql-bench/test-ATIS
-file path=usr/mysql/5.5/sql-bench/test-alter-table
-file path=usr/mysql/5.5/sql-bench/test-big-tables
-file path=usr/mysql/5.5/sql-bench/test-connect
-file path=usr/mysql/5.5/sql-bench/test-create
-file path=usr/mysql/5.5/sql-bench/test-insert
-file path=usr/mysql/5.5/sql-bench/test-select
-file path=usr/mysql/5.5/sql-bench/test-transactions
-file path=usr/mysql/5.5/sql-bench/test-wisconsin
+file path=usr/mysql/5.5/sql-bench/run-all-tests mode=0555
+file path=usr/mysql/5.5/sql-bench/server-cfg mode=0555
+file path=usr/mysql/5.5/sql-bench/test-ATIS mode=0555
+file path=usr/mysql/5.5/sql-bench/test-alter-table mode=0555
+file path=usr/mysql/5.5/sql-bench/test-big-tables mode=0555
+file path=usr/mysql/5.5/sql-bench/test-connect mode=0555
+file path=usr/mysql/5.5/sql-bench/test-create mode=0555
+file path=usr/mysql/5.5/sql-bench/test-insert mode=0555
+file path=usr/mysql/5.5/sql-bench/test-select mode=0555
+file path=usr/mysql/5.5/sql-bench/test-transactions mode=0555
+file path=usr/mysql/5.5/sql-bench/test-wisconsin mode=0555
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/mysql-5-5/patches/mtr.patch Wed Mar 12 01:01:18 2014 -0700
@@ -0,0 +1,13 @@
+Developed in-house, not fed back.
+Solaris-specific: MysqlTestRun customization.
+=== modified file 'mysql-test/mysql-test-run.pl'
+--- a/mysql-test/mysql-test-run.pl Mon Mar 10 03:20:29 2014
++++ b/mysql-test/mysql-test-run.pl Mon Mar 10 07:07:00 2014
+@@ -2152,6 +2152,7 @@
+
+ my $lib_plugin=
+ mtr_file_exists(vs_config_dirs($location,$plugin_filename),
++ "$basedir/lib/64/plugin/".$plugin_filename,
+ "$basedir/lib/plugin/".$plugin_filename,
+ "$basedir/lib64/plugin/".$plugin_filename,
+ "$basedir/$location/.libs/".$plugin_filename,