Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/mysql-5-5/patches/mtr.patch
author Petr Sumbera <petr.sumbera@oracle.com>
Tue, 25 Aug 2015 05:42:53 -0700
changeset 4817 04599e445ce7
parent 1754 b9ecf50e4c5c
permissions -rw-r--r--
21551900 Remove Apache Tomcat 6.0 from Solaris 12
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1754
b9ecf50e4c5c 18096640 Problems with files delivered by database/mysql-55/tests and database/mysql-55
Laasya Moduludu <laasya.moduludu@oracle.com>
parents:
diff changeset 
     1
 
Developed in-house, not fed back.
b9ecf50e4c5c 18096640 Problems with files delivered by database/mysql-55/tests and database/mysql-55
Laasya Moduludu <laasya.moduludu@oracle.com>
parents:
diff changeset 
     2
 
Solaris-specific: MysqlTestRun customization.
b9ecf50e4c5c 18096640 Problems with files delivered by database/mysql-55/tests and database/mysql-55
Laasya Moduludu <laasya.moduludu@oracle.com>
parents:
diff changeset 
     3
 
=== modified file 'mysql-test/mysql-test-run.pl'
b9ecf50e4c5c 18096640 Problems with files delivered by database/mysql-55/tests and database/mysql-55
Laasya Moduludu <laasya.moduludu@oracle.com>
parents:
diff changeset 
     4
 
--- a/mysql-test/mysql-test-run.pl	Mon Mar 10 03:20:29 2014
b9ecf50e4c5c 18096640 Problems with files delivered by database/mysql-55/tests and database/mysql-55
Laasya Moduludu <laasya.moduludu@oracle.com>
parents:
diff changeset 
     5
 
+++ b/mysql-test/mysql-test-run.pl	Mon Mar 10 07:07:00 2014
b9ecf50e4c5c 18096640 Problems with files delivered by database/mysql-55/tests and database/mysql-55
Laasya Moduludu <laasya.moduludu@oracle.com>
parents:
diff changeset 
     6
 
@@ -2152,6 +2152,7 @@
b9ecf50e4c5c 18096640 Problems with files delivered by database/mysql-55/tests and database/mysql-55
Laasya Moduludu <laasya.moduludu@oracle.com>
parents:
diff changeset 
     7
b9ecf50e4c5c 18096640 Problems with files delivered by database/mysql-55/tests and database/mysql-55
Laasya Moduludu <laasya.moduludu@oracle.com>
parents:
diff changeset 
     8
 
   my $lib_plugin=
b9ecf50e4c5c 18096640 Problems with files delivered by database/mysql-55/tests and database/mysql-55
Laasya Moduludu <laasya.moduludu@oracle.com>
parents:
diff changeset 
     9
 
     mtr_file_exists(vs_config_dirs($location,$plugin_filename),
b9ecf50e4c5c 18096640 Problems with files delivered by database/mysql-55/tests and database/mysql-55
Laasya Moduludu <laasya.moduludu@oracle.com>
parents:
diff changeset 
    10
 
+                    "$basedir/lib/64/plugin/".$plugin_filename,
b9ecf50e4c5c 18096640 Problems with files delivered by database/mysql-55/tests and database/mysql-55
Laasya Moduludu <laasya.moduludu@oracle.com>
parents:
diff changeset 
    11
 
                     "$basedir/lib/plugin/".$plugin_filename,
b9ecf50e4c5c 18096640 Problems with files delivered by database/mysql-55/tests and database/mysql-55
Laasya Moduludu <laasya.moduludu@oracle.com>
parents:
diff changeset 
    12
 
                     "$basedir/lib64/plugin/".$plugin_filename,
b9ecf50e4c5c 18096640 Problems with files delivered by database/mysql-55/tests and database/mysql-55
Laasya Moduludu <laasya.moduludu@oracle.com>
parents:
diff changeset 
    13
 
                     "$basedir/$location/.libs/".$plugin_filename,
upstream/oracle/userland-gate