Changes from 1177468/1177468 to 1177504:
------------------------------------------------------------------------
r1177474 | myrnavl | 2011-09-30 03:24:02 +0200 (Fri, 30 Sep 2011) | 3 lines

DERBY-5421; NullPointerException during system.nstest.utils.Dbutil.update_one_row
	adjusting test to not clutter output with NullPointerExceptions.

------------------------------------------------------------------------
r1177483 | dag | 2011-09-30 04:23:36 +0200 (Fri, 30 Sep 2011) | 9 lines

DERBY-5413 NetworkServerControl#main can exit with status 1 without printing an error message to console

Undo the backported patch for this issue, turned out to be mistaken,
cf explanation on issue.  It led to unwanted protocol output in some
cases.

svn merge -r 1177352:1177351  https://svn.apache.org/repos/asf/db/derby/code/branches/10.8


------------------------------------------------------------------------
 
SunOS 5.10 i386 i86pc[siv39.no.oracle.com]
U    java/drda/org/apache/derby/drda/NetworkServerControl.java
U    java/testing/org/apache/derbyTesting/system/nstest/utils/DbUtil.java
U    java/testing/org/apache/derbyTesting/system/nstest/tester/TesterObject.java
 U   java/client/org/apache/derby/client/net/NetCursor.java
 U   .
Updated to revision 1177504.
1177504 URL: https://svn.apache.org/repos/asf/db/derby/code/branches/10.8