1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80
|
From: Markus Koschany <apo@debian.org>
Date: Fri, 9 Nov 2018 14:40:34 +0100
Subject: mariadb
Use libmariadb-java instead of libmysql-java.
Forwarded: no
---
src/edu/isi/pegasus/planner/catalog/replica/impl/JDBCRC.java | 2 +-
.../pegasus/planner/catalog/transformation/impl/CreateTCDatabase.java | 2 +-
src/edu/isi/pegasus/planner/catalog/work/Database.java | 2 +-
src/edu/isi/pegasus/planner/ranking/GetDAX.java | 2 +-
src/org/griphyn/vdl/dbdriver/MySQL.java | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/edu/isi/pegasus/planner/catalog/replica/impl/JDBCRC.java b/src/edu/isi/pegasus/planner/catalog/replica/impl/JDBCRC.java
index 7347cf7..054db22 100644
--- a/src/edu/isi/pegasus/planner/catalog/replica/impl/JDBCRC.java
+++ b/src/edu/isi/pegasus/planner/catalog/replica/impl/JDBCRC.java
@@ -294,7 +294,7 @@ public class JDBCRC implements ReplicaCatalog
if (driver != null) {
//only support mysql and postgres for time being
if( driver.equalsIgnoreCase( "MySQL") ){
- driver = "com.mysql.jdbc.Driver";
+ driver = "org.mariadb.jdbc.Driver";
}
else if ( driver.equalsIgnoreCase( "Postgres" )){
driver = "org.postgresql.Driver";
diff --git a/src/edu/isi/pegasus/planner/catalog/transformation/impl/CreateTCDatabase.java b/src/edu/isi/pegasus/planner/catalog/transformation/impl/CreateTCDatabase.java
index 25632d8..cb061d2 100644
--- a/src/edu/isi/pegasus/planner/catalog/transformation/impl/CreateTCDatabase.java
+++ b/src/edu/isi/pegasus/planner/catalog/transformation/impl/CreateTCDatabase.java
@@ -120,7 +120,7 @@ public class CreateTCDatabase {
if (driver != null) {
//only support mysql
if( driver.equalsIgnoreCase( "MySQL") ){
- this.mDriver = "com.mysql.jdbc.Driver";
+ this.mDriver = "org.mariadb.jdbc.Driver";
}else{
throw new RuntimeException("Only MySQL supported !");
}
diff --git a/src/edu/isi/pegasus/planner/catalog/work/Database.java b/src/edu/isi/pegasus/planner/catalog/work/Database.java
index 8deacf3..8f193ad 100644
--- a/src/edu/isi/pegasus/planner/catalog/work/Database.java
+++ b/src/edu/isi/pegasus/planner/catalog/work/Database.java
@@ -312,7 +312,7 @@ public class Database
if (driver != null) {
//only support mysql and postgres for time being
if( driver.equalsIgnoreCase( "MySQL") ){
- driver = "com.mysql.jdbc.Driver";
+ driver = "org.mariadb.jdbc.Driver";
}
else if ( driver.equalsIgnoreCase( "Postgres" )){
driver = "org.postgresql.Driver";
diff --git a/src/edu/isi/pegasus/planner/ranking/GetDAX.java b/src/edu/isi/pegasus/planner/ranking/GetDAX.java
index cd048e1..9385b68 100644
--- a/src/edu/isi/pegasus/planner/ranking/GetDAX.java
+++ b/src/edu/isi/pegasus/planner/ranking/GetDAX.java
@@ -172,7 +172,7 @@ public class GetDAX {
if (driver != null) {
//only support mysql and postgres for time being
if( driver.equalsIgnoreCase( "MySQL") ){
- driver = "com.mysql.jdbc.Driver";
+ driver = "org.mariadb.jdbc.Driver";
}
else if ( driver.equalsIgnoreCase( "Postgres" )){
driver = "org.postgresql.Driver";
diff --git a/src/org/griphyn/vdl/dbdriver/MySQL.java b/src/org/griphyn/vdl/dbdriver/MySQL.java
index 44a92bb..642538a 100644
--- a/src/org/griphyn/vdl/dbdriver/MySQL.java
+++ b/src/org/griphyn/vdl/dbdriver/MySQL.java
@@ -70,7 +70,7 @@ public class MySQL extends DatabaseDriver
throws SQLException, ClassNotFoundException
{
// load MySQL driver class into memory
- boolean save = this.connect( "com.mysql.jdbc.Driver", url, info, tables );
+ boolean save = this.connect( "org.mariadb.jdbc.Driver", url, info, tables );
// check for non-locking sequences
/* DO NOT DO THIS,
|