Author: kwright
Date: Mon Oct 27 12:56:08 2014
New Revision: 1634531
URL: http://svn.apache.org/r1634531
Log:
Pull up another fix for CONNECTORS-1083
Modified:
manifoldcf/branches/dev_1x/ (props changed)
manifoldcf/branches/dev_1x/framework/ (props changed)
manifoldcf/branches/dev_1x/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java
Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1634530
Propchange: manifoldcf/branches/dev_1x/framework/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk/framework:r1634530
Modified:
manifoldcf/branches/dev_1x/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java?rev=1634531&r1=1634530&r2=1634531&view=diff
==============================================================================
---
manifoldcf/branches/dev_1x/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java
(original)
+++
manifoldcf/branches/dev_1x/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java
Mon Oct 27 12:56:08 2014
@@ -67,7 +67,7 @@ public class DBInterfaceMySQL extends Da
protected DBInterfaceMySQL(IThreadContext tc, String jdbcDriverClass, String
databaseName, String userName, String password)
throws ManifoldCFException
{
-
super(tc,getJdbcUrl(tc,databaseName),_driver,databaseName,userName,password);
+
super(tc,getJdbcUrl(tc,databaseName),jdbcDriverClass,databaseName,userName,password);
cacheKey = CacheKeyFactory.makeDatabaseKey(this.databaseName);
lockManager = LockManagerFactory.make(tc);
}
@@ -1363,4 +1363,3 @@ public class DBInterfaceMySQL extends Da
}
}
-
