You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2006/09/22 18:50:56 UTC
svn commit: r448991 - in /db/derby/code/branches/10.2/java:
client/org/apache/derby/client/am/ drda/org/apache/derby/impl/drda/
engine/org/apache/derby/impl/jdbc/
testing/org/apache/derbyTesting/functionTests/master/
testing/org/apache/derbyTesting/fun...
Author: rhillegas
Date: Fri Sep 22 09:50:55 2006
New Revision: 448991
URL: http://svn.apache.org/viewvc?view=rev&rev=448991
Log:
DERBY-1725: Merge the following patch from the trunk to the 10.2 branch: DERBY-1547 (447922).
Modified:
db/derby/code/branches/10.2/java/client/org/apache/derby/client/am/Version.java
db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out
db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out
db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out
db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out
db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out
db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/NSinSameJVM.out
db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/dbMetaDataJdbc30.out
db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out
db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out
db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out
db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/dbMetaDataJdbc30_sed.properties
db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_sed.properties
db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_test.java
db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/odbc_metadata_sed.properties
Modified: db/derby/code/branches/10.2/java/client/org/apache/derby/client/am/Version.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/client/org/apache/derby/client/am/Version.java?view=diff&rev=448991&r1=448990&r2=448991
==============================================================================
--- db/derby/code/branches/10.2/java/client/org/apache/derby/client/am/Version.java (original)
+++ db/derby/code/branches/10.2/java/client/org/apache/derby/client/am/Version.java Fri Sep 22 09:50:55 2006
@@ -39,7 +39,7 @@
// for DatabaseMetaData.getDriverVersion()
public static String getDriverVersion() {
- return Configuration.dncProductVersionHolder__.getVersionBuildString(false);
+ return Configuration.dncProductVersionHolder__.getVersionBuildString(true);
}
Modified: db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java?view=diff&rev=448991&r1=448990&r2=448991
==============================================================================
--- db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java (original)
+++ db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java Fri Sep 22 09:50:55 2006
@@ -368,7 +368,7 @@
att_extnam = ATT_SRVNAM + " " + java.lang.Thread.currentThread().getName();
att_srvclsnm = myPVH.getProductName();
- versionString = myPVH.getVersionBuildString(false);
+ versionString = myPVH.getVersionBuildString(true);
String majorStr = String.valueOf(myPVH.getMajorVersion());
String minorStr = String.valueOf(myPVH.getMinorVersion());
@@ -392,7 +392,7 @@
prdId += minorStr;
prdId += drdaMaintStr;
- att_srvrlslv = prdId + "/" + myPVH.getVersionBuildString(false);
+ att_srvrlslv = prdId + "/" + myPVH.getVersionBuildString(true);
// Precompute this to save some cycles
prdIdBytes_ = prdId.getBytes(DEFAULT_ENCODING);
Modified: db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java?view=diff&rev=448991&r1=448990&r2=448991
==============================================================================
--- db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java (original)
+++ db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java Fri Sep 22 09:50:55 2006
@@ -283,7 +283,7 @@
public String getDatabaseProductVersion() {
ProductVersionHolder myPVH = Monitor.getMonitor().getEngineVersion();
- return myPVH.getVersionBuildString(false);
+ return myPVH.getVersionBuildString(true);
}
/**
Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out?view=diff&rev=448991&r1=448990&r2=448991
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out Fri Sep 22 09:50:55 2006
@@ -62,7 +62,7 @@
nullsAreSortedAtStart(): false
nullsAreSortedAtEnd(): false
getDatabaseProductName(): Apache Derby
-getDatabaseProductVersion(): 10.2.1.4
+getDatabaseProductVersion(): 10.2.1.4 -(EXPECTED SUBVERSION INFO)
getDriverVersion(): EXPECTED VERSION
usesLocalFiles(): true
usesLocalFilePerTable(): true
Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out?view=diff&rev=448991&r1=448990&r2=448991
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out Fri Sep 22 09:50:55 2006
@@ -92,7 +92,7 @@
nullsAreSortedAtStart(): false
nullsAreSortedAtEnd(): false
getDatabaseProductName(): Apache Derby
-getDatabaseProductVersion(): 10.2.1.4
+getDatabaseProductVersion(): 10.2.1.4 -(EXPECTED SUBVERSION INFO)
getDriverVersion(): EXPECTED VERSION
usesLocalFiles(): true
usesLocalFilePerTable(): true
Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out?view=diff&rev=448991&r1=448990&r2=448991
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out Fri Sep 22 09:50:55 2006
@@ -1,5 +1,5 @@
Test dbMetaDataJdbc30 starting
-JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.2 (10.2.1.4)
+JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.2 (10.2.1.4 -(EXPECTED SUBVERSION INFO))
DatabaseMetaData.getURL test passed
supportsSavepoints() : true
supportsNamedParameters() : false
Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out?view=diff&rev=448991&r1=448990&r2=448991
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out Fri Sep 22 09:50:55 2006
@@ -13,7 +13,7 @@
Column result scale after division is: 23
dc / 2 = 5.55000000000000000000000
dc / 2 = 5.55500000000000000000000
-JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.2 (10.2.1.4)
+JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.2 (10.2.1.4 -(EXPECTED SUBVERSION INFO))
DatabaseMetaData.getURL test passed
allTablesAreSelectable(): true
maxColumnNameLength(): 128
@@ -149,8 +149,8 @@
nullsAreSortedAtStart(): false
nullsAreSortedAtEnd(): false
getDatabaseProductName(): Apache Derby
-getDatabaseProductVersion(): 10.2.1.4
-getDriverVersion(): 10.2.1.4
+getDatabaseProductVersion(): 10.2.1.4 -(EXPECTED SUBVERSION INFO)
+getDriverVersion(): 10.2.1.4 -(EXPECTED SUBVERSION INFO)
usesLocalFiles(): true
usesLocalFilePerTable(): true
supportsMixedCaseIdentifiers(): false
Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out?view=diff&rev=448991&r1=448990&r2=448991
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out Fri Sep 22 09:50:55 2006
@@ -13,7 +13,7 @@
Column result scale after division is: 23
dc / 2 = 5.55000000000000000000000
dc / 2 = 5.55500000000000000000000
-JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.2 (10.2.1.4)
+JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.2 (10.2.1.4 -(EXPECTED SUBVERSION INFO))
DatabaseMetaData.getURL test passed
allTablesAreSelectable(): true
maxColumnNameLength(): 128
@@ -149,8 +149,8 @@
nullsAreSortedAtStart(): false
nullsAreSortedAtEnd(): false
getDatabaseProductName(): Apache Derby
-getDatabaseProductVersion(): 10.2.1.4
-getDriverVersion(): 10.2.1.4
+getDatabaseProductVersion(): 10.2.1.4 -(EXPECTED SUBVERSION INFO)
+getDriverVersion(): 10.2.1.4 -(EXPECTED SUBVERSION INFO)
usesLocalFiles(): true
usesLocalFilePerTable(): true
supportsMixedCaseIdentifiers(): false
Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out?view=diff&rev=448991&r1=448990&r2=448991
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out Fri Sep 22 09:50:55 2006
@@ -43,7 +43,7 @@
Column result scale after division is: 23
dc / 2 = 5.55000000000000000000000
dc / 2 = 5.55500000000000000000000
-JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.2 (10.2.1.4)
+JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.2 (10.2.1.4 -(EXPECTED SUBVERSION INFO))
DatabaseMetaData.getURL test passed
allTablesAreSelectable(): true
maxColumnNameLength(): 128
@@ -179,8 +179,8 @@
nullsAreSortedAtStart(): false
nullsAreSortedAtEnd(): false
getDatabaseProductName(): Apache Derby
-getDatabaseProductVersion(): 10.2.1.4
-getDriverVersion(): 10.2.1.4
+getDatabaseProductVersion(): 10.2.1.4 -(EXPECTED SUBVERSION INFO)
+getDriverVersion(): 10.2.1.4 -(EXPECTED SUBVERSION INFO)
usesLocalFiles(): true
usesLocalFilePerTable(): true
supportsMixedCaseIdentifiers(): false
Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/NSinSameJVM.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/NSinSameJVM.out?view=diff&rev=448991&r1=448990&r2=448991
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/NSinSameJVM.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/NSinSameJVM.out Fri Sep 22 09:50:55 2006
@@ -1,6 +1,6 @@
main-NSinSameJVM: Derby drivers loaded
-Apache Derby Network Server - 10.2.1.4 started and ready to accept connections on port 20000 at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
+Apache Derby Network Server - 10.2.1.4 - (1) started and ready to accept connections on port 20000 at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
main-NSinSameJVM: NetworkServer started
main-NSinSameJVM: Connected to database NSinSameJVMTestDB;create=true
getting ready to shutdown
-Apache Derby Network Server - 10.2.1.4 shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
+Apache Derby Network Server - 10.2.1.4 - (1) shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/dbMetaDataJdbc30.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/dbMetaDataJdbc30.out?view=diff&rev=448991&r1=448990&r2=448991
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/dbMetaDataJdbc30.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/dbMetaDataJdbc30.out Fri Sep 22 09:50:55 2006
@@ -1,5 +1,5 @@
Test dbMetaDataJdbc30 starting
-JDBC Driver 'Apache Derby Embedded JDBC Driver', version 10.2 (10.2.1.4)
+JDBC Driver 'Apache Derby Embedded JDBC Driver', version 10.2 (10.2.1.4 -(EXPECTED SUBVERSION INFO))
DatabaseMetaData.getURL test passed
supportsSavepoints() : true
supportsNamedParameters() : false
Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out?view=diff&rev=448991&r1=448990&r2=448991
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out Fri Sep 22 09:50:55 2006
@@ -13,7 +13,7 @@
Column result scale after division is: 23
dc / 2 = 5.55000000000000000000000
dc / 2 = 5.55500000000000000000000
-JDBC Driver 'Apache Derby Embedded JDBC Driver', version 10.2 (10.2.1.4)
+JDBC Driver 'Apache Derby Embedded JDBC Driver', version 10.2 (10.2.1.4 -(EXPECTED SUBVERSION INFO))
DatabaseMetaData.getURL test passed
allTablesAreSelectable(): true
maxColumnNameLength(): 128
@@ -149,8 +149,8 @@
nullsAreSortedAtStart(): false
nullsAreSortedAtEnd(): false
getDatabaseProductName(): Apache Derby
-getDatabaseProductVersion(): 10.2.1.4
-getDriverVersion(): 10.2.1.4
+getDatabaseProductVersion(): 10.2.1.4 -(EXPECTED SUBVERSION INFO)
+getDriverVersion(): 10.2.1.4 -(EXPECTED SUBVERSION INFO)
usesLocalFiles(): true
usesLocalFilePerTable(): true
supportsMixedCaseIdentifiers(): false
Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out?view=diff&rev=448991&r1=448990&r2=448991
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out Fri Sep 22 09:50:55 2006
@@ -43,7 +43,7 @@
Column result scale after division is: 23
dc / 2 = 5.55000000000000000000000
dc / 2 = 5.55500000000000000000000
-JDBC Driver 'Apache Derby Embedded JDBC Driver', version 10.2 (10.2.1.4)
+JDBC Driver 'Apache Derby Embedded JDBC Driver', version 10.2 (10.2.1.4 -(EXPECTED SUBVERSION INFO))
DatabaseMetaData.getURL test passed
allTablesAreSelectable(): true
maxColumnNameLength(): 128
@@ -179,8 +179,8 @@
nullsAreSortedAtStart(): false
nullsAreSortedAtEnd(): false
getDatabaseProductName(): Apache Derby
-getDatabaseProductVersion(): 10.2.1.4
-getDriverVersion(): 10.2.1.4
+getDatabaseProductVersion(): 10.2.1.4 -(EXPECTED SUBVERSION INFO)
+getDriverVersion(): 10.2.1.4 -(EXPECTED SUBVERSION INFO)
usesLocalFiles(): true
usesLocalFilePerTable(): true
supportsMixedCaseIdentifiers(): false
Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out?view=diff&rev=448991&r1=448990&r2=448991
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out Fri Sep 22 09:50:55 2006
@@ -3,21 +3,21 @@
org.apache.derby.drda.NetworkServerControl start
Successfully Connected
org.apache.derby.drda.NetworkServerControl shutdown
-Apache Derby Network Server - 10.2.1.4 shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
+Apache Derby Network Server - 10.2.1.4 - (1) shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
Testing System properties Port 1529
-----Dderby.drda.portNumber=1529 org.apache.derby.drda.NetworkServerControl start
Successfully Connected
org.apache.derby.drda.NetworkServerControl shutdown -p 1529
-Apache Derby Network Server - 10.2.1.4 shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
+Apache Derby Network Server - 10.2.1.4 - (1) shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
Testing command line option. Port 1530
org.apache.derby.drda.NetworkServerControl start -p 1530
Successfully Connected
org.apache.derby.drda.NetworkServerControl shutdown -p 1530
-Apache Derby Network Server - 10.2.1.4 shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
+Apache Derby Network Server - 10.2.1.4 - (1) shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
Testing start server by specifying system properties without values
First shutdown server started on default port by the test harness
org.apache.derby.drda.NetworkServerControl shutdown -p 1527
-Apache Derby Network Server - 10.2.1.4 shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
+Apache Derby Network Server - 10.2.1.4 - (1) shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
-----Dderby.drda.logConnections -Dderby.drda.traceAll -Dderby.drda.traceDirectory -Dderby.drda.keepAlive -Dderby.drda.timeSlice -Dderby.drda.host -Dderby.drda.portNumber -Dderby.drda.minThreads -Dderby.drda.maxThreads -Dderby.drda.startNetworkServer -Dderby.drda.debug org.apache.derby.drda.NetworkServerControl start
----- listing properties --
derby.drda.maxThreads=0
@@ -58,7 +58,7 @@
derby.drda.host=xxxFILTERED_HOSTNAMExxx
derby.drda.traceAll=false
org.apache.derby.drda.NetworkServerControl shutdown -p 1527
-Apache Derby Network Server - 10.2.1.4 shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
+Apache Derby Network Server - 10.2.1.4 - (1) shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
org.apache.derby.drda.NetworkServerControl
No arguments given.
Usage: NetworkServerControl <commands>
Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/dbMetaDataJdbc30_sed.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/dbMetaDataJdbc30_sed.properties?view=diff&rev=448991&r1=448990&r2=448991
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/dbMetaDataJdbc30_sed.properties (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/dbMetaDataJdbc30_sed.properties Fri Sep 22 09:50:55 2006
@@ -6,4 +6,4 @@
# Multiple patterns for SUBSTITUTE: comma separated <pattern;substitute> pair
# substitute=pattern1;substitute1,pattern2;substitute2,...,patternn;substituten
# No commas or semicolons can be allowed in the patterns/subsitutes.
-substitute=version [0-9].[0-9]..[0-9].[0-9].[0-9][0-9]?[0-9]?.[A-Za-z ]*.$;version (EXPECTED VERSION),version [0-9].[0-9]..[0-9].[0-9].[0-9][0-9]? Test Build.$;version (EXPECTED VERSION)
+substitute=- [(][0-9]+:?[0-9]*M?[)];-(EXPECTED SUBVERSION INFO),version [0-9].[0-9]..[0-9].[0-9].[0-9][0-9]?[0-9]?.[A-Za-z ]*.$;version (EXPECTED VERSION),version [0-9].[0-9]..[0-9].[0-9].[0-9][0-9]? Test Build.$;version (EXPECTED VERSION)
Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_sed.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_sed.properties?view=diff&rev=448991&r1=448990&r2=448991
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_sed.properties (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_sed.properties Fri Sep 22 09:50:55 2006
@@ -6,4 +6,4 @@
# Multiple patterns for SUBSTITUTE: comma separated <pattern;substitute> pair
# substitute=pattern1;substitute1,pattern2;substitute2,...,patternn;substituten
# No commas or semicolons can be allowed in the patterns/subsitutes.
-substitute=version [0-9][.][0-9]..[0-9][.][0-9][.][0-9][0-9]?[0-9]?.[A-Za-z ]*.$;version (EXPECTED VERSION),version [0-9][.][0-9]..[0-9].[0-9].[0-9][0-9]? Test Build.$;version (EXPECTED VERSION),getDriverVersion....[2-3].*$;getDriverVersion(): EXPECTED VERSION
+substitute=- [(][0-9]+:?[0-9]*M?[)];-(EXPECTED SUBVERSION INFO),version [0-9][.][0-9]..[0-9][.][0-9][.][0-9][0-9]?[0-9]?.[A-Za-z ]*.$;version (EXPECTED VERSION),version [0-9][.][0-9]..[0-9].[0-9].[0-9][0-9]? Test Build.$;version (EXPECTED VERSION),getDriverVersion....[2-3].*$;getDriverVersion(): EXPECTED VERSION
Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_test.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_test.java?view=diff&rev=448991&r1=448990&r2=448991
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_test.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_test.java Fri Sep 22 09:50:55 2006
@@ -552,9 +552,6 @@
System.out.println("getDatabaseProductName(): " + met.getDatabaseProductName());
String v = met.getDatabaseProductVersion();
- int l = v.indexOf('(');
- if (l<0) l = v.length();
- v = v.substring(0,l);
System.out.println("getDatabaseProductVersion(): " + v);
System.out.println("getDriverVersion(): " +
met.getDriverVersion());
Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/odbc_metadata_sed.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/odbc_metadata_sed.properties?view=diff&rev=448991&r1=448990&r2=448991
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/odbc_metadata_sed.properties (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/odbc_metadata_sed.properties Fri Sep 22 09:50:55 2006
@@ -6,4 +6,4 @@
# Multiple patterns for SUBSTITUTE: comma separated <pattern;substitute> pair
# substitute=pattern1;substitute1,pattern2;substitute2,...,patternn;substituten
# No commas or semicolons can be allowed in the patterns/subsitutes.
-substitute=version [0-9][.][0-9]..[0-9][.][0-9][.][0-9][0-9]?[0-9]?.[A-Za-z ]*.$;version (EXPECTED VERSION),version [0-9][.][0-9]..[0-9].[0-9].[0-9][0-9]? Test Build.$;version (EXPECTED VERSION),getDriverVersion....[2-3].*$;getDriverVersion(): EXPECTED VERSION
+substitute=- [(][0-9]+:?[0-9]*M?[)];-(EXPECTED SUBVERSION INFO),version [0-9][.][0-9]..[0-9][.][0-9][.][0-9][0-9]?[0-9]?.[A-Za-z ]*.$;version (EXPECTED VERSION),version [0-9][.][0-9]..[0-9].[0-9].[0-9][0-9]? Test Build.$;version (EXPECTED VERSION),getDriverVersion....[2-3].*$;getDriverVersion(): EXPECTED VERSION