# HG changeset patch # User Murthy Narkedimilli # Date 1427106402 25200 # Node ID 0b6c6e1c308fdffadc8d80384b8ffa4aaa382126 # Parent c737cefdce540760c3367145c99071ff40393d11 18096640 Problems with files delivered by database/mysql-55/tests and database/mysql-55 diff -r c737cefdce54 -r 0b6c6e1c308f components/mysql-5-5/mysql-55.p5m --- a/components/mysql-5-5/mysql-55.p5m Sun Mar 22 13:14:43 2015 -0700 +++ b/components/mysql-5-5/mysql-55.p5m Mon Mar 23 03:26:42 2015 -0700 @@ -242,11 +242,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 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 diff -r c737cefdce54 -r 0b6c6e1c308f components/mysql-5-5/mysql-55lib.p5m --- a/components/mysql-5-5/mysql-55lib.p5m Sun Mar 22 13:14:43 2015 -0700 +++ b/components/mysql-5-5/mysql-55lib.p5m Mon Mar 23 03:26:42 2015 -0700 @@ -32,6 +32,7 @@ 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) +link path=usr/mysql/5.5/lib/64 target=$(MACH64) link path=usr/mysql/5.5/lib/$(MACH64)/libmysqlclient.so \ target=libmysqlclient.so.18 link path=usr/mysql/5.5/lib/$(MACH64)/libmysqlclient.so.18 \ @@ -52,4 +53,5 @@ license mysql-55.license license=GPLv2 # added dependency on mysql-51/library package -depend type=optional fmri=pkg:/database/mysql-51/library@5.1.37,$(BUILD_VERSION) +depend type=optional fmri=pkg:/database/mysql-51/library@5.1.37,5.11-0.175.2.0.0.31.0 + diff -r c737cefdce54 -r 0b6c6e1c308f components/mysql-5-5/mysql-55test.p5m --- a/components/mysql-5-5/mysql-55test.p5m Sun Mar 22 13:14:43 2015 -0700 +++ b/components/mysql-5-5/mysql-55test.p5m Mon Mar 23 03:26:42 2015 -0700 @@ -466,7 +466,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 @@ -494,13 +494,13 @@ 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-stress-test.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/mysql-test-run.pl mode=0500 +file path=usr/mysql/5.5/mysql-test/mysql-test-run.pl mode=0555 file path=usr/mysql/5.5/mysql-test/purify.supp file path=usr/mysql/5.5/mysql-test/r/1st.result file path=usr/mysql/5.5/mysql-test/r/alias.result @@ -6143,18 +6143,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 @@ -6180,18 +6180,19 @@ 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 license mysql-55.license license=GPLv2 # added dependency on mysql-55 depend type=require fmri=__TBD pkg.debug.depend.file=usr/mysql/5.5/bin/mysql +depend fmri=database/mysql-55@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) type=require diff -r c737cefdce54 -r 0b6c6e1c308f components/mysql-5-5/patches/mtr.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/mysql-5-5/patches/mtr.patch Mon Mar 23 03:26:42 2015 -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,