You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2017/03/03 14:01:00 UTC
svn commit: r1785304 - in /qpid/java/branches/6.1.x: ./
broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCDetails.java
Author: orudyy
Date: Fri Mar 3 14:01:00 2017
New Revision: 1785304
URL: http://svn.apache.org/viewvc?rev=1785304&view=rev
Log:
QPID-7668: [Java Broker] Add suport for another port of MySQL - MariaDB
merged from trunk using
svn merge -c 1785270 ^/qpid/java/trunk
Modified:
qpid/java/branches/6.1.x/ (props changed)
qpid/java/branches/6.1.x/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCDetails.java
Propchange: qpid/java/branches/6.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 3 14:01:00 2017
@@ -9,5 +9,5 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767847-1767849,1767882,1767909,1767914,1768016-1768017,1768065,1768643,1768704,1768854,1768875,1768914,1768963,1768967,1768976,1769007,1769009,1769087,1769138-1769139,1769597,1769879,1770236,1770716,1772050,1772241,1772365,1772574,1773057,1774039,1774446,1774564,1774885,1775087,1775100,1777939,1780947,1782302,1782735,1785117
+/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767847-1767849,1767882,1767909,1767914,1768016-1768017,1768065,1768643,1768704,1768854,1768875,1768914,1768963,1768967,1768976,1769007,1769009,1769087,1769138-1769139,1769597,1769879,1770236,1770716,1772050,1772241,1772365,1772574,1773057,1774039,1774446,1774564,1774885,1775087,1775100,1777939,1780947,1782302,1782735,1785117,1785270
/qpid/trunk/qpid:796646-796653
Modified: qpid/java/branches/6.1.x/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCDetails.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCDetails.java?rev=1785304&r1=1785303&r2=1785304&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCDetails.java (original)
+++ qpid/java/branches/6.1.x/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCDetails.java Fri Mar 3 14:01:00 2017
@@ -65,6 +65,9 @@ public abstract class JDBCDetails
private static final JDBCDetails MYSQL = new KnownJDBCDetails("mysql", "blob", "varbinary(%d)", "bigint", false,
true);
+ private static final JDBCDetails MARIA_DB = new KnownJDBCDetails("mariadb", "blob", "varbinary(%d)",
+ "bigint", false, true);
+
static
{
Map<String, JDBCDetails> map = new HashMap<>();
@@ -76,6 +79,7 @@ public abstract class JDBCDetails
map.put(POSTGRES.getVendor(), POSTGRES);
map.put(DERBY.getVendor(), DERBY);
map.put(MYSQL.getVendor(), MYSQL);
+ map.put(MARIA_DB.getVendor(), MARIA_DB);
map.put(FALLBACK.getVendor(), FALLBACK);
}
finally
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org