One more update for #1200 (better implementation)

This commit is contained in:
Miroslav Stampar 2015-03-26 01:22:16 +01:00
parent ac74184422
commit 7b2c27fa8d

View File

@ -28,6 +28,7 @@ class Takeover(GenericTakeover):
def __init__(self): def __init__(self):
self.__basedir = None self.__basedir = None
self.__datadir = None self.__datadir = None
self.__plugindir = None
GenericTakeover.__init__(self) GenericTakeover.__init__(self)
@ -37,12 +38,12 @@ class Takeover(GenericTakeover):
banVer = kb.bannerFp["dbmsVersion"] banVer = kb.bannerFp["dbmsVersion"]
if banVer >= "5.0.67": if banVer >= "5.0.67":
if self.__plugindir is None:
logger.info("retrieving MySQL plugin directory absolute path") logger.info("retrieving MySQL plugin directory absolute path")
self.__basedir = unArrayizeValue(inject.getValue("SELECT @@plugin_dir")) self.__plugindir = unArrayizeValue(inject.getValue("SELECT @@plugin_dir"))
# On MySQL 5.1 >= 5.1.19 and on any version of MySQL 6.0 # On MySQL 5.1 >= 5.1.19 and on any version of MySQL 6.0
if banVer >= "5.1.19": if self.__plugindir is None and banVer >= "5.1.19":
if self.__basedir is None:
logger.info("retrieving MySQL base directory absolute path") logger.info("retrieving MySQL base directory absolute path")
# Reference: http://dev.mysql.com/doc/refman/5.1/en/server-options.html#option_mysqld_basedir # Reference: http://dev.mysql.com/doc/refman/5.1/en/server-options.html#option_mysqld_basedir
@ -55,12 +56,13 @@ class Takeover(GenericTakeover):
# The DLL must be in C:\Program Files\MySQL\MySQL Server 5.1\lib\plugin # The DLL must be in C:\Program Files\MySQL\MySQL Server 5.1\lib\plugin
if Backend.isOs(OS.WINDOWS): if Backend.isOs(OS.WINDOWS):
self.__basedir += "/lib/plugin" self.__plugindir = "%s/lib/plugin" % self.__basedir
else: else:
self.__basedir += "/lib/mysql/plugin" self.__plugindir = "%s/lib/mysql/plugin" % self.__basedir
self.__basedir = ntToPosixSlashes(normalizePath(self.__basedir)) self.__plugindir = ntToPosixSlashes(normalizePath(self.__plugindir))
self.udfRemoteFile = "%s/%s.%s" % (self.__basedir, self.udfSharedLibName, self.udfSharedLibExt)
self.udfRemoteFile = "%s/%s.%s" % (self.__plugindir, self.udfSharedLibName, self.udfSharedLibExt)
# On MySQL 4.1 < 4.1.25 and on MySQL 4.1 >= 4.1.25 with NO plugin_dir set in my.ini configuration file # On MySQL 4.1 < 4.1.25 and on MySQL 4.1 >= 4.1.25 with NO plugin_dir set in my.ini configuration file
# On MySQL 5.0 < 5.0.67 and on MySQL 5.0 >= 5.0.67 with NO plugin_dir set in my.ini configuration file # On MySQL 5.0 < 5.0.67 and on MySQL 5.0 >= 5.0.67 with NO plugin_dir set in my.ini configuration file