db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r358591 [3/6] - in /db/derby/code/trunk/java: drda/org/apache/derby/impl/drda/ testing/ testing/org/apache/derbyTesting/functionTests/harness/ testing/org/apache/derbyTesting/functionTests/master/ testing/org/apache/derbyTesting/functionTes...
Date Thu, 22 Dec 2005 17:29:08 GMT
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/NetServer.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/NetServer.java?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/NetServer.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/NetServer.java Thu Dec 22 09:26:55 2005
@@ -31,6 +31,7 @@
 import java.lang.reflect.Constructor;
 import java.net.ConnectException;
 import java.net.Socket;
+import org.apache.derbyTesting.functionTests.util.TestUtil;
 
 public class NetServer
 {
@@ -41,6 +42,7 @@
     String javaCmd;
     String jvmflags;
     String framework;
+    static String hostName;
     
     Object[] frameworkInfo;
     int port;
@@ -67,13 +69,15 @@
 
     
     static {
+    	hostName=TestUtil.getHostName();
 	m =  new Hashtable();
 	// Hashtable is keyed on framework name and has 
 	// an array of the framework prefix, suffix, driver, port  and 
 	// String[] command arguments to start the server
 	// String[] Command arguments to stop the server
+	String url = "jdbc:derby:net://" + hostName + ":1527/";
 	m.put("DerbyNet", new Object[]
-	    {"jdbc:derby:net://localhost:1527/",                 //prefix
+	    {url,                 //prefix
 	     "",                                            // suffix
 	     "com.ibm.db2.jcc.DB2Driver",                   //driver
 	     "1527",                                        // port
@@ -83,8 +87,9 @@
 			   "shutdown"},
 	     null});                                        //shutdown2
 
+	url = "jdbc:derby://" + hostName + ":1527/";  
 	m.put("DerbyNetClient", new Object[]
-	    {"jdbc:derby://localhost:1527/",                 //prefix
+	    {url,                 //prefix
 	     "",                                            // suffix
 	     "org.apache.derby.jdbc.ClientDriver",           //driver
 	     "1527",                                        // port
@@ -94,8 +99,9 @@
 			   "shutdown"},
 	     null});                                        //shutdown2
 
+	url = "jdbc:db2://" + hostName + ":50000/";
 	m.put("DB2jcc", new Object[]
-	    {"jdbc:db2://localhost:50000/",                //prefix
+	    {url,                //prefix
 	     "",                                            //suffix
 	     "com.ibm.db2.jcc.DB2Driver",                   //driver
 	     "50000",                                       //port
@@ -113,8 +119,8 @@
 	     null});
     }
 
-    public NetServer(File homeDir, String jvmName, String clPath, String
-		     javaCmd, String jvmflags, String framework, boolean startServer) 
+    public NetServer(File homeDir, String jvmName, String clPath, String 
+   	     javaCmd, String jvmflags, String framework, boolean startServer)
 	throws Exception
     {
 	this.homeDir = homeDir;
@@ -132,7 +138,7 @@
     }
     public void start() throws Exception
     {
-	  if (! startServer)
+      if (! startServer)
 	  {
 		System.out.println("startServer = false. Bypass server startup");
 		return;
@@ -221,7 +227,7 @@
  			}
  			else	
  			{
- 				Socket s = new Socket("localhost", this.port);
+ 				Socket s = new Socket(hostName, this.port);
  				s.close();
 				break;
  			}

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunClass.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunClass.java?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunClass.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunClass.java Thu Dec 22 09:26:55 2005
@@ -30,16 +30,14 @@
 	/**
 		param args the arguments to pass into ij
 	*/
-	public RunClass(Class theClass, Method methodToCall, Object args[])
+	public RunClass(Method methodToCall, Object args[])
 	{
 		mainMethod = methodToCall;
 		arguments=args;	
-		testClass = theClass;
 	}
 
 	Object arguments[];
 	Method mainMethod;
-	Class testClass;
 
 	public void run()
 	{
@@ -47,15 +45,14 @@
         {
 		    try
 		    {
-			    mainMethod.invoke(testClass.newInstance(), arguments);				
-		    }
-		    catch (InstantiationException ie)
-		    {
-		        System.out.println("Class could not be instantiated: " + ie);
-		        System.exit(1);
+			    // we're invoking the test class's main method - which is always static
+			    // thus we can pass null, an underlying object argument would be 
+			    // ignored anyway. 
+			    mainMethod.invoke(null, arguments);
 		    }
 		    catch (IllegalAccessException iae)
 		    {
+			iae.printStackTrace();
 		        System.out.println("RunClass: " + iae + " make sure the test class is public.");
 		        System.exit(1);
 		    }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java Thu Dec 22 09:26:55 2005
@@ -119,6 +119,7 @@
 	static Properties suiteProperties;
 	static Properties specialProperties; // for testSpecialProps
 	static BufferedReader runlistFile;
+	static String hostName;
 
     static String [] clientExclusionKeywords = new String [] {
         "at-or-before:", "at-or-after:", "when-at-or-before:jdk",
@@ -419,6 +420,8 @@
             jvmProps.addElement("serverJvm=" + serverJvm);
         if ( (serverJvmName != null) && (serverJvmName.length()>0) )
             jvmProps.addElement("serverJvmName=" + serverJvmName);
+        if ( (hostName != null) && (hostName.length()>0) )
+        	jvmProps.addElement("hostName=" + hostName);
         if ( useprocess == false )
             jvmProps.addElement("useprocess=false");
         if ( skipsed.equals("true") )
@@ -740,6 +743,7 @@
 		bootcp = suiteProperties.getProperty("bootcp");
 		serverJvm = suiteProperties.getProperty("serverJvm");
 		serverJvmName = suiteProperties.getProperty("serverJvmName");
+		hostName = suiteProperties.getProperty("hostName");
 		canondir = suiteProperties.getProperty("canondir");
 		mtestdir = suiteProperties.getProperty("mtestdir");
 		String usepr = suiteProperties.getProperty("useprocess");
@@ -823,7 +827,10 @@
             p.put("serverJvmName", serverJvmName);
 		else
             serverJvmName = p.getProperty("serverJvmName");
-
+        if ( hostName != null )
+            p.put("hostName", hostName);
+        else
+        	p.put("hostName","localhost");
         // Encryption may be set at the top or just for a subsuite
 	    if ( parentProperties.getProperty("encryption") != null )
 		    p.put("encryption", encryption);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java Thu Dec 22 09:26:55 2005
@@ -71,6 +71,7 @@
 	static String canondir; // location of master dir (default is master)
 	static String bootcp; //  path for j9 bootclasspath setting
 	static String serverJvm; //  path for j9 bootclasspath setting
+	static String hostName; // needs to be settable for IPV6 testing; localhost otherwise. 
 	static String ijdefaultResourcePackage; // for ij tests only
 	static String debug; // for setting verbose mode to pass down to RunTest
     static String timeout; // to allow killing a hanging test
@@ -341,6 +342,7 @@
             outputdir = p.getProperty("outputdir");
             canondir = p.getProperty("canondir");
             bootcp = p.getProperty("bootcp");
+            hostName = p.getProperty("hostName");
             serverJvm = p.getProperty("serverJvm");
             systemdiff = p.getProperty("systemdiff");
             ijdefaultResourcePackage = p.getProperty("ij.defaultResourcePackage");
@@ -467,6 +469,9 @@
 		    bootcp = j9bootcp;
 		    suiteProperties.put("bootcp", bootcp);
 		}
+		String hostname = sp.getProperty("hostName");
+		if (hostname != null)
+			suiteProperties.put("hostName", hostname);
 		String serverJvm = sp.getProperty("serverJvm");
 		if (serverJvm != null)
 		    suiteProperties.put("serverJvm", serverJvm);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java Thu Dec 22 09:26:55 2005
@@ -121,6 +121,7 @@
 	static boolean dbIsNew = true;
 	static String runwithjvm="true";
 	static boolean startServer=true; // should test harness start the server
+	static String hostName; // needs to be settable for ipv testing, localhost otherwise.)
 
 	// Other test variables for directories, files, output
 	static String scriptName = ""; // testname as passed in
@@ -276,13 +277,13 @@
                     // default to the latest one we know 
                     jvmnetjvm = "j9_22";
                 }
-			
+
                 ns = new NetServer(baseDir, jvmnetjvm, classpathServer, null,
-								   jvmflags,framework, startServer);
+                                     jvmflags,framework, startServer);
             }
             else
-			    ns = new NetServer(baseDir, jvmName, classpathServer, 
-								   javaCmd, jvmflags,framework, startServer);
+                ns = new NetServer(baseDir, jvmName, classpathServer, 
+                                     javaCmd, jvmflags,framework, startServer);
 		    ns.start();
 		    frameworkInitialized = true;
 	    }
@@ -324,7 +325,7 @@
         {
             isI18N=true;
         }
-
+        
         if (skipsed)
         {
             tmpOutFile.renameTo(finalOutFile);
@@ -418,10 +419,6 @@
         if (testType.startsWith("sql"))
             scriptPath = script.getPath();
                 
-        // Build the test command
-        String[] testCmd = 
-    		buildTestCommand(propString, systemHome, scriptPath);
-        
 	    // cleanup for all tests that re-use standard testCSHome/wombat database
 	    if (useCommonDB == true 
 	    	&& (usesystem == null || usesystem == "")
@@ -434,7 +431,11 @@
         // Create a process to execute the command unless useprocess is false
         if ( useprocess )
 		{
+            // Build the test command
+            String[] testCmd = 
+        		buildTestCommand(propString, systemHome, scriptPath);
             execTestProcess(testCmd);
+        
 		}
         else
 		{
@@ -838,24 +839,33 @@
 			framework = "";
 		else
 			driverName = NetServer.getDriverName(framework);
-		String skipFile;
-		// Some tests will not work with some frameworks,
-		// so check property files for tests to be skipped
-		skipFile = framework + ".exclude";
 
-		if (!framework.equals(""))
-		{
-			if (SkipTest.skipIt(skipFile, scriptName)) {
-				skiptest = true;
-				addSkiptestReason("Test skipped: listed in " + 
-								  skipFile + 
-						  " file, skipping test: " 
-								  + scriptName);
-			}
-		}
-		else
-			framework = "";
-	
+        hostName = sp.getProperty("hostName");
+        // force hostName to localhost if it is not set
+        if (hostName == null)
+           hostName="localhost";
+		
+        // Some tests will not work with some frameworks,
+        // so check suite exclude files for tests to be skipped
+        String skipFile = framework + ".exclude";
+        if (!framework.equals(""))
+        {
+            skiptest = (SkipTest.skipIt(skipFile, scriptName));
+            // in addition, check to see if the test should get skipped 
+            // because it's not suitable for a remotely started server
+            if (!skiptest) 
+            {
+                if (!hostName.equals("localhost")) 
+                {
+                    skipFile = framework + "Remote.exclude";
+                    skiptest = (SkipTest.skipIt(skipFile, scriptName));
+                }
+            }
+            if (skiptest) // if we're skipping...
+                addSkiptestReason("Test skipped: listed in " + skipFile + 
+                     " file, skipping test: " + scriptName);
+        }
+		
 		jvmName = sp.getProperty("jvm");
 
 		//System.out.println("jvmName is: " + jvmName);
@@ -921,7 +931,6 @@
 		
         javaCmd = sp.getProperty("javaCmd");
         bootcp = sp.getProperty("bootcp");
-
         jvmflags = sp.getProperty("jvmflags");
 		testJavaFlags = sp.getProperty("testJavaFlags");
 		classpath = sp.getProperty("classpath");
@@ -1025,7 +1034,7 @@
 		outputdir = sp.getProperty("outputdir");
 		if (outputdir == null)
 		    outputdir = "";
-		bootcp = sp.getProperty("bootcp");
+		
 		canondir = sp.getProperty("canondir");
 		canonpath = sp.getProperty("canonpath");
 
@@ -1048,6 +1057,16 @@
 		else
 		    useprocess = true;
 		
+        // if the hostName is something other than localhost, we must
+        // be trying to connect to a remote server, and so, we should not
+        // try to create a new database.
+        // also, startServer should be false.
+		if (!hostName.equals("localhost"))
+		{
+        	useprocess=false;
+        	startServer=false;
+		}
+		
 		String nosed = sp.getProperty("skipsed");
 		if (nosed != null)
 		{
@@ -1519,7 +1538,6 @@
     		String suppFiles = ap.getProperty("supportfiles");
 			boolean copySupportFiles = ((suppFiles != null) && (suppFiles.length()>0));
 			boolean createExtDirs= new Boolean(ap.getProperty("useextdirs","false")).booleanValue();
-			
     		if (copySupportFiles || createExtDirs)
     		{
 				File copyOutDir = null;
@@ -2048,7 +2066,11 @@
                 defaultPackageName);
         
         if ( (framework != null) )
+        {
             jvmProps.addElement("framework=" + framework);
+            if ((hostName != null) && (!hostName.equals("localhost")))
+            		jvmProps.addElement("hostName=" + hostName);
+        }
             
         if ( (jvmflags != null) && (jvmflags.length()>0) )
         {
@@ -2237,6 +2259,10 @@
         Properties ptmp = System.getProperties();
         ptmp.put("derby.system.home", systemHome);
         ptmp.put("derby.infolog.append", "true");
+        // for framework tests, we may need to pick up the hostName 
+        // passed on on command line to individual tests...
+        if (framework.startsWith("DerbyNet"))
+        	ptmp.put("hostName=", hostName);
         System.setProperties(ptmp);
     	PrintStream stdout = System.out;
     	PrintStream stderr = System.err;
@@ -2255,6 +2281,7 @@
 	        fw.close();
 	        pathStr = tmpOutFile.getCanonicalPath().replace(File.separatorChar,fileSep);
 	    }
+	    
 
     	PrintStream ps = new PrintStream(new FileOutputStream(pathStr), true);
     	System.setOut(ps);
@@ -2301,7 +2328,9 @@
         else if (testType.equals("java"))
         {
             sysProp.put("user.dir", outDir.getCanonicalPath());
-            javaPath = "org.apache.derbyTesting.functionTests.tests." + testDirName;
+	    if (javaPath == null)
+	            javaPath = "org.apache.derbyTesting.functionTests.tests." + testDirName;
+	    
             String[] args = new String[2];
             args[0] = "-p";
             args[1] = propString;
@@ -2313,7 +2342,7 @@
             Method testMain = JavaTest.getMethod("main", classArray);
             Object[] argObj = new Object[1];
             argObj[0] = args;
-			RunClass testObject = new RunClass(JavaTest, testMain, argObj);
+			RunClass testObject = new RunClass(testMain, argObj);
 			Thread testThread = new Thread(testObject);
 			try
 			{
@@ -2324,7 +2353,7 @@
 				}
 				else
 				{
-					testThread.join(timeout * 1000);
+					testThread.join(timeout * 60 * 1000);
 				}
 			}
 			catch(Exception e)
@@ -2377,6 +2406,7 @@
             org.apache.derbyTesting.unitTests.harness.UnitTestMain.main(args);
             */
         }
+        
         ps.close();
         // Reset System.out and System.err
         System.setOut(stdout);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java Thu Dec 22 09:26:55 2005
@@ -35,6 +35,7 @@
 import java.util.Enumeration;
 import java.util.Properties;
 import java.util.StringTokenizer;
+import org.apache.derbyTesting.functionTests.util.TestUtil;
 
 public class Sed
 {
@@ -57,6 +58,8 @@
     public void exec(File srcFile, File dstFile, InputStream isSed, boolean isJCC, boolean isI18N)
         throws IOException
     {
+    	String hostName = TestUtil.getHostName();
+    	
         // Vector for storing lines to be deleted
         Vector deleteLines = new Vector();
         deleteLines.addElement("^ij version.*$");
@@ -165,6 +168,8 @@
         searchStrings.addElement("  DB2ConnectionCorrelator: [0-9A-Z.]*");
 		// Filter for SAX exception name diffs between jvms.
         searchStrings.addElement("org.xml.sax.SAX.*$");
+        // Filter out localhost, or hostName
+        searchStrings.addElement(hostName);
 
         Vector subStrings = new Vector();
         subStrings.addElement("Transaction:(XXX)|");
@@ -202,6 +207,8 @@
         subStrings.addElement("");
 		// Filter for SAX exception name diffs between jvms.
         subStrings.addElement("xxxFILTERED-SAX-EXCEPTIONxxx'.");
+        // Filter out localhost, or hostName
+        subStrings.addElement("xxxFILTERED_HOSTNAMExxx");
         doWork(srcFile, dstFile, null, deleteLines, searchStrings, subStrings, isSed, isI18N);
         
     } // end exec

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jvm.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jvm.java?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jvm.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jvm.java Thu Dec 22 09:26:55 2005
@@ -105,6 +105,7 @@
     public String minorVersion = "";
     public int imajor = 0;
     public int iminor = 0;
+    String hostName;
 
 	// security defaults relative to WS
 	// not used if jvmargs serverPolicyFile or serverCodeBase are set
@@ -370,8 +371,11 @@
 		this.D.addElement(codebaseType + "=" + cb.toURL());
 		// file path to the codebase
 		this.D.addElement("csinfo.codedir=" + cb.getAbsolutePath());
-		this.D.addElement("csinfo.serverhost=localhost");
-		this.D.addElement("csinfo.trustedhost=localhost");	 
+		String hostName = (System.getProperty("hostName"));
+		if (hostName == null)
+			hostName="localhost";
+		this.D.addElement("csinfo.serverhost=" + hostName);
+		this.D.addElement("csinfo.trustedhost=" + hostName);	 
 		
 		// add an invalid path to the unused type 
 		this.D.addElement(unusedType + "=file://unused/");

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/LOBTest.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/LOBTest.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/LOBTest.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/LOBTest.out Thu Dec 22 09:26:55 2005
@@ -3871,3 +3871,4 @@
 insert into blobCheck (bl ) values ( X'a78a' )
 	ERROR 42821: Columns of type 'BLOB' cannot hold values of type 'CHAR () FOR BIT DATA'. 
 insert into blobCheck (bl ) values (cast (X'a78a' as blob(80)) )
+drop table blobCheck

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/blobclob4BLOB.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/blobclob4BLOB.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/blobclob4BLOB.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/blobclob4BLOB.out Thu Dec 22 09:26:55 2005
@@ -1,16 +1,16 @@
 Test blobclob starting
 START: prepareCLOBMAIN
-===> inserting extin/short.txt length = 56
-===> inserting extin/littleclob.txt length = 10000
-===> inserting extin/empty.txt length = 0
-===> inserting extin/searchclob.txt length = 5000
-===> inserting extin/aclob.txt length = 300000
+===> inserting short.txt length = 56
+===> inserting littleclob.txt length = 10000
+===> inserting empty.txt length = 0
+===> inserting searchclob.txt length = 5000
+===> inserting aclob.txt length = 300000
 START: prepareSearchClobTable
-===> inserting extin/short.txt length = 56
-===> inserting extin/littleclob.txt length = 10000
-===> inserting extin/empty.txt length = 0
-===> inserting extin/searchclob.txt length = 5000
-===> inserting extin/aclob.txt length = 300000
+===> inserting short.txt length = 56
+===> inserting littleclob.txt length = 10000
+===> inserting empty.txt length = 0
+===> inserting searchclob.txt length = 5000
+===> inserting aclob.txt length = 300000
 prepareSearchClobTable finished
 START: prepareUnicodeTable
 START: prepareUnicodeFile
@@ -524,17 +524,17 @@
 START: clobTest96
 clobTest96 finished
 START: prepareBlobTable
-===> inserting extin/short.txt length = 56
-===> inserting extin/littleclob.txt length = 10000
-===> inserting extin/empty.txt length = 0
-===> inserting extin/searchclob.txt length = 5000
-===> inserting extin/aclob.txt length = 300000
+===> inserting short.txt length = 56
+===> inserting littleclob.txt length = 10000
+===> inserting empty.txt length = 0
+===> inserting searchclob.txt length = 5000
+===> inserting aclob.txt length = 300000
 START: prepareSearchBlobTable
-===> inserting extin/short.txt length = 56
-===> inserting extin/littleclob.txt length = 10000
-===> inserting extin/empty.txt length = 0
-===> inserting extin/searchclob.txt length = 5000
-===> inserting extin/aclob.txt length = 300000
+===> inserting short.txt length = 56
+===> inserting littleclob.txt length = 10000
+===> inserting empty.txt length = 0
+===> inserting searchclob.txt length = 5000
+===> inserting aclob.txt length = 300000
 START: blobTest0
 blobTest0 finished
 START: blobTest2

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/checkDriver.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/checkDriver.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/checkDriver.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/checkDriver.out Thu Dec 22 09:26:55 2005
@@ -2,6 +2,6 @@
 driver.getMajorVersion() = EXPECTED VERSION
 driver.getMinorVersion() = EXPECTED VERSION
 checking acceptsURL(jdbc:derby:wombat;create=true)
-checking acceptsURL(jdbc:derby://localhost:1527/wombat;create=true)
-checking acceptsURL(jdbc:derby:net://localhost:1527/wombat;create=true)
+checking acceptsURL(jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true)
+checking acceptsURL(jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true)
 checking acceptsURL(jdbc:db2j:wombat;create=true)

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/dataSourcePermissions_net.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/dataSourcePermissions_net.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/dataSourcePermissions_net.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/dataSourcePermissions_net.out Thu Dec 22 09:26:55 2005
@@ -35,4 +35,6 @@
 CP connected as EDWARD
 CP connected as FRANCES
 EXPECTED SHUTDOWN DB2 SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat' shutdown.
+EXPECTED SHUTDOWN DB2 SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat' shutdown.
+EXPECTED SHUTDOWN DB2 SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat' shutdown.
 Completed dataSourcePermissions_net

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/dbMetaDataJdbc30.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/dbMetaDataJdbc30.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/dbMetaDataJdbc30.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/dbMetaDataJdbc30.out Thu Dec 22 09:26:55 2005
@@ -1,6 +1,6 @@
 Test dbMetaDataJdbc30 starting
 JDBC Driver 'IBM DB2 JDBC Universal Driver Architecture', version (EXPECTED VERSION)
-The URL is: jdbc:derby:net://localhost:1527/wombat;create=true
+The URL is: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true
 supportsSavepoints() : true
 supportsNamedParameters() : false
 supportsMultipleOpenResults() : true

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/forupdate.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/forupdate.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/forupdate.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/forupdate.out Thu Dec 22 09:26:55 2005
@@ -492,6 +492,8 @@
 0 rows inserted/updated/deleted
 ij> drop table t2;
 0 rows inserted/updated/deleted
+ij> drop table t3;
+0 rows inserted/updated/deleted
 ij> -- bug 5643
 ----- JCC throws NPE when trying to execute a cursor after the resultset is closed
 autocommit off;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/holdCursorExternalSortJDBC30.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/holdCursorExternalSortJDBC30.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/holdCursorExternalSortJDBC30.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/holdCursorExternalSortJDBC30.out Thu Dec 22 09:26:55 2005
@@ -342,4 +342,5 @@
 0 rows inserted/updated/deleted
 ij> drop table foo;
 0 rows inserted/updated/deleted
+ij> commit;
 ij> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/holdCursorIJ.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/holdCursorIJ.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/holdCursorIJ.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/holdCursorIJ.out Thu Dec 22 09:26:55 2005
@@ -312,4 +312,6 @@
 1 row inserted/updated/deleted
 ij> -- clean up.
 close scrollCursor;
+ij> drop table t1;
+0 rows inserted/updated/deleted
 ij> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/holdCursorJDBC30.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/holdCursorJDBC30.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/holdCursorJDBC30.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/holdCursorJDBC30.out Thu Dec 22 09:26:55 2005
@@ -1576,4 +1576,15 @@
 No current row
 ij> commit;
 ij> close test12;
+ij> drop table foo;
+0 rows inserted/updated/deleted
+ij> drop table t1;
+0 rows inserted/updated/deleted
+ij> drop table t2;
+0 rows inserted/updated/deleted
+ij> drop function padstring;
+0 rows inserted/updated/deleted
+ij> drop procedure wait_for_post_commit;
+0 rows inserted/updated/deleted
+ij> commit;
 ij> exit;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out Thu Dec 22 09:26:55 2005
@@ -10,7 +10,7 @@
 dc / 2 = 5.55000000000000000000000
 dc / 2 = 5.55500000000000000000000
 JDBC Driver 'IBM DB2 JDBC Universal Driver Architecture', version (EXPECTED VERSION)
-The URL is: jdbc:derby:net://localhost:1527/wombat;create=true
+The URL is: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true
 allTablesAreSelectable(): true
 maxColumnNameLength(): 128
 getSchemas():

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out Thu Dec 22 09:26:55 2005
@@ -40,7 +40,7 @@
 dc / 2 = 5.55000000000000000000000
 dc / 2 = 5.55500000000000000000000
 JDBC Driver 'IBM DB2 JDBC Universal Driver Architecture', version (EXPECTED VERSION)
-The URL is: jdbc:derby:net://localhost:1527/wombat;create=true
+The URL is: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true
 allTablesAreSelectable(): true
 maxColumnNameLength(): 128
 getSchemas():

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/optimizerOverrides.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/optimizerOverrides.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/optimizerOverrides.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/optimizerOverrides.out Thu Dec 22 09:26:55 2005
@@ -967,4 +967,5 @@
 0 rows inserted/updated/deleted
 ij> drop table temp1;
 0 rows inserted/updated/deleted
+ij> commit;
 ij> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/secureUsers.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/secureUsers.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/secureUsers.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/secureUsers.out Thu Dec 22 09:26:55 2005
@@ -98,11 +98,11 @@
 ij(CONNECTION3)> -- Invalid ones:
 connect 'wombat;user=Jamie;password=theHooligan';
 ij(CONNECTION4)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/wombat;create=true;user=kreg;password=IwasBornReady
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/wombat;user=jeff;password=homeRun
-CONNECTION2 - 	jdbc:derby:net://localhost:1527/wombat;user=howardR;password=takeItEasy
-CONNECTION3 - 	jdbc:derby:net://localhost:1527/wombat;user=francois;password=paceesalute
-CONNECTION4* - 	jdbc:derby:net://localhost:1527/wombat;user=Jamie;password=theHooligan
+CONNECTION0 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true;user=kreg;password=IwasBornReady
+CONNECTION1 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=jeff;password=homeRun
+CONNECTION2 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=howardR;password=takeItEasy
+CONNECTION3 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=francois;password=paceesalute
+CONNECTION4* - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=Jamie;password=theHooligan
 * = current connection
 ij(CONNECTION4)> connect 'guestSchemeDB;user=kreg;password=IwasBornReady';
 ij(CONNECTION5)> connect 'guestSchemeDB;user=jeff;password=homeRun';
@@ -111,16 +111,16 @@
 ij(CONNECTION8)> -- Invalid ones:
 connect 'guestSchemeDB;user=Jamie;password=theHooligan';
 ij(CONNECTION9)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/wombat;create=true;user=kreg;password=IwasBornReady
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/wombat;user=jeff;password=homeRun
-CONNECTION2 - 	jdbc:derby:net://localhost:1527/wombat;user=howardR;password=takeItEasy
-CONNECTION3 - 	jdbc:derby:net://localhost:1527/wombat;user=francois;password=paceesalute
-CONNECTION4 - 	jdbc:derby:net://localhost:1527/wombat;user=Jamie;password=theHooligan
-CONNECTION5 - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=kreg;password=IwasBornReady
-CONNECTION6 - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=jeff;password=homeRun
-CONNECTION7 - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=howardR;password=takeItEasy
-CONNECTION8 - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=francois;password=paceesalute
-CONNECTION9* - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=Jamie;password=theHooligan
+CONNECTION0 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true;user=kreg;password=IwasBornReady
+CONNECTION1 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=jeff;password=homeRun
+CONNECTION2 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=howardR;password=takeItEasy
+CONNECTION3 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=francois;password=paceesalute
+CONNECTION4 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=Jamie;password=theHooligan
+CONNECTION5 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB;user=kreg;password=IwasBornReady
+CONNECTION6 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB;user=jeff;password=homeRun
+CONNECTION7 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB;user=howardR;password=takeItEasy
+CONNECTION8 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB;user=francois;password=paceesalute
+CONNECTION9* - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB;user=Jamie;password=theHooligan
 * = current connection
 ij(CONNECTION9)> connect 'derbySchemeDB;user=mamta;password=ieScape';
 ij(CONNECTION10)> connect 'derbySchemeDB;user=dan;password=makeItFaster';
@@ -131,19 +131,19 @@
 ij(CONNECTION12)> connect 'derbySchemeDB;user=francois;password=paceesalute';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij(CONNECTION12)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/wombat;create=true;user=kreg;password=IwasBornReady
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/wombat;user=jeff;password=homeRun
-CONNECTION10 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=mamta;password=ieScape
-CONNECTION11 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=dan;password=makeItFaster
-CONNECTION12* - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=martin;password=obfuscateIt
-CONNECTION2 - 	jdbc:derby:net://localhost:1527/wombat;user=howardR;password=takeItEasy
-CONNECTION3 - 	jdbc:derby:net://localhost:1527/wombat;user=francois;password=paceesalute
-CONNECTION4 - 	jdbc:derby:net://localhost:1527/wombat;user=Jamie;password=theHooligan
-CONNECTION5 - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=kreg;password=IwasBornReady
-CONNECTION6 - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=jeff;password=homeRun
-CONNECTION7 - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=howardR;password=takeItEasy
-CONNECTION8 - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=francois;password=paceesalute
-CONNECTION9 - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=Jamie;password=theHooligan
+CONNECTION0 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true;user=kreg;password=IwasBornReady
+CONNECTION1 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=jeff;password=homeRun
+CONNECTION10 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=mamta;password=ieScape
+CONNECTION11 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=dan;password=makeItFaster
+CONNECTION12* - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=martin;password=obfuscateIt
+CONNECTION2 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=howardR;password=takeItEasy
+CONNECTION3 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=francois;password=paceesalute
+CONNECTION4 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=Jamie;password=theHooligan
+CONNECTION5 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB;user=kreg;password=IwasBornReady
+CONNECTION6 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB;user=jeff;password=homeRun
+CONNECTION7 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB;user=howardR;password=takeItEasy
+CONNECTION8 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB;user=francois;password=paceesalute
+CONNECTION9 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB;user=Jamie;password=theHooligan
 * = current connection
 ij(CONNECTION12)> connect 'simpleSchemeDB;user=jeff;password=homeRun';
 ij(CONNECTION13)> connect 'simpleSchemeDB;user=howardR;password=takeItEasy';
@@ -159,22 +159,22 @@
 ij(CONNECTION15)> connect 'simpleSchemeDB;user=francois;password=corsica';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij(CONNECTION15)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/wombat;create=true;user=kreg;password=IwasBornReady
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/wombat;user=jeff;password=homeRun
-CONNECTION10 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=mamta;password=ieScape
-CONNECTION11 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=dan;password=makeItFaster
-CONNECTION12 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=martin;password=obfuscateIt
-CONNECTION13 - 	jdbc:derby:net://localhost:1527/simpleSchemeDB;user=jeff;password=homeRun
-CONNECTION14 - 	jdbc:derby:net://localhost:1527/simpleSchemeDB;user=howardR;password=takeItEasy
-CONNECTION15* - 	jdbc:derby:net://localhost:1527/simpleSchemeDB;user=francois;password=paceesalute
-CONNECTION2 - 	jdbc:derby:net://localhost:1527/wombat;user=howardR;password=takeItEasy
-CONNECTION3 - 	jdbc:derby:net://localhost:1527/wombat;user=francois;password=paceesalute
-CONNECTION4 - 	jdbc:derby:net://localhost:1527/wombat;user=Jamie;password=theHooligan
-CONNECTION5 - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=kreg;password=IwasBornReady
-CONNECTION6 - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=jeff;password=homeRun
-CONNECTION7 - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=howardR;password=takeItEasy
-CONNECTION8 - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=francois;password=paceesalute
-CONNECTION9 - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=Jamie;password=theHooligan
+CONNECTION0 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true;user=kreg;password=IwasBornReady
+CONNECTION1 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=jeff;password=homeRun
+CONNECTION10 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=mamta;password=ieScape
+CONNECTION11 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=dan;password=makeItFaster
+CONNECTION12 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=martin;password=obfuscateIt
+CONNECTION13 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/simpleSchemeDB;user=jeff;password=homeRun
+CONNECTION14 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/simpleSchemeDB;user=howardR;password=takeItEasy
+CONNECTION15* - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/simpleSchemeDB;user=francois;password=paceesalute
+CONNECTION2 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=howardR;password=takeItEasy
+CONNECTION3 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=francois;password=paceesalute
+CONNECTION4 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=Jamie;password=theHooligan
+CONNECTION5 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB;user=kreg;password=IwasBornReady
+CONNECTION6 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB;user=jeff;password=homeRun
+CONNECTION7 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB;user=howardR;password=takeItEasy
+CONNECTION8 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB;user=francois;password=paceesalute
+CONNECTION9 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB;user=Jamie;password=theHooligan
 * = current connection
 ij(CONNECTION15)> disconnect all;
 ij> show connections;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/secureUsersldap.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/secureUsersldap.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/secureUsersldap.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/secureUsersldap.out Thu Dec 22 09:26:55 2005
@@ -93,9 +93,9 @@
 ij(CONNECTION2)> connect 'derbySchemeDB;user=francois;password=paceesalute';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij(CONNECTION2)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=mamta;password=ieScape
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=dan;password=makeItFaster
-CONNECTION2* - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=martin;password=obfuscateIt
+CONNECTION0 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=mamta;password=ieScape
+CONNECTION1 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=dan;password=makeItFaster
+CONNECTION2* - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=martin;password=obfuscateIt
 * = current connection
 ij(CONNECTION2)> --
 ----- 1rst test phase for LDAP
@@ -114,9 +114,9 @@
 connect 'ldapSchemeDB;user=francois;password=paceesalute';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij(CONNECTION2)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=mamta;password=ieScape
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=dan;password=makeItFaster
-CONNECTION2* - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=martin;password=obfuscateIt
+CONNECTION0 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=mamta;password=ieScape
+CONNECTION1 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=dan;password=makeItFaster
+CONNECTION2* - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=martin;password=obfuscateIt
 * = current connection
 ij(CONNECTION2)> --
 ----- 2nd test phases for LDAP - Cache the User DN locally
@@ -134,9 +134,9 @@
 ij(CONNECTION2)> execute p5 using 'values(''derby.user.francois'', ''uid=francois,ou=People,o=opensource.apache.com'')';
 Statement executed.
 ij(CONNECTION2)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=mamta;password=ieScape
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=dan;password=makeItFaster
-CONNECTION2* - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=martin;password=obfuscateIt
+CONNECTION0 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=mamta;password=ieScape
+CONNECTION1 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=dan;password=makeItFaster
+CONNECTION2* - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=martin;password=obfuscateIt
 * = current connection
 ij(CONNECTION2)> commit;
 ij(CONNECTION2)> autocommit on;
@@ -157,9 +157,9 @@
 ij(CONNECTION2)> connect 'ldapSchemeDB;user=rachael;password=rachaelF';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij(CONNECTION2)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=mamta;password=ieScape
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=dan;password=makeItFaster
-CONNECTION2* - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=martin;password=obfuscateIt
+CONNECTION0 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=mamta;password=ieScape
+CONNECTION1 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=dan;password=makeItFaster
+CONNECTION2* - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=martin;password=obfuscateIt
 * = current connection
 ij(CONNECTION2)> -- Invalid ones:
 connect 'ldapSchemeDB;user=Jamie;password=theHooligan';
@@ -170,9 +170,9 @@
 connect 'ldapSchemeDB;user=francois;password=paceesalute';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij(CONNECTION2)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=mamta;password=ieScape
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=dan;password=makeItFaster
-CONNECTION2* - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=martin;password=obfuscateIt
+CONNECTION0 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=mamta;password=ieScape
+CONNECTION1 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=dan;password=makeItFaster
+CONNECTION2* - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=martin;password=obfuscateIt
 * = current connection
 ij(CONNECTION2)> -- Database shutdown - check user - should fail
 connect 'derbySchemeDB;shutdown=true';
@@ -180,9 +180,9 @@
 ij(CONNECTION2)> connect 'ldapSchemeDB;user=jamie;password=LetMeIn;shutdown=true';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij(CONNECTION2)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=mamta;password=ieScape
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=dan;password=makeItFaster
-CONNECTION2* - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=martin;password=obfuscateIt
+CONNECTION0 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=mamta;password=ieScape
+CONNECTION1 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=dan;password=makeItFaster
+CONNECTION2* - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=martin;password=obfuscateIt
 * = current connection
 ij(CONNECTION2)> -- Database shutdown - check user - should succeed
 connect 'derbySchemeDB;user=mamta;password=ieScape;shutdown=true';
@@ -190,9 +190,9 @@
 ij(CONNECTION2)> connect 'ldapSchemeDB;user=mamta;password=yeeHaLdap;shutdown=true';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij(CONNECTION2)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=mamta;password=ieScape
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=dan;password=makeItFaster
-CONNECTION2* - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=martin;password=obfuscateIt
+CONNECTION0 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=mamta;password=ieScape
+CONNECTION1 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=dan;password=makeItFaster
+CONNECTION2* - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=martin;password=obfuscateIt
 * = current connection
 ij(CONNECTION2)> -- Derby system shutdown - check user - should fail
 connect ';user=jamie;password=LetMeIn;shutdown=true';

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/supersimple.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/supersimple.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/supersimple.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/supersimple.out Thu Dec 22 09:26:55 2005
@@ -123,9 +123,18 @@
 0 rows inserted/updated/deleted
 ij> -- Bug 4694 Test automatic rollback with close of connection
 ----- in ij
-autocommit off;
-ij> create table a (a int);
+connect 'wombat';
+ij(CONNECTION1)> autocommit off;
+ij(CONNECTION1)> create table a (a int);
 0 rows inserted/updated/deleted
+ij(CONNECTION1)> select count(*) from a;
+1          
+-----
+0          
+ij(CONNECTION1)> disconnect;
+ij> set connection connection0;
+ij> select count(*) from a;
+ERROR 42X05: Table 'A' does not exist.
 ij> -- Bug 4758 - Store error does not return properly to client
 autocommit off;
 ij> create table t (i int);
@@ -176,4 +185,10 @@
 some clob 
 ij(CONNECTION1)> drop table t1;
 0 rows inserted/updated/deleted
-ij(CONNECTION1)> 
+ij(CONNECTION1)> commit;
+ij(CONNECTION1)> disconnect;
+ij> set connection connection0;
+ij> autocommit on;
+ij> drop table t;
+0 rows inserted/updated/deleted
+ij> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/sysinfo.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/sysinfo.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/sysinfo.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/sysinfo.out Thu Dec 22 09:26:55 2005
@@ -9,7 +9,7 @@
 derby.drda.logConnections=false
 derby.drda.timeSlice=0
 derby.drda.startNetworkServer=false
-derby.drda.host=localhost
+derby.drda.host=xxxFILTERED_HOSTNAMExxx
 derby.drda.traceAll=false
 ----- Derby Information --------
 -----
@@ -36,7 +36,7 @@
 derby.drda.logConnections=false
 derby.drda.timeSlice=0
 derby.drda.startNetworkServer=false
-derby.drda.host=localhost
+derby.drda.host=xxxFILTERED_HOSTNAMExxx
 derby.drda.traceAll=false
 ----- Derby Information --------
 -----
@@ -64,7 +64,7 @@
 derby.drda.logConnections=false
 derby.drda.timeSlice=0
 derby.drda.startNetworkServer=false
-derby.drda.host=localhost
+derby.drda.host=xxxFILTERED_HOSTNAMExxx
 derby.drda.traceAll=false
 ----- Derby Information --------
 -----

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/testSecMec.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/testSecMec.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/testSecMec.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/testSecMec.out Thu Dec 22 09:26:55 2005
@@ -1,9 +1,9 @@
 Checking security mechanism authentication with DriverManager
-T4: jdbc:derby:net://localhost:20000/wombat;create=true:user=neelima;password=lee;securityMechanism=3;
-T1: jdbc:derby:net://localhost:20000/wombat - EXCEPTION null userid not supported
-T2: jdbc:derby:net://localhost:20000/wombat:user=max; - EXCEPTION null password not supported
-T3: jdbc:derby:net://localhost:20000/wombat:user=neelima;password=lee;
-T6: jdbc:derby:net://localhost:20000/wombat:user=neelima;securityMechanism=4;
-T8: jdbc:derby:net://localhost:20000/wombat:user=neelima;password=lee;securityMechanism=4;
+T4: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;create=true:user=neelima;password=lee;securityMechanism=3;
+T1: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat - EXCEPTION null userid not supported
+T2: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=max; - EXCEPTION null password not supported
+T3: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=neelima;password=lee;
+T6: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=neelima;securityMechanism=4;
+T8: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=neelima;password=lee;securityMechanism=4;
 SECMEC_USRIDPWD: OK
 Completed testSecMec

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/users.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/users.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/users.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/users.out Thu Dec 22 09:26:55 2005
@@ -36,11 +36,11 @@
 ij(CONNECTION2)> connect 'wombat;user=howardR;password=IamBetterAtTennis';
 ij(CONNECTION3)> connect 'wombat;user=francois;password=paceesalute';
 ij(CONNECTION4)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/wombat;user=kreg;password=visualWhat?
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/wombat;user=jeff;password=HomeRun61
-CONNECTION2 - 	jdbc:derby:net://localhost:1527/wombat;user=ames;password=AnyVolunteer?
-CONNECTION3 - 	jdbc:derby:net://localhost:1527/wombat;user=howardR;password=IamBetterAtTennis
-CONNECTION4* - 	jdbc:derby:net://localhost:1527/wombat;user=francois;password=paceesalute
+CONNECTION0 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=kreg;password=visualWhat?
+CONNECTION1 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=jeff;password=HomeRun61
+CONNECTION2 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=ames;password=AnyVolunteer?
+CONNECTION3 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=howardR;password=IamBetterAtTennis
+CONNECTION4* - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=francois;password=paceesalute
 * = current connection
 ij(CONNECTION4)> disconnect all;
 ij> -- check allowed users in myDB db.
@@ -84,12 +84,12 @@
 ij(CONNECTION5)> update APP.t1 set c1 = USER;
 ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'APP.T1'.
 ij(CONNECTION5)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/myDB;user=jerry;password=SacreBleu
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/myDB;user=kreg;password=visualWhat?
-CONNECTION2 - 	jdbc:derby:net://localhost:1527/myDB;user=ames;password=AnyVolunteer?
-CONNECTION3 - 	jdbc:derby:net://localhost:1527/myDB;user=dan;password=MakeItFaster
-CONNECTION4 - 	jdbc:derby:net://localhost:1527/myDB;user=francois;password=paceesalute
-CONNECTION5* - 	jdbc:derby:net://localhost:1527/myDB;user=jamie;password=MrNamePlates
+CONNECTION0 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/myDB;user=jerry;password=SacreBleu
+CONNECTION1 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/myDB;user=kreg;password=visualWhat?
+CONNECTION2 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/myDB;user=ames;password=AnyVolunteer?
+CONNECTION3 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/myDB;user=dan;password=MakeItFaster
+CONNECTION4 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/myDB;user=francois;password=paceesalute
+CONNECTION5* - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/myDB;user=jamie;password=MrNamePlates
 * = current connection
 ij(CONNECTION5)> disconnect all;
 ij> --
@@ -127,8 +127,8 @@
 ij(CONNECTION1)> connect 'wombat;user=jerry;password=SacreBleu;shutdown=true';
 ERROR 04501: Database connection refused.
 ij(CONNECTION1)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/wombat;user=francois;password=paceesalute
-CONNECTION1* - 	jdbc:derby:net://localhost:1527/myDB;user=jerry;password=SacreBleu
+CONNECTION0 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=francois;password=paceesalute
+CONNECTION1* - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/myDB;user=jerry;password=SacreBleu
 * = current connection
 ij(CONNECTION1)> -- Database shutdown - check user - should succeed
 ----- beetle 5367
@@ -137,8 +137,8 @@
 ij(CONNECTION1)> connect 'myDB;user=jerry;password=SacreBleu;shutdown=true';
 ERROR 08006: Database 'myDB' shutdown.
 ij(CONNECTION1)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/wombat;user=francois;password=paceesalute
-CONNECTION1* - 	jdbc:derby:net://localhost:1527/myDB;user=jerry;password=SacreBleu
+CONNECTION0 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=francois;password=paceesalute
+CONNECTION1* - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/myDB;user=jerry;password=SacreBleu
 * = current connection
 ij(CONNECTION1)> -- JBMS System shutdown - check user - should fail
 connect ';user=jamie;password=LetMeIn;shutdown=true';

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/users2.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/users2.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/users2.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/users2.out Thu Dec 22 09:26:55 2005
@@ -72,12 +72,12 @@
 ij(CONNECTION5)> create table APP.t2(c1 char(30));
 ERROR 25503: DDL is not permitted for a read-only connection, user or database.
 ij(CONNECTION5)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/wombat;user=system;password=manager
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/wombat;user=kreg;password=visualWhat?
-CONNECTION2 - 	jdbc:derby:net://localhost:1527/wombat;user=jeff;password=HomeRun61
-CONNECTION3 - 	jdbc:derby:net://localhost:1527/wombat;user=ames;password=AnyVolunteer?
-CONNECTION4 - 	jdbc:derby:net://localhost:1527/wombat;user=howardR;password=IamBetterAtTennis
-CONNECTION5* - 	jdbc:derby:net://localhost:1527/wombat;user=jamie;password=MrNamePlates
+CONNECTION0 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=system;password=manager
+CONNECTION1 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=kreg;password=visualWhat?
+CONNECTION2 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=jeff;password=HomeRun61
+CONNECTION3 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=ames;password=AnyVolunteer?
+CONNECTION4 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=howardR;password=IamBetterAtTennis
+CONNECTION5* - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=jamie;password=MrNamePlates
 * = current connection
 ij(CONNECTION5)> disconnect all;
 ij> -- check allowed users in myDB db.
@@ -169,13 +169,13 @@
 ij(CONNECTION6)> update APP.t1 set c1 = USER;
 ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'APP.T1'.
 ij(CONNECTION6)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/myDB;user=system;password=manager
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/myDB;user=jerry;password=SacreBleu
-CONNECTION2 - 	jdbc:derby:net://localhost:1527/myDB;user=kreg;password=visualWhat?
-CONNECTION3 - 	jdbc:derby:net://localhost:1527/myDB;user=ames;password=AnyVolunteer?
-CONNECTION4 - 	jdbc:derby:net://localhost:1527/myDB;user=dan;password=MakeItFaster
-CONNECTION5 - 	jdbc:derby:net://localhost:1527/myDB;user=francois;password=paceesalute
-CONNECTION6* - 	jdbc:derby:net://localhost:1527/myDB;user=jamie;password=MrNamePlates
+CONNECTION0 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/myDB;user=system;password=manager
+CONNECTION1 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/myDB;user=jerry;password=SacreBleu
+CONNECTION2 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/myDB;user=kreg;password=visualWhat?
+CONNECTION3 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/myDB;user=ames;password=AnyVolunteer?
+CONNECTION4 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/myDB;user=dan;password=MakeItFaster
+CONNECTION5 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/myDB;user=francois;password=paceesalute
+CONNECTION6* - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/myDB;user=jamie;password=MrNamePlates
 * = current connection
 ij(CONNECTION6)> disconnect all;
 ij> --
@@ -201,7 +201,7 @@
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij> connect 'wombat;user=jamie;password=MrNamePlates';
 ij> show connections;
-CONNECTION0* - 	jdbc:derby:net://localhost:1527/wombat;user=jamie;password=MrNamePlates
+CONNECTION0* - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=jamie;password=MrNamePlates
 * = current connection
 ij> connect 'wombat;user=francois;password=paceesalute';
 ij(CONNECTION1)> connect 'myDB;user=jerry;password=SacreBleu';
@@ -213,9 +213,9 @@
 ij(CONNECTION2)> connect 'wombat;user=jerry;password=SacreBleu;shutdown=true';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij(CONNECTION2)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/wombat;user=jamie;password=MrNamePlates
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/wombat;user=francois;password=paceesalute
-CONNECTION2* - 	jdbc:derby:net://localhost:1527/myDB;user=jerry;password=SacreBleu
+CONNECTION0 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=jamie;password=MrNamePlates
+CONNECTION1 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;user=francois;password=paceesalute
+CONNECTION2* - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/myDB;user=jerry;password=SacreBleu
 * = current connection
 ij(CONNECTION2)> disconnect all;
 ij> show connections;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/wisconsin.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/wisconsin.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/wisconsin.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/wisconsin.out Thu Dec 22 09:26:55 2005
@@ -30661,4 +30661,15 @@
 	Ordered null semantics on the following columns: 
 				qualifiers:
 None
+ij> -- cleanup
+drop table TENKTUP1;
+0 rows inserted/updated/deleted
+ij> drop table TENKTUP2;
+0 rows inserted/updated/deleted
+ij> drop table ONEKTUP;
+0 rows inserted/updated/deleted
+ij> drop table BPRIME;
+0 rows inserted/updated/deleted
+ij> drop procedure WISCINSERT;
+0 rows inserted/updated/deleted
 ij> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/LOBTest.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/LOBTest.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/LOBTest.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/LOBTest.out Thu Dec 22 09:26:55 2005
@@ -3871,3 +3871,4 @@
 insert into blobCheck (bl ) values ( X'a78a' )
 	ERROR 42821: Columns of type 'BLOB' cannot hold values of type 'CHAR () FOR BIT DATA'. 
 insert into blobCheck (bl ) values (cast (X'a78a' as blob(80)) )
+drop table blobCheck

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/blobclob4BLOB.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/blobclob4BLOB.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/blobclob4BLOB.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/blobclob4BLOB.out Thu Dec 22 09:26:55 2005
@@ -1,16 +1,16 @@
 Test blobclob starting
 START: prepareCLOBMAIN
-===> inserting extin/short.txt length = 56
-===> inserting extin/littleclob.txt length = 10000
-===> inserting extin/empty.txt length = 0
-===> inserting extin/searchclob.txt length = 5000
-===> inserting extin/aclob.txt length = 300000
+===> inserting short.txt length = 56
+===> inserting littleclob.txt length = 10000
+===> inserting empty.txt length = 0
+===> inserting searchclob.txt length = 5000
+===> inserting aclob.txt length = 300000
 START: prepareSearchClobTable
-===> inserting extin/short.txt length = 56
-===> inserting extin/littleclob.txt length = 10000
-===> inserting extin/empty.txt length = 0
-===> inserting extin/searchclob.txt length = 5000
-===> inserting extin/aclob.txt length = 300000
+===> inserting short.txt length = 56
+===> inserting littleclob.txt length = 10000
+===> inserting empty.txt length = 0
+===> inserting searchclob.txt length = 5000
+===> inserting aclob.txt length = 300000
 prepareSearchClobTable finished
 START: prepareUnicodeTable
 START: prepareUnicodeFile
@@ -524,17 +524,17 @@
 START: clobTest96
 clobTest96 finished
 START: prepareBlobTable
-===> inserting extin/short.txt length = 56
-===> inserting extin/littleclob.txt length = 10000
-===> inserting extin/empty.txt length = 0
-===> inserting extin/searchclob.txt length = 5000
-===> inserting extin/aclob.txt length = 300000
+===> inserting short.txt length = 56
+===> inserting littleclob.txt length = 10000
+===> inserting empty.txt length = 0
+===> inserting searchclob.txt length = 5000
+===> inserting aclob.txt length = 300000
 START: prepareSearchBlobTable
-===> inserting extin/short.txt length = 56
-===> inserting extin/littleclob.txt length = 10000
-===> inserting extin/empty.txt length = 0
-===> inserting extin/searchclob.txt length = 5000
-===> inserting extin/aclob.txt length = 300000
+===> inserting short.txt length = 56
+===> inserting littleclob.txt length = 10000
+===> inserting empty.txt length = 0
+===> inserting searchclob.txt length = 5000
+===> inserting aclob.txt length = 300000
 START: blobTest0
 blobTest0 finished
 START: blobTest2

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDriver.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDriver.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDriver.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDriver.out Thu Dec 22 09:26:55 2005
@@ -2,52 +2,52 @@
 driver.getMajorVersion() = EXPECTED VERSION
 driver.getMinorVersion() = EXPECTED VERSION
 checking acceptsURL(jdbc:derby:wombat;create=true)
-checking acceptsURL(jdbc:derby://localhost:1527/wombat;create=true)
-checking acceptsURL(jdbc:derby:net://localhost:1527/wombat;create=true)
+checking acceptsURL(jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true)
+checking acceptsURL(jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true)
 checking acceptsURL(jdbc:db2j:wombat;create=true)
 testEmbeddedAttributes()
-Connection info for connect(jdbc:derby://localhost:1527/testcreatedb1, {create=true})
-getURL() = jdbc:derby://localhost:1527/testcreatedb1;create=true
+Connection info for connect(jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/testcreatedb1, {create=true})
+getURL() = jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/testcreatedb1;create=true
 getUserName() = APP
 CURRENT SCHEMA = APP
-Connection info for connect(jdbc:derby://localhost:1527/testcreatedb2;create=true, null)
-getURL() = jdbc:derby://localhost:1527/testcreatedb2;create=true
+Connection info for connect(jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/testcreatedb2;create=true, null)
+getURL() = jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/testcreatedb2;create=true
 getUserName() = APP
 CURRENT SCHEMA = APP
-Connection info for connect(jdbc:derby://localhost:1527/testpropdb, {user=APP, password=xxxx})
-getURL() = jdbc:derby://localhost:1527/testpropdb
+Connection info for connect(jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/testpropdb, {user=APP, password=xxxx})
+getURL() = jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/testpropdb
 getUserName() = APP
 CURRENT SCHEMA = APP
-Connection info for connect(jdbc:derby://localhost:1527/testpropdb;user=testuser;password=testpass, null)
-getURL() = jdbc:derby://localhost:1527/testpropdb
+Connection info for connect(jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/testpropdb;user=testuser;password=testpass, null)
+getURL() = jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/testpropdb
 getUserName() = testuser
 CURRENT SCHEMA = TESTUSER
-Connection info for connect(jdbc:derby://localhost:1527/testpropdb;user=testusr, {password=testpass})
-getURL() = jdbc:derby://localhost:1527/testpropdb
+Connection info for connect(jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/testpropdb;user=testusr, {password=testpass})
+getURL() = jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/testpropdb
 getUserName() = testusr
 CURRENT SCHEMA = TESTUSR
-Connection info for connect(jdbc:derby://localhost:1527/testpropdb;user=testuser;password=testpass, null)
-getURL() = jdbc:derby://localhost:1527/testpropdb
+Connection info for connect(jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/testpropdb;user=testuser;password=testpass, null)
+getURL() = jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/testpropdb
 getUserName() = testuser
 CURRENT SCHEMA = TESTUSER
 Expected Exception:08006:DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'testcreatedb1' shutdown.
 testClientAttributes()
-Connection info for connect(jdbc:derby://localhost:1527/testpropdb;traceFile=[DERBY_SYSTEM_HOME]/trace.out, {})
-getURL() = jdbc:derby://localhost:1527/testpropdb;traceFile=[DERBY_SYSTEM_HOME]/trace.out
+Connection info for connect(jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/testpropdb;traceFile=[DERBY_SYSTEM_HOME]/trace.out, {})
+getURL() = jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/testpropdb;traceFile=[DERBY_SYSTEM_HOME]/trace.out
 getUserName() = APP
 CURRENT SCHEMA = APP
  trace file exists
-Connection info for connect(jdbc:derby://localhost:1527/testpropdb, {traceFile=[DERBY_SYSTEM_HOME]/trace2.out})
-getURL() = jdbc:derby://localhost:1527/testpropdb;traceFile=[DERBY_SYSTEM_HOME]/trace2.out
+Connection info for connect(jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/testpropdb, {traceFile=[DERBY_SYSTEM_HOME]/trace2.out})
+getURL() = jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/testpropdb;traceFile=[DERBY_SYSTEM_HOME]/trace2.out
 getUserName() = APP
 CURRENT SCHEMA = APP
  trace file exists
 doClientURLTest()
-doClientURLTest with url: jdbc:derby://localhost:1527/wombat:create=true
-Null connection returned for url jdbc:derby://localhost:1527/wombat:create=true
-doClientURLTest with url: jdbc:derby://localhost:1527/'wombat';create=true
-Connection info for connect(jdbc:derby://localhost:1527/'wombat';create=true, null)
-getURL() = jdbc:derby://localhost:1527/'wombat';create=true
+doClientURLTest with url: jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat:create=true
+Null connection returned for url jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat:create=true
+doClientURLTest with url: jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/'wombat';create=true
+Connection info for connect(jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/'wombat';create=true, null)
+getURL() = jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/'wombat';create=true
 getUserName() = APP
 CURRENT SCHEMA = APP
-PASSED:Connection Successful with url: jdbc:derby://localhost:1527/'wombat';create=true
+PASSED:Connection Successful with url: jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/'wombat';create=true

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dataSourcePermissions_net.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dataSourcePermissions_net.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dataSourcePermissions_net.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dataSourcePermissions_net.out Thu Dec 22 09:26:55 2005
@@ -58,4 +58,6 @@
 Turning on authentication
 EXPECTED SHUTDOWN DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat' shutdown.
 End username and password tests
+EXPECTED SHUTDOWN DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat' shutdown.
+EXPECTED SHUTDOWN DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat' shutdown.
 Completed dataSourcePermissions_net

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out Thu Dec 22 09:26:55 2005
@@ -1,6 +1,6 @@
 Test dbMetaDataJdbc30 starting
 JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.2 (10.2.0.0 alpha)
-The URL is: jdbc:derby://localhost:1527/wombat;create=true
+The URL is: jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true
 supportsSavepoints() : true
 supportsNamedParameters() : false
 supportsMultipleOpenResults() : true

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/forupdate.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/forupdate.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/forupdate.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/forupdate.out Thu Dec 22 09:26:55 2005
@@ -492,6 +492,8 @@
 0 rows inserted/updated/deleted
 ij> drop table t2;
 0 rows inserted/updated/deleted
+ij> drop table t3;
+0 rows inserted/updated/deleted
 ij> -- bug 5643
 ----- JCC throws NPE when trying to execute a cursor after the resultset is closed
 autocommit off;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/holdCursorExternalSortJDBC30.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/holdCursorExternalSortJDBC30.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/holdCursorExternalSortJDBC30.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/holdCursorExternalSortJDBC30.out Thu Dec 22 09:26:55 2005
@@ -342,4 +342,5 @@
 0 rows inserted/updated/deleted
 ij> drop table foo;
 0 rows inserted/updated/deleted
+ij> commit;
 ij> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/holdCursorIJ.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/holdCursorIJ.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/holdCursorIJ.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/holdCursorIJ.out Thu Dec 22 09:26:55 2005
@@ -312,4 +312,6 @@
 1 row inserted/updated/deleted
 ij> -- clean up.
 close scrollCursor;
+ij> drop table t1;
+0 rows inserted/updated/deleted
 ij> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/holdCursorJDBC30.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/holdCursorJDBC30.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/holdCursorJDBC30.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/holdCursorJDBC30.out Thu Dec 22 09:26:55 2005
@@ -1576,4 +1576,15 @@
 No current row
 ij> commit;
 ij> close test12;
+ij> drop table foo;
+0 rows inserted/updated/deleted
+ij> drop table t1;
+0 rows inserted/updated/deleted
+ij> drop table t2;
+0 rows inserted/updated/deleted
+ij> drop function padstring;
+0 rows inserted/updated/deleted
+ij> drop procedure wait_for_post_commit;
+0 rows inserted/updated/deleted
+ij> commit;
 ij> exit;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out Thu Dec 22 09:26:55 2005
@@ -10,7 +10,7 @@
 dc / 2 = 5.55000000000000000000000
 dc / 2 = 5.55500000000000000000000
 JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.2 (10.2.0.0 alpha)
-The URL is: jdbc:derby://localhost:1527/wombat;create=true
+The URL is: jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true
 allTablesAreSelectable(): true
 maxColumnNameLength(): 128
 getSchemas():

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out Thu Dec 22 09:26:55 2005
@@ -40,7 +40,7 @@
 dc / 2 = 5.55000000000000000000000
 dc / 2 = 5.55500000000000000000000
 JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.2 (10.2.0.0 alpha)
-The URL is: jdbc:derby://localhost:1527/wombat;create=true
+The URL is: jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true
 allTablesAreSelectable(): true
 maxColumnNameLength(): 128
 getSchemas():

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/optimizerOverrides.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/optimizerOverrides.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/optimizerOverrides.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/optimizerOverrides.out Thu Dec 22 09:26:55 2005
@@ -976,4 +976,5 @@
 0 rows inserted/updated/deleted
 ij> drop table temp1;
 0 rows inserted/updated/deleted
+ij> commit;
 ij> 



Mime
View raw message