Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 78496 invoked from network); 13 Aug 2010 10:22:40 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 13 Aug 2010 10:22:40 -0000 Received: (qmail 31140 invoked by uid 500); 13 Aug 2010 10:22:40 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 31079 invoked by uid 500); 13 Aug 2010 10:22:38 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 31060 invoked by uid 99); 13 Aug 2010 10:22:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Aug 2010 10:22:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Aug 2010 10:22:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0963723889BF; Fri, 13 Aug 2010 10:21:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r985151 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/MySqlJDBCAdapter.java Date: Fri, 13 Aug 2010 10:21:15 -0000 To: commits@activemq.apache.org From: gtully@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100813102116.0963723889BF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gtully Date: Fri Aug 13 10:21:15 2010 New Revision: 985151 URL: http://svn.apache.org/viewvc?rev=985151&view=rev Log: resolve https://issues.apache.org/activemq/browse/AMQ-2857 apply variant of patch to support mysql 5.5 -introduce typeStatement default to ENGING can be set to TYPE, thanks Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/MySqlJDBCAdapter.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/MySqlJDBCAdapter.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/MySqlJDBCAdapter.java?rev=985151&r1=985150&r2=985151&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/MySqlJDBCAdapter.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/MySqlJDBCAdapter.java Fri Aug 13 10:21:15 2010 @@ -40,6 +40,7 @@ public class MySqlJDBCAdapter extends De public static final String HEAP = "HEAP"; String engineType = INNODB; + String typeStatement = "ENGINE"; public void setStatements(Statements statements) { String type = engineType.toUpperCase(); @@ -51,17 +52,17 @@ public class MySqlJDBCAdapter extends De statements.setBinaryDataType("LONGBLOB"); - String typeClause = " TYPE="+type; + String typeClause = typeStatement + "=" + type; if( type.equals(NDBCLUSTER) ) { // in the NDBCLUSTER case we will create as INNODB and then alter to NDBCLUSTER - typeClause = " TYPE="+INNODB; + typeClause = typeStatement + "=" + INNODB; } // Update the create statements so they use the right type of engine String[] s = statements.getCreateSchemaStatements(); for (int i = 0; i < s.length; i++) { if( s[i].startsWith("CREATE TABLE")) { - s[i] = s[i]+typeClause; + s[i] = s[i]+ " " + typeClause; } } @@ -86,4 +87,12 @@ public class MySqlJDBCAdapter extends De public void setEngineType(String engineType) { this.engineType = engineType; } + + public String getTypeStatement() { + return typeStatement; + } + + public void setTypeStatement(String typeStatement) { + this.typeStatement = typeStatement; + } }