Return-Path: X-Original-To: apmail-db-derby-commits-archive@www.apache.org Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4C9BC118FD for ; Wed, 21 May 2014 20:50:28 +0000 (UTC) Received: (qmail 17166 invoked by uid 500); 21 May 2014 20:50:28 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 17140 invoked by uid 500); 21 May 2014 20:50:28 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 17133 invoked by uid 99); 21 May 2014 20:50:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 May 2014 20:50:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 May 2014 20:50:26 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A57FA238890D; Wed, 21 May 2014 20:50:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1596677 - in /db/derby/code/trunk/java: testing/org/apache/derbyTesting/functionTests/master/ij.out tools/org/apache/derby/loc/toolsmessages.properties Date: Wed, 21 May 2014 20:50:06 -0000 To: derby-commits@db.apache.org From: myrnavl@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140521205006.A57FA238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: myrnavl Date: Wed May 21 20:50:06 2014 New Revision: 1596677 URL: http://svn.apache.org/r1596677 Log: DERBY-6515; ij doesn't list its command NoHoldForConnection in the help menu adding the NoHoldForConnection command to the help command output and updating one master file Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ij.out db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ij.out URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ij.out?rev=1596677&r1=1596676&r2=1596677&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ij.out (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ij.out Wed May 21 20:50:06 2014 @@ -103,6 +103,8 @@ help; -- each column to integerValue ASYNC name 'SQL-J text'; -- run the command in another thread WAIT FOR name; -- wait for result of ASYNC'd command + NOHOLDFORCONNECTION; -- sets holdability for a connection to NO HOLD + -- (i.e. ResultSet.CLOSE_CURSORS_AT_COMMIT) GET [SCROLL INSENSITIVE] [WITH { HOLD | NOHOLD }] CURSOR name AS 'SQL-J query'; -- gets a cursor (JDBC result set) on the query -- the default is a forward-only cursor with holdability Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties?rev=1596677&r1=1596676&r2=1596677&view=diff ============================================================================== --- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties (original) +++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties Wed May 21 20:50:06 2014 @@ -126,6 +126,8 @@ IJ_HelpText=\ \ ASYNC name ''SQL-J text''; -- run the command in another thread\n\ \ WAIT FOR name; -- wait for result of ASYNC''d command\n\ \ \n\ +\ NOHOLDFORCONNECTION; -- sets holdability for a connection to NO HOLD\n\ +\ -- (i.e. ResultSet.CLOSE_CURSORS_AT_COMMIT)\n\ \ GET [SCROLL INSENSITIVE] [WITH '{' HOLD | NOHOLD '}'] CURSOR name AS ''SQL-J query'';\n\ \ -- gets a cursor (JDBC result set) on the query\n\ \ -- the default is a forward-only cursor with holdability\n\ @@ -144,7 +146,6 @@ IJ_HelpText=\ \ CLOSE name; -- closes the named cursor\n\ \ LOCALIZEDDISPLAY [ ON | OFF ];\n\ \ -- controls locale sensitive data representation\n\ -\ \n\ \ EXIT; -- exits ij\n\ \ HELP; -- shows this message\n\ \ \n\