Author: tfischer
Date: Fri Sep 21 20:53:43 2012
New Revision: 1388677
URL: http://svn.apache.org/viewvc?rev=1388677&view=rev
Log:
fix mysql version determining for ubuntubuilds
Modified:
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseDatabaseTestCase.java
Modified:
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseDatabaseTestCase.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseDatabaseTestCase.java?rev=1388677&r1=1388676&r2=1388677&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseDatabaseTestCase.java
(original)
+++
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseDatabaseTestCase.java
Fri Sep 21 20:53:43 2012
@@ -116,6 +116,12 @@ public abstract class BaseDatabaseTestCa
throws TorqueException
{
String completeVersion = getMysqlVersion();
+ if (completeVersion.indexOf('-') != -1) // handle x.y.z-ubuntuSomething
+ {
+ completeVersion = completeVersion.substring(
+ 0,
+ completeVersion.indexOf('-'));
+ }
String minorVersion
= completeVersion.substring(
completeVersion.indexOf('.') + 1,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
