bzr commit into mysql-5.1-bugteam branch (jperkin:3142) Bug#39641

[Jonathan Perkin]

#At file:///home/sketch/bzr/mysql-bug39641/ based on revid:martin.hansson@stripped

 3142 Jonathan Perkin	2009-09-30
      bug#39641: mysql_config --plugindir links to /usr/local/mysql/lib/plugin in
                 tar.gz packages
      
      Do the fix_path kludge for the plugin directory.

    modified:
      scripts/mysql_config.sh
=== modified file 'scripts/mysql_config.sh'

=== modified file 'scripts/mysql_config.sh'
--- a/scripts/mysql_config.sh	2008-11-10 21:12:15 +0000
+++ b/scripts/mysql_config.sh	2009-09-30 10:46:11 +0000
@@ -38,7 +38,7 @@
 
 #
 # If we can find the given directory relatively to where mysql_config is
-# we should use this instead of the incompiled one.
+# we should use this instead of the compiled-in one.
 # This is to ensure that this script also works with the binary MySQL
 # version
 
@@ -88,6 +88,7 @@
 fix_path pkglibdir $pkglibdir_rel lib/mysql lib
 
 plugindir='@pkgplugindir@'
+fix_path plugindir lib/mysql/plugin lib/plugin
 
 pkgincludedir='@pkgincludedir@'
 fix_path pkgincludedir include/mysql include


Attachment: [text/bzr-bundle] bzr/[e-mail]