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 ka...@apache.org on 2006/11/24 14:33:05 UTC
svn commit: r478877 - in /db/derby/code/trunk/java:
client/org/apache/derby/client/am/ drda/org/apache/derby/impl/drda/
testing/org/apache/derbyTesting/functionTests/master/
testing/org/apache/derbyTesting/functionTests/master/ibm14/
testing/org/apache...
Author: kahatlen
Date: Fri Nov 24 05:33:01 2006
New Revision: 478877
URL: http://svn.apache.org/viewvc?view=rev&rev=478877
Log:
DERBY-1434: Client can send incorrect database name to server after
having made multiple connections to different databases.
Patch contributed by Julius Stroffek.
Added:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DRDAProtocolTest.java (with props)
Modified:
db/derby/code/trunk/java/client/org/apache/derby/client/am/SectionManager.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ibm14/testProtocol.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProtocol.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/protocol.tests
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/values1.inc
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/values64kblksz.inc
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/SectionManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/SectionManager.java?view=diff&rev=478877&r1=478876&r2=478877
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/SectionManager.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/SectionManager.java Fri Nov 24 05:33:01 2006
@@ -52,8 +52,8 @@
// setPKGNAMCBytes
// holdPKGNAMCBytes stores PKGNAMCBytes when holdability is hold
// noHoldPKGNAMCBytes stores PKGNAMCBytes when holdability is no hold
- public static byte[] holdPKGNAMCBytes = null;
- public static byte[] noHoldPKGNAMCBytes = null;
+ public byte[] holdPKGNAMCBytes = null;
+ public byte[] noHoldPKGNAMCBytes = null;
final static String packageNameWithHold__ = "SYSLH000";
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java?view=diff&rev=478877&r1=478876&r2=478877
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java Fri Nov 24 05:33:01 2006
@@ -4941,6 +4941,24 @@
reader.readString(rdbnam, CodePoint.RDBNAM_LEN, true);
if (SanityManager.DEBUG)
trace("rdbnam = " + rdbnam);
+
+ // A check that the rdbnam field corresponds to a database
+ // specified in a ACCRDB term.
+ // The check is not performed if the client is DNC_CLIENT
+ // with version before 10.3.0 because these clients
+ // are broken and send incorrect database name
+ // if multiple connections to different databases
+ // are created
+
+ // This check was added because of DERBY-1434
+
+ // check the client version first
+ if ( appRequester.getClientType() != AppRequester.DNC_CLIENT
+ || appRequester.greaterThanOrEqualTo(10,3,0) ) {
+ // check the database name
+ if (!rdbnam.toString().equals(database.dbName))
+ rdbnamMismatch(CodePoint.PKGNAMCSN);
+ }
reader.readString(rdbcolid, CodePoint.RDBCOLID_LEN, true);
if (SanityManager.DEBUG)
@@ -4968,6 +4986,24 @@
reader.readString(rdbnam, length, true);
if (SanityManager.DEBUG)
trace("rdbnam = " + rdbnam);
+
+ // A check that the rdbnam field corresponds to a database
+ // specified in a ACCRDB term.
+ // The check is not performed if the client is DNC_CLIENT
+ // with version before 10.3.0 because these clients
+ // are broken and send incorrect database name
+ // if multiple connections to different databases
+ // are created
+
+ // This check was added because of DERBY-1434
+
+ // check the client version first
+ if ( appRequester.getClientType() != AppRequester.DNC_CLIENT
+ || appRequester.greaterThanOrEqualTo(10,3,0) ) {
+ // check the database name
+ if (!rdbnam.toString().equals(database.dbName))
+ rdbnamMismatch(CodePoint.PKGNAMCSN);
+ }
//RDBCOLID can be variable length in this format
length = reader.readNetworkShort();
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ibm14/testProtocol.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ibm14/testProtocol.out?view=diff&rev=478877&r1=478876&r2=478877
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ibm14/testProtocol.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ibm14/testProtocol.out Fri Nov 24 05:33:01 2006
@@ -121,6 +121,8 @@
PASSED
Test for bad length for RDBNAM in PKGNAMCSN
PASSED
+Test for bad RDBNAM in PKGNAMCSN
+PASSED
Test for bad length for PKGID in PKGNAMCSN
PASSED
Test for invalid codepoint on EXCSQLIMM
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProtocol.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProtocol.out?view=diff&rev=478877&r1=478876&r2=478877
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProtocol.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProtocol.out Fri Nov 24 05:33:01 2006
@@ -121,6 +121,8 @@
PASSED
Test for bad length for RDBNAM in PKGNAMCSN
PASSED
+Test for bad RDBNAM in PKGNAMCSN
+PASSED
Test for bad length for PKGID in PKGNAMCSN
PASSED
Test for invalid codepoint on EXCSQLIMM
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java?view=diff&rev=478877&r1=478876&r2=478877
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java Fri Nov 24 05:33:01 2006
@@ -56,6 +56,7 @@
suite.addTest(org.apache.derbyTesting.functionTests.tests.jdbcapi._Suite.suite());
suite.addTest(org.apache.derbyTesting.functionTests.tests.store._Suite.suite());
suite.addTest(org.apache.derbyTesting.functionTests.tests.tools._Suite.suite());
+ suite.addTest(org.apache.derbyTesting.functionTests.tests.derbynet._Suite.suite());
// Suites that are compiled using Java SE 6 target need to
// be added this way, otherwise creating the suite
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DRDAProtocolTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DRDAProtocolTest.java?view=auto&rev=478877
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DRDAProtocolTest.java (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DRDAProtocolTest.java Fri Nov 24 05:33:01 2006
@@ -0,0 +1,93 @@
+/*
+
+ Derby - Class org.apache.derbyTesting.functionTests.tests.derbynet.DRDAProtocolTest
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ */
+
+package org.apache.derbyTesting.functionTests.tests.derbynet;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import javax.sql.DataSource;
+
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.derbyTesting.junit.JDBCDataSource;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseJDBCTestSetup;
+import org.apache.derbyTesting.junit.TestConfiguration;
+import org.apache.derbyTesting.junit.SupportFilesSetup;
+
+/** The test of the properties of the DRDA network protocol implementation.
+ */
+public class DRDAProtocolTest extends BaseJDBCTestCase {
+
+ /** Test whether the multiple connections to different databases
+ * on a same derby instance are working without exceptions. */
+ public void testMultipleConnections() throws Exception {
+ DataSource ds1 = JDBCDataSource.getDataSource("FIRSTDB1");
+ JDBCDataSource.setBeanProperty(ds1, "connectionAttributes",
+ "create=true");
+ Connection conn1 = ds1.getConnection();
+ conn1.setAutoCommit(false);
+
+ Statement st = conn1.createStatement();
+ st.execute("create table FIRSTDB_T1 (i int, j int, k int)");
+ st.execute("insert into FIRSTDB_T1 values (1, 3, 5)");
+ PreparedStatement pSt1 =
+ conn1.prepareStatement("select * from FIRSTDB_T1");
+
+ ResultSet rs1 = pSt1.executeQuery();
+ rs1.next();
+ rs1.close();
+
+ DataSource ds2 = JDBCDataSource.getDataSource("SECONDDB2");
+ JDBCDataSource.setBeanProperty(ds2, "connectionAttributes",
+ "create=true");
+ Connection conn2 = ds2.getConnection();
+ conn2.setAutoCommit(false);
+ Statement st2 = conn2.createStatement();
+ st2.execute("create table SECONDDB_T1 (i int, j int, k int)");
+ st2.execute("insert into SECONDDB_T1 values (2, 4, 6)");
+ PreparedStatement pSt2 =
+ conn2.prepareStatement("select * from SECONDDB_T1");
+
+ rs1 = pSt2.executeQuery();
+ rs1.next();
+ rs1.close();
+
+ conn1.rollback();
+ conn1.close();
+ conn2.rollback();
+ conn2.close();
+ }
+
+ /* ------------------- end helper methods -------------------------- */
+ public DRDAProtocolTest(String name) {
+ super(name);
+ }
+
+ public static Test suite() {
+ return TestConfiguration.clientServerSuite(DRDAProtocolTest.class);
+ }
+
+}
Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DRDAProtocolTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java?view=diff&rev=478877&r1=478876&r2=478877
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java Fri Nov 24 05:33:01 2006
@@ -48,6 +48,7 @@
suite.addTest(ShutDownDBWhenNSShutsDownTest.suite());
suite.addTest(SqlExceptionTest.suite());
suite.addTest(SuicideOfStreamingTest.suite());
+ suite.addTest(DRDAProtocolTest.suite());
return suite;
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/protocol.tests
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/protocol.tests?view=diff&rev=478877&r1=478876&r2=478877
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/protocol.tests (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/protocol.tests Fri Nov 24 05:33:01 2006
@@ -997,7 +997,7 @@
startDdm EXCSQLIMM
startDdm PKGNAMCSN
writeShort 4
-writeString "test"
+writeString "wombat"
writeShort 18
writeString "rdbcolid" 18
writeShort 18
@@ -1022,13 +1022,42 @@
checkError SYNTAXRM 8 11 RDBNAM
endTest
//
+//
+DISPLAY "Test for bad RDBNAM in PKGNAMCSN"
+include connect.inc
+createDssRequest
+startDdm EXCSQLIMM
+startDdm PKGNAMCSN
+writePaddedString "nonexisting" 18
+writePaddedString "rdbcolid" 18
+writePaddedString "pkgid" 18
+writeBytes "0x0101010101010101"
+writeShort 1
+endDdm
+endDdm
+endDss
+createDssObject
+startDdm SQLSTT
+writeByte 0 // null indicator
+writeEncodedLDString "create table abc (a int)" "UTF-8" 4
+writeByte 255 // null indicator
+endDdm
+endDss "0x40"
+createDssRequest // send commit
+startDdm RDBCMM
+endDdm
+endDss
+flush
+checkError PRCCNVRM 8 18
+endTest
+//
DISPLAY "Test for bad length for PKGID in PKGNAMCSN"
include connect.inc
createDssRequest
startDdm EXCSQLIMM
startDdm PKGNAMCSN
writeShort 18
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writeShort 8
writePaddedString "rdbcolid" 8
writeShort 5
@@ -1081,7 +1110,7 @@
createDssRequest
startDdm EXCSQLIMM
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1110,7 +1139,7 @@
createDssRequest
startDdm EXCSQLIMM
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1142,7 +1171,7 @@
createDssRequest
startDdm EXCSQLIMM
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1173,7 +1202,7 @@
createDssRequest
startDdm EXCSQLIMM
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1204,7 +1233,7 @@
createDssRequest
startDdm EXCSQLIMM
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1233,7 +1262,7 @@
createDssRequest
startDdm EXCSQLIMM
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1262,7 +1291,7 @@
createDssRequest
startDdm EXCSQLIMM
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1293,7 +1322,7 @@
createDssRequest
startDdm EXCSQLIMM
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1322,7 +1351,7 @@
createDssRequest
startDdm EXCSQLIMM
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1353,7 +1382,7 @@
createDssRequest
startDdm EXCSQLIMM
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1378,7 +1407,7 @@
createDssRequest
startDdm EXCSQLIMM
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1413,7 +1442,7 @@
createDssRequest
startDdm PRPSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1449,7 +1478,7 @@
createDssRequest
startDdm PRPSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1469,7 +1498,7 @@
createDssRequest
startDdm OPNQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1486,7 +1515,7 @@
createDssRequest
startDdm PRPSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1506,9 +1535,9 @@
createDssRequest
startDdm OPNQRY
startDdm PKGNAMCSN
-writePaddedString "notthistest" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
-writePaddedString "pkgid" 18
+writePaddedString "wrongpkgid" 18
writeBytes "0x0101010101010101"
writeShort 1
endDdm
@@ -1526,7 +1555,7 @@
createDssRequest
startDdm PRPSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1546,7 +1575,7 @@
createDssRequest
startDdm OPNQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1566,7 +1595,7 @@
createDssRequest
startDdm PRPSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1586,7 +1615,7 @@
createDssRequest
startDdm OPNQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1607,7 +1636,7 @@
createDssRequest
startDdm PRPSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1627,7 +1656,7 @@
createDssRequest
startDdm OPNQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1647,7 +1676,7 @@
createDssRequest
startDdm PRPSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1667,7 +1696,7 @@
createDssRequest
startDdm OPNQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1687,7 +1716,7 @@
createDssRequest
startDdm PRPSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1707,7 +1736,7 @@
createDssRequest
startDdm OPNQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1728,7 +1757,7 @@
createDssRequest
startDdm PRPSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1748,7 +1777,7 @@
createDssRequest
startDdm OPNQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1770,7 +1799,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1790,7 +1819,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1812,7 +1841,7 @@
createDssRequest
startDdm PRPSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1832,7 +1861,7 @@
createDssRequest
startDdm OPNQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1855,7 +1884,7 @@
createDssRequest
startDdm PRPSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1880,7 +1909,7 @@
createDssRequest
startDdm OPNQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1917,7 +1946,7 @@
createDssRequest
startDdm PRPSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1937,7 +1966,7 @@
createDssRequest
startDdm OPNQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1963,7 +1992,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -1985,7 +2014,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2015,7 +2044,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2032,7 +2061,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2052,7 +2081,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2072,7 +2101,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2094,7 +2123,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2112,7 +2141,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2135,7 +2164,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2162,7 +2191,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2184,7 +2213,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2211,7 +2240,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2237,7 +2266,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2265,7 +2294,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2299,7 +2328,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2321,7 +2350,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2339,7 +2368,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2361,7 +2390,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2379,7 +2408,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2401,7 +2430,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2419,7 +2448,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2441,7 +2470,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2459,7 +2488,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2477,7 +2506,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2497,7 +2526,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2519,7 +2548,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2539,7 +2568,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2561,7 +2590,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2583,7 +2612,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2601,7 +2630,7 @@
createDssRequest
startDdm CLSQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2618,9 +2647,9 @@
createDssRequest
startDdm CLSQRY
startDdm PKGNAMCSN
-writePaddedString "notthere" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
-writePaddedString "pkgid" 18
+writePaddedString "wrongpkgid" 18
writeBytes "0x0101010101010101"
writeShort 1
endDdm
@@ -2641,7 +2670,7 @@
createDssRequest
startDdm CLSQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2658,7 +2687,7 @@
//createDssRequest
//startDdm CLSQRY
//startDdm PKGNAMCSN
-//writePaddedString "test" 18
+//writePaddedString "wombat" 18
//writePaddedString "rdbcolid" 18
//writePaddedString "pkgid" 18
//writeBytes "0x0101010101010101"
@@ -2804,7 +2833,7 @@
createDssRequest
startDdm EXCSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2822,7 +2851,7 @@
createDssRequest
startDdm EXCSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2841,7 +2870,7 @@
createDssRequest
startDdm EXCSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2860,7 +2889,7 @@
createDssRequest
startDdm EXCSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2900,7 +2929,7 @@
createDssRequest
startDdm PRPSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2920,7 +2949,7 @@
createDssRequest
startDdm PRPSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2940,7 +2969,7 @@
createDssRequest
startDdm PRPSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2960,7 +2989,7 @@
createDssRequest
startDdm PRPSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -2992,7 +3021,7 @@
createDssRequest
startDdm PRPSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -3014,7 +3043,7 @@
createDssRequest
startDdm PRPSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -3053,7 +3082,7 @@
createDssRequest
startDdm PRPSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -3073,7 +3102,7 @@
createDssRequest
startDdm DSCSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -3093,7 +3122,7 @@
createDssRequest
startDdm PRPSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -3113,7 +3142,7 @@
createDssRequest
startDdm DSCSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -3145,7 +3174,7 @@
createDssRequest
startDdm DSCSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -3163,7 +3192,7 @@
createDssRequest
startDdm PRPSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -3188,14 +3217,14 @@
createDssRequest
startDdm EXCSQLSET
startDdm PKGNAMCT
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
writeShort 1
endDdm
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -3216,7 +3245,7 @@
createDssRequest
startDdm EXCSQLIMM
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -3248,7 +3277,7 @@
createDssRequest
startDdm PRPSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -3269,7 +3298,7 @@
createDssRequest
startDdm OPNQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -3293,7 +3322,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -3317,7 +3346,7 @@
createDssRequest
startDdm CLSQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -3347,7 +3376,7 @@
createDssRequest
startDdm PRPSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -3368,7 +3397,7 @@
createDssRequest
startDdm OPNQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -3391,7 +3420,7 @@
createDssRequest
startDdm CNTQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -3415,7 +3444,7 @@
createDssRequest
startDdm CLSQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/values1.inc
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/values1.inc?view=diff&rev=478877&r1=478876&r2=478877
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/values1.inc (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/values1.inc Fri Nov 24 05:33:01 2006
@@ -3,7 +3,7 @@
createDssRequest
startDdm PRPSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -23,7 +23,7 @@
createDssRequest
startDdm OPNQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/values64kblksz.inc
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/values64kblksz.inc?view=diff&rev=478877&r1=478876&r2=478877
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/values64kblksz.inc (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/values64kblksz.inc Fri Nov 24 05:33:01 2006
@@ -3,7 +3,7 @@
createDssRequest
startDdm PRPSQLSTT
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"
@@ -23,7 +23,7 @@
createDssRequest
startDdm OPNQRY
startDdm PKGNAMCSN
-writePaddedString "test" 18
+writePaddedString "wombat" 18
writePaddedString "rdbcolid" 18
writePaddedString "pkgid" 18
writeBytes "0x0101010101010101"