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-6/patches/mtr.patch
author Murthy Narkedimilli <murthy.narkedimilli@oracle.com>
Thu, 16 Apr 2015 11:14:00 -0700
changeset 4135 1222d02d1332
permissions -rw-r--r--
PSARC 2014/431 Update MySQL to 5.6 19380884 Add MySQL 5.6 to Solaris
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4135
1222d02d1332 PSARC 2014/431 Update MySQL to 5.6
Murthy Narkedimilli <murthy.narkedimilli@oracle.com>
parents:
diff changeset 
     1
 
Developed in-house, not fed back.
1222d02d1332 PSARC 2014/431 Update MySQL to 5.6
Murthy Narkedimilli <murthy.narkedimilli@oracle.com>
parents:
diff changeset 
     2
 
Solaris-specific: MysqlTestRun customization.
1222d02d1332 PSARC 2014/431 Update MySQL to 5.6
Murthy Narkedimilli <murthy.narkedimilli@oracle.com>
parents:
diff changeset 
     3
 
=== modified file 'mysql-test/mysql-test-run.pl'
1222d02d1332 PSARC 2014/431 Update MySQL to 5.6
Murthy Narkedimilli <murthy.narkedimilli@oracle.com>
parents:
diff changeset 
     4
 
--- a/mysql-test/mysql-test-run.pl
1222d02d1332 PSARC 2014/431 Update MySQL to 5.6
Murthy Narkedimilli <murthy.narkedimilli@oracle.com>
parents:
diff changeset 
     5
 
+++ b/mysql-test/mysql-test-run.pl
1222d02d1332 PSARC 2014/431 Update MySQL to 5.6
Murthy Narkedimilli <murthy.narkedimilli@oracle.com>
parents:
diff changeset 
     6
 
@@ -2193,6 +2193,7 @@ sub find_plugin($$)
1222d02d1332 PSARC 2014/431 Update MySQL to 5.6
Murthy Narkedimilli <murthy.narkedimilli@oracle.com>
parents:
diff changeset 
     7
1222d02d1332 PSARC 2014/431 Update MySQL to 5.6
Murthy Narkedimilli <murthy.narkedimilli@oracle.com>
parents:
diff changeset 
     8
 
   my $lib_plugin=
1222d02d1332 PSARC 2014/431 Update MySQL to 5.6
Murthy Narkedimilli <murthy.narkedimilli@oracle.com>
parents:
diff changeset 
     9
 
     mtr_file_exists(vs_config_dirs($location,$plugin_filename),
1222d02d1332 PSARC 2014/431 Update MySQL to 5.6
Murthy Narkedimilli <murthy.narkedimilli@oracle.com>
parents:
diff changeset 
    10
 
+                    "$basedir/lib/64/plugin/".$plugin_filename,
1222d02d1332 PSARC 2014/431 Update MySQL to 5.6
Murthy Narkedimilli <murthy.narkedimilli@oracle.com>
parents:
diff changeset 
    11
 
                     "$basedir/lib/plugin/".$plugin_filename,
1222d02d1332 PSARC 2014/431 Update MySQL to 5.6
Murthy Narkedimilli <murthy.narkedimilli@oracle.com>
parents:
diff changeset 
    12
 
                     "$basedir/lib64/plugin/".$plugin_filename,
1222d02d1332 PSARC 2014/431 Update MySQL to 5.6
Murthy Narkedimilli <murthy.narkedimilli@oracle.com>
parents:
diff changeset 
    13
 
                     "$basedir/$location/.libs/".$plugin_filename,
upstream/oracle/userland-gate