db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chaa...@apache.org
Subject svn commit: r1087370 [1/2] - in /db/derby/docs/trunk/src: adminguide/ devguide/ getstart/ ref/ tools/ tuning/
Date Thu, 31 Mar 2011 16:57:12 GMT
Author: chaase3
Date: Thu Mar 31 16:57:10 2011
New Revision: 1087370

URL: http://svn.apache.org/viewvc?rev=1087370&view=rev
Log:
DERBY-5154 Tables in documentation should not have empty cells

Modified 1 tuning topic, 1 getstart topic, 1 adminguide topic, 3 tools topics, 4 
devguide topics, and 28 reference topics plus the reference map file.

Patches: DERBY-5154-2.diff

Modified:
    db/derby/docs/trunk/src/adminguide/cadminappsclient.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp40724.dita
    db/derby/docs/trunk/src/devguide/cdevspecialtfgetxxx.dita
    db/derby/docs/trunk/src/devguide/rdevconcepts2462.dita
    db/derby/docs/trunk/src/devguide/rdevcsecure190.dita
    db/derby/docs/trunk/src/getstart/rgsdocs10012.dita
    db/derby/docs/trunk/src/ref/crefproper22250.dita
    db/derby/docs/trunk/src/ref/refderby.ditamap
    db/derby/docs/trunk/src/ref/rrefjavsqlprst.dita
    db/derby/docs/trunk/src/ref/rrefproper27529.dita
    db/derby/docs/trunk/src/ref/rrefproper81359.dita
    db/derby/docs/trunk/src/ref/rrefsistabs12813.dita
    db/derby/docs/trunk/src/ref/rrefsistabs22441.dita
    db/derby/docs/trunk/src/ref/rrefsistabs23241.dita
    db/derby/docs/trunk/src/ref/rrefsistabs24045.dita
    db/derby/docs/trunk/src/ref/rrefsistabs24269.dita
    db/derby/docs/trunk/src/ref/rrefsistabs26665.dita
    db/derby/docs/trunk/src/ref/rrefsistabs28114.dita
    db/derby/docs/trunk/src/ref/rrefsistabs33768.dita
    db/derby/docs/trunk/src/ref/rrefsistabs39391.dita
    db/derby/docs/trunk/src/ref/rrefsistabs40972.dita
    db/derby/docs/trunk/src/ref/rrefsistabs79888.dita
    db/derby/docs/trunk/src/ref/rrefsistabslilanguageitemsysstatistics.dita
    db/derby/docs/trunk/src/ref/rrefsistabssyscolperms.dita
    db/derby/docs/trunk/src/ref/rrefsistabssysperms.dita
    db/derby/docs/trunk/src/ref/rrefsistabssyssequences.dita
    db/derby/docs/trunk/src/ref/rrefsistabssystableperms.dita
    db/derby/docs/trunk/src/ref/rrefsqlj33923.dita
    db/derby/docs/trunk/src/ref/rrefsqljargmatching.dita
    db/derby/docs/trunk/src/ref/rrefsysxplain_resultset_timings.dita
    db/derby/docs/trunk/src/ref/rrefsysxplain_resultsets.dita
    db/derby/docs/trunk/src/ref/rrefsysxplain_scan_props.dita
    db/derby/docs/trunk/src/ref/rrefsysxplain_sort_props.dita
    db/derby/docs/trunk/src/ref/rrefsysxplain_statement_timings.dita
    db/derby/docs/trunk/src/ref/rrefsysxplain_statements.dita
    db/derby/docs/trunk/src/tools/rtoolsdrvrnmeurl.dita
    db/derby/docs/trunk/src/tools/ttoolsexporting.dita
    db/derby/docs/trunk/src/tools/ttoolsimporting.dita
    db/derby/docs/trunk/src/tuning/ctuntransform36368.dita

Modified: db/derby/docs/trunk/src/adminguide/cadminappsclient.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminappsclient.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminappsclient.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminappsclient.dita Thu Mar 31 16:57:10 2011
@@ -69,28 +69,28 @@ colwidth="73*"/><colspec colname="col4" 
 <entry colname="col1">databaseName</entry>
 <entry colname="col2">String</entry>
 <entry colname="col3">The name of the database. This property is required.</entry>
-<entry colname="COLSPEC0"></entry>
+<entry colname="COLSPEC0">None</entry>
 <entry colname="col4">This property is also available using EmbeddedDataSource.</entry>
 </row>
 <row>
 <entry colname="col1">dataSourceName</entry>
 <entry colname="col2">String</entry>
 <entry colname="col3">The data source name.</entry>
-<entry colname="COLSPEC0"></entry>
+<entry colname="COLSPEC0">None</entry>
 <entry colname="col4">This property is also available using EmbeddedDataSource.</entry>
 </row>
 <row>
 <entry colname="col1">description</entry>
 <entry colname="col2">String</entry>
 <entry colname="col3">A description of the data source.</entry>
-<entry colname="COLSPEC0"></entry>
+<entry colname="COLSPEC0">None</entry>
 <entry colname="col4">This property is also available using EmbeddedDataSource.</entry>
 </row>
 <row>
 <entry colname="col1">user</entry>
 <entry colname="col2">String</entry>
 <entry colname="col3">The user's account name.</entry>
-<entry colname="COLSPEC0">user</entry>
+<entry colname="COLSPEC0"><i>user</i></entry>
 <entry colname="col4">Default is APP. This property is also available using
 EmbeddedDataSource.</entry>
 </row>
@@ -98,7 +98,7 @@ EmbeddedDataSource.</entry>
 <entry colname="col1">password</entry>
 <entry colname="col2">String</entry>
 <entry colname="col3">The user's database password.</entry>
-<entry colname="COLSPEC0">password</entry>
+<entry colname="COLSPEC0"><i>password</i></entry>
 <entry colname="col4">This property is also available using EmbeddedDataSource.</entry>
 </row>
 <row>
@@ -106,14 +106,14 @@ EmbeddedDataSource.</entry>
 <entry colname="col2">String</entry>
 <entry colname="col3">The host name or TCP/IP address where the server is
 listening for requests.</entry>
-<entry colname="COLSPEC0"></entry>
+<entry colname="COLSPEC0">None</entry>
 <entry colname="col4">Default is "localhost".</entry>
 </row>
 <row>
 <entry colname="col1">portNumber</entry>
 <entry colname="col2">Integer</entry>
 <entry colname="col3">The port number where the server is listening for requests.</entry>
-<entry colname="COLSPEC0"></entry>
+<entry colname="COLSPEC0">None</entry>
 <entry colname="col4">Default is "1527".</entry>
 </row>
 </tbody>
@@ -139,7 +139,7 @@ colwidth="121*"/><colspec colname="col4"
 <entry colname="col3">The filename for tracing output. Setting this property
 turns on tracing. See <xref href="cadminappsclienttracing.dita#cadminappsclienttracing"></xref>.</entry>
 <entry colname="COLSPEC1"><i>traceFile</i></entry>
-<entry colname="col4"></entry>
+<entry colname="col4">None</entry>
 </row>
 <row>
 <entry colname="col1">traceDirectory</entry>
@@ -148,7 +148,7 @@ turns on tracing. See <xref href="cadmin
 will send output to a separate file. Setting this property turns on tracing.
 See <xref href="cadminappsclienttracing.dita#cadminappsclienttracing"></xref>.</entry>
 <entry colname="COLSPEC1"><i>traceDirectory</i></entry>
-<entry colname="col4"></entry>
+<entry colname="col4">None</entry>
 </row>
 <row>
 <entry colname="col1">traceLevel</entry>
@@ -221,7 +221,7 @@ about the various connection attributes.
 <entry colname="col1">createDatabase</entry>
 <entry colname="col2">String</entry>
 <entry colname="COLSPEC2">If set to "create", create the database specified with databaseName property.</entry>
-<entry colname="col3">create</entry>
+<entry colname="col3"><i>create</i></entry>
 <entry colname="COLSPEC3">This property is also available using EmbeddedDataSource.
 See the <ph conref="../conrefs.dita#pub/citref"></ph> for more information.
 Similar to setting connectionAttribute to "create=true". Only "create" is allowed, other values equate to null. The result of conflicting settings of createDatabase, shutdownDatabase and connectionAttributes is undefined.</entry>
@@ -230,7 +230,7 @@ Similar to setting connectionAttribute t
 <entry colname="col1">shutdownDatabase</entry>
 <entry colname="col2">String</entry>
 <entry colname="COLSPEC2">If set to "shutdown", shutdown the database specified with databaseName property.</entry>
-<entry colname="col3">shutdown</entry>
+<entry colname="col3"><i>shutdown</i></entry>
 <entry colname="COLSPEC3">This property is also available using EmbeddedDataSource.
 See the <ph conref="../conrefs.dita#pub/citref"></ph> for more information.
 Similar to setting connectionAttribute to "shutdown=true". Only "shutdown" is allowed, other values equate to null. The result of conflicting settings of createDatabase, shutdownDatabase and connectionAttributes is undefined.

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp40724.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp40724.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp40724.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp40724.dita Thu Mar 31 16:57:10 2011
@@ -71,10 +71,11 @@ directories.</alt></image>
 </fig>
 <p><ph conref="../conrefs.dita#prod/productshortname"></ph> imposes relatively
 few limitations on the number and size of databases and database objects.
-The following table shows some size limitations of <ph conref="../conrefs.dita#prod/productshortname"></ph> databases
+The following table shows some size limitations of
+<ph conref="../conrefs.dita#prod/productshortname"></ph> databases
 and database objects:</p>
-<table id="cdevdvlp85623" rowheader="firstcol"><title>Size limits for Derby
-database objects</title>
+<table id="cdevdvlp85623"><title>Size limits for
+<ph conref="../conrefs.dita#prod/productshortname"></ph> database objects</title>
 <tgroup cols="2" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="40*"/>
 <colspec colname="2" colnum="2" colwidth="60*"/>
 <thead>
@@ -85,33 +86,33 @@ database objects</title>
 </thead>
 <tbody>
 <row>
-<entry colname="1">tables in each database</entry>
+<entry colname="1">Tables in each database</entry>
 <entry colname="2"><i>java.lang.Long.MAX_VALUE</i>   <p>Some operating systems
 impose a limit to the number of files allowed in a single directory.</p></entry>
 </row>
 <row>
-<entry colname="1">indexes in each table</entry>
+<entry colname="1">Indexes in each table</entry>
 <entry colname="2">32,767 or storage</entry>
 </row>
 <row>
-<entry colname="1">columns in each table</entry>
+<entry colname="1">Columns in each table</entry>
 <entry colname="2">1,012</entry>
 </row>
 <row>
-<entry colname="1">number of columns on an index key</entry>
+<entry colname="1">Number of columns on an index key</entry>
 <entry colname="2">16</entry>
 </row>
 <row>
-<entry colname="1">rows in each table</entry>
+<entry colname="1">Rows in each table</entry>
 <entry colname="2">No limit.</entry>
 </row>
 <row>
-<entry colname="1">size of table</entry>
+<entry colname="1">Size of table</entry>
 <entry colname="2">No limit. Some operating systems impose a limit on the
 size of a single file.</entry>
 </row>
 <row>
-<entry colname="1">size of row</entry>
+<entry colname="1">Size of row</entry>
 <entry colname="2">No limit. Rows can span pages. Rows cannot span tables
 so some operating systems impose a limit on the size of a single file, which
 results in limiting the size of a table and size of a row in that table.</entry>

Modified: db/derby/docs/trunk/src/devguide/cdevspecialtfgetxxx.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevspecialtfgetxxx.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevspecialtfgetxxx.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevspecialtfgetxxx.dita Thu Mar 31 16:57:10 2011
@@ -39,16 +39,14 @@ slightly different. This is because JSR 
 <p>The following table lists the preferred <i>getXXX()</i> method for each
 <ph conref="../conrefs.dita#prod/productshortname"></ph> data type.</p>
 
-<table id="cdevspecialtftab1" rowheader="firstcol">
+<table id="cdevspecialtftab1">
 
-<title>
-<b><i>getXXX()</i> Methods Called for Declared SQL Types</b>
-</title>
+<title><i>getXXX()</i> Methods Called for Declared SQL Types</title>
 
 <tgroup cols="3" colsep="1" rowsep="1">
-<colspec colname="1" colnum="1" colwidth="60*"/>
-<colspec colname="2" colnum="2" colwidth="20*"/>
-<colspec colname="3" colnum="3" colwidth="20*"/>
+<colspec colname="1" colnum="1" colwidth="50*"/>
+<colspec colname="2" colnum="2" colwidth="25*"/>
+<colspec colname="3" colnum="3" colwidth="25*"/>
 
 <thead>
 <row>
@@ -183,8 +181,8 @@ slightly different. This is because JSR 
 
 <row>
 <entry colname="1">XML</entry>
-<entry colname="2"><b>Not supported</b></entry>
-<entry colname="3"><b>Not supported</b></entry>
+<entry colname="2">Not supported</entry>
+<entry colname="3">Not supported</entry>
 </row>
 
 </tbody>

Modified: db/derby/docs/trunk/src/devguide/rdevconcepts2462.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/rdevconcepts2462.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevconcepts2462.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevconcepts2462.dita Thu Mar 31 16:57:10 2011
@@ -19,37 +19,40 @@ limitations under the License.
 -->
 <reference id="rdevconcepts2462" xml:lang="en-us">
 <title>Lock compatibility</title>
-<shortdesc>This table lists compatibility between lock types. <codeph>+</codeph> means
-the lock types are compatible,  while <codeph>-</codeph> means they are incompatible.</shortdesc>
+<shortdesc>The following table shows the compatibility between lock
+types. "Yes" means that the lock types are compatible, while "No" means that
+they are incompatible.</shortdesc>
 <refbody>
 <table frame="all" id="cdevconceptslock_mtrx"><title>Lock Compatibility Matrix</title>
 <tgroup cols="4" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="29*"/>
 <colspec colname="2" colnum="2" colwidth="24*"/><colspec colname="3" colnum="3"
 colwidth="24*"/><colspec colname="4" colnum="4" colwidth="24*"/>
-<tbody>
+<thead>
 <row>
-<entry colname="1"></entry>
+<entry colname="1">Lock Type</entry>
 <entry colname="2">Shared</entry>
 <entry colname="3">Update</entry>
 <entry colname="4">Exclusive</entry>
 </row>
+</thead>
+<tbody>
 <row>
-<entry colname="1">Shared</entry>
-<entry colname="2"> <p>+</p></entry>
-<entry colname="3"> <p>+</p></entry>
-<entry colname="4"> <p>-</p></entry>
+<entry colname="1"><b>Shared</b></entry>
+<entry colname="2"> <p>Yes</p></entry>
+<entry colname="3"> <p>Yes</p></entry>
+<entry colname="4"> <p>No</p></entry>
 </row>
 <row>
-<entry colname="1">Update</entry>
-<entry colname="2"> <p>+</p></entry>
-<entry colname="3"> <p>-</p></entry>
-<entry colname="4"> <p>-</p></entry>
+<entry colname="1"><b>Update</b></entry>
+<entry colname="2"> <p>Yes</p></entry>
+<entry colname="3"> <p>No</p></entry>
+<entry colname="4"> <p>No</p></entry>
 </row>
 <row>
-<entry colname="1">Exclusive</entry>
-<entry colname="2"> <p>-</p></entry>
-<entry colname="3"> <p>-</p></entry>
-<entry colname="4"> <p>-</p></entry>
+<entry colname="1"><b>Exclusive</b></entry>
+<entry colname="2"> <p>No</p></entry>
+<entry colname="3"> <p>No</p></entry>
+<entry colname="4"> <p>No</p></entry>
 </row>
 </tbody>
 </tgroup>

Modified: db/derby/docs/trunk/src/devguide/rdevcsecure190.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/rdevcsecure190.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevcsecure190.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevcsecure190.dita Thu Mar 31 16:57:10 2011
@@ -20,7 +20,7 @@ limitations under the License.
 -->
 <reference id="rdevcsecure190" xml:lang="en-us">
 <title>Read-only and full access permissions</title>
-<shortdesc>The actions that users can perform on a Derby database is determined
+<shortdesc>The actions that users can perform on a Derby database are determined
 by the type of access that users have to the database objects.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>permissions<indexterm>read-only access</indexterm></indexterm>
@@ -32,9 +32,10 @@ on the type of access that a user is gra
 apply to regular databases, source databases, and target databases.</section>
 <table frame="all" id="cdevcsecure20486"><title>Actions that are authorized
 by type of access</title>
-<tgroup cols="3" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="37*"/>
-<colspec colname="2" colnum="2" colwidth="21*"/><colspec colname="3" colnum="3"
-colwidth="36*"/>
+<tgroup cols="3" colsep="1" rowsep="1">
+<colspec colname="1" colnum="1" colwidth="50*"/>
+<colspec colname="2" colnum="2" colwidth="25*"/>
+<colspec colname="3" colnum="3" colwidth="25*"/>
 <thead>
 <row>
 <entry align="left" colname="1" valign="bottom">Action</entry>
@@ -45,38 +46,38 @@ colwidth="36*"/>
 <tbody>
 <row>
 <entry colname="1">Executing SELECT statements</entry>
-<entry colname="2">X</entry>
-<entry colname="3">X</entry>
+<entry colname="2">Yes</entry>
+<entry colname="3">Yes</entry>
 </row>
 <row>
 <entry colname="1">Reading database properties</entry>
-<entry colname="2">X</entry>
-<entry colname="3">X</entry>
+<entry colname="2">Yes</entry>
+<entry colname="3">Yes</entry>
 </row>
 <row>
 <entry colname="1">Loading database classes from jar files</entry>
-<entry colname="2">X</entry>
-<entry colname="3">X</entry>
+<entry colname="2">Yes</entry>
+<entry colname="3">Yes</entry>
 </row>
 <row>
 <entry colname="1">Executing INSERT, UPDATE, or DELETE statements</entry>
-<entry colname="2">&nbsp;</entry>
-<entry colname="3">X</entry>
+<entry colname="2">No</entry>
+<entry colname="3">Yes</entry>
 </row>
 <row>
 <entry colname="1">Executing DDL statements</entry>
-<entry colname="2">&nbsp;</entry>
-<entry colname="3">X</entry>
+<entry colname="2">No</entry>
+<entry colname="3">Yes</entry>
 </row>
 <row>
 <entry colname="1">Adding or replacing jar files</entry>
-<entry colname="2">&nbsp;</entry>
-<entry colname="3">X</entry>
+<entry colname="2">No</entry>
+<entry colname="3">Yes</entry>
 </row>
 <row>
 <entry colname="1">Setting database properties</entry>
-<entry colname="2">&nbsp;</entry>
-<entry colname="3">X</entry>
+<entry colname="2">No</entry>
+<entry colname="3">Yes</entry>
 </row>
 </tbody>
 </tgroup>

Modified: db/derby/docs/trunk/src/getstart/rgsdocs10012.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/rgsdocs10012.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/rgsdocs10012.dita (original)
+++ db/derby/docs/trunk/src/getstart/rgsdocs10012.dita Thu Mar 31 16:57:10 2011
@@ -21,8 +21,8 @@ limitations under the License.
 <title>SQL syntax</title>
 <shortdesc>SQL syntax is presented in modified BNF notation.</shortdesc>
 <refbody>
-<section><p>The meta-symbols of BNF are:   <table pgwide="0" frame="all"
-rowheader="firstcol">
+<section><p>The meta-symbols of BNF are listed in the following table.</p>
+<table pgwide="0" frame="all">
 <tgroup cols="2" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="30*"/>
 <colspec colname="2" colnum="2" colwidth="70*"/>
 <thead>
@@ -34,7 +34,7 @@ rowheader="firstcol">
 <tbody>
 <row>
 <entry colname="1"><codeph>|</codeph></entry>
-<entry colname="2">or. Choose one of the items</entry>
+<entry colname="2">Or. Choose one of the items.</entry>
 </row>
 <row>
 <entry colname="1"><codeph>[ ]</codeph></entry>
@@ -48,7 +48,7 @@ special meaning in some SQL statements.<
 <row>
 <entry colname="1"><codeph>{ }</codeph></entry>
 <entry colname="2">Groups items so that they can be marked with one of the
-other symbols, i.e. [ ], |, or *.</entry>
+symbols <codeph>[&nbsp;]</codeph>, <codeph>|</codeph>, or <codeph>*</codeph>.</entry>
 </row>
 <row>
 <entry colname="1"><codeph>( )  . , </codeph></entry>
@@ -56,11 +56,12 @@ other symbols, i.e. [ ], |, or *.</entry
 </row>
 </tbody>
 </tgroup>
-</table></p></section>
-<section><p>An example of how SQL syntax is presented:   <codeblock><b>CREATE [ UNIQUE ] INDEX <b><i>IndexName</i></b>
+</table></section>
+<section><p>The following example shows how SQL syntax is presented:
+<codeblock><b>CREATE [ UNIQUE ] INDEX <b><i>IndexName</i></b>
   ON <b><i>TableName</i></b> ( <b><i>SimpleColumnName</i></b> [ , <b><i>SimpleColumnName</i></b> ] * ) </b></codeblock></p></section>
 <section><p>Command-line syntax for running Java programs and utilities (as
-well as examples) always begins with the word <i>java</i>: <codeblock>java org.apache.derby.tools.ij</codeblock></p></section>
+well as examples) always begins with the command <i>java</i>: <codeblock>java org.apache.derby.tools.ij</codeblock></p></section>
 <section><p>This documentation attempts to be JVM neutral, but any command line examples or syntax using JVM specific references should be verified with your JVM documentation.</p></section>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/ref/crefproper22250.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/crefproper22250.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/crefproper22250.dita (original)
+++ db/derby/docs/trunk/src/ref/crefproper22250.dita Thu Mar 31 16:57:10 2011
@@ -45,12 +45,15 @@ null. To determine the result of this ac
 properties is as follows (as stated in "Precedence of properties" in the
 <ph conref="../conrefs.dita#pub/citdevelop"></ph>).</p>
 <ol>
-<li>[*] System-wide properties set programmatically (as a command-line option
-to the JVM when starting the application or within application code)</li>
+<li>System-wide properties set programmatically (as a command-line option
+to the JVM when starting the application or within application code); not
+consulted if <i><xref href="rrefproper24390.dita#rrefproper24390"></xref></i> is
+set to true</li>
 <li>Database-wide properties</li>
-<li>[*] System-wide properties set in the <i>derby.properties</i> file</li>
-</ol><p>[*] Not consulted if
-<i><xref href="rrefproper24390.dita#rrefproper24390"></xref></i> is set to true.</p>
+<li>System-wide properties set in the <i>derby.properties</i> file; not
+consulted if <i><xref href="rrefproper24390.dita#rrefproper24390"></xref></i> is
+set to true</li>
+</ol>
 <p>Setting the database-wide property to null has the effect of removing the
 property from the list of database properties and restoring the system property
 setting from <i>derby.properties</i> if there is one. As always, if no value can
@@ -67,8 +70,9 @@ you reboot the database. Moreover, the s
 disabled after it has been enabled, even with a reboot.</p>
 <p><xref href="crefproper22250.dita#crefproper22250/rrefproper24108"></xref> summarizes
 the general <ph conref="../conrefs.dita#prod/productshortname"></ph> properties.
-In this table, S stands for system-wide, D stands for database-wide, and C
-indicates the value persists with newly created conglomerates. X means yes.
+In the Scope column of this table, S stands for system-wide, D stands for
+database-wide, and C indicates the value persists with newly created
+conglomerates.</p>
   <table frame="all" id="rrefproper24108" pgwide="0"><title>Derby properties</title>
 <tgroup cols="3" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="50*"/>
 <colspec colname="2" colnum="2" colwidth="12*"/><colspec colname="3" colnum="3"
@@ -77,240 +81,241 @@ colwidth="38*"/>
 <row>
 <entry colname="1">Property</entry>
 <entry colname="2">Scope</entry>
-<entry colname="3">Dynamic</entry>
+<entry colname="3">Dynamic or Static</entry>
 </row>
 </thead>
 <tbody>
 <row>
 <entry colname="1"><i><xref href="rrefproperbuiltinalgorithm.dita#rrefproperbuiltinalgorithm">derby.authentication.builtin.algorithm</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">X<xref href="crefproper22250.dita#crefproper22250/rrefproper97948">*</xref></entry>
+<entry colname="3">Dynamic</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproperauthdn.dita#rrefproperauthdn">derby.authentication.ldap.searchAuthDN</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproperauthpw.dita#rrefproperauthpw">derby.authentication.ldap.searchAuthPW</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper26978.dita#rrefproper26978">derby.authentication.ldap.searchBase</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper37341.dita#rrefproper37341">derby.authentication.ldap.searchFilter</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper13766.dita#rrefproper13766">derby.authentication.provider</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper25581.dita#rrefproper25581">derby.authentication.server</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper27467.dita#rrefproper27467">derby.connection.requireAuthentication</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper24846.dita#rrefproper24846">derby.database.defaultConnectionMode</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">X<xref href="crefproper22250.dita#crefproper22250/rrefproper97948">*</xref></entry>
+<entry colname="3">See the main page for this property for information
+about when changes to the property are dynamic</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper81405.dita#rrefproper81405">derby.database.forceDatabaseLock</xref></i></entry>
 <entry colname="2">S</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper25025.dita#rrefproper25025">derby.database.fullAccessUsers</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">X<xref href="crefproper22250.dita#crefproper22250/rrefproper97948">*</xref></entry>
+<entry colname="3">See the main page for this property for information
+about when changes to the property are dynamic</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefpropernoautoboot.dita#rrefpropernoautoboot">derby.database.noAutoBoot</xref></i></entry>
 <entry colname="2">D</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper24390.dita#rrefproper24390">derby.database.propertiesOnly</xref></i></entry>
 <entry colname="2">D</entry>
-<entry colname="3">X</entry>
+<entry colname="3">Dynamic</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper39325.dita#rrefproper39325">derby.database.readOnlyAccessUsers</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">X<xref href="crefproper22250.dita#crefproper22250/rrefproper97948">*</xref></entry>
+<entry colname="3">See the main page for this property for information
+about when changes to the property are dynamic</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefpropersqlauth.dita#rrefpropersqlauth">derby.database.sqlAuthorization</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper13217.dita#rrefproper13217">derby.infolog.append</xref></i></entry>
 <entry colname="2">S</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproperxatrantimeout.dita#rrefproperxatrantimeout">derby.jdbc.xaTransactionTimeout</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">X</entry>
+<entry colname="3">Dynamic</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper43414.dita#rrefproper43414">derby.language.logQueryPlan</xref></i></entry>
 <entry colname="2">S</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper43517.dita#rrefproper43517">derby.language.logStatementText</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper10607.dita#rrefproper10607">derby.locks.deadlockTimeout</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">X</entry>
+<entry colname="3">Dynamic</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper23835.dita#rrefproper23835">derby.locks.deadlockTrace</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">X</entry>
+<entry colname="3">Dynamic</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper40346.dita#rrefproper40346">derby.locks.escalationThreshold</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">X</entry>
+<entry colname="3">Dynamic</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper98166.dita#rrefproper98166">derby.locks.monitor</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">X</entry>
+<entry colname="3">Dynamic</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper46141.dita#rrefproper46141">derby.locks.waitTimeout</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">X</entry>
+<entry colname="3">Dynamic</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproperlogbuffersize.dita#rrefproperlogbuffersize">derby.replication.logBufferSize</xref></i></entry>
 <entry colname="2">S</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefpropermaxlogshippinginterval.dita#rrefpropermaxlogshippinginterval">derby.replication.maxLogShippingInterval</xref></i></entry>
 <entry colname="2">S</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproperminlogshippinginterval.dita#rrefproperminlogshippinginterval">derby.replication.minLogShippingInterval</xref></i></entry>
 <entry colname="2">S</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproperverbose.dita#rrefproperverbose">derby.replication.verbose</xref></i></entry>
 <entry colname="2">S</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper27529.dita#rrefproper27529">derby.storage.initialPages</xref></i></entry>
 <entry colname="2">C</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproperstormin.dita#rrefproperstormin">derby.storage.minimumRecordSize</xref></i></entry>
 <entry colname="2">S, D, C</entry>
-<entry colname="3">X</entry>
+<entry colname="3">Dynamic</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper81359.dita#rrefproper81359">derby.storage.pageCacheSize</xref></i></entry>
 <entry colname="2">S</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper28026.dita#rrefproper28026">derby.storage.pageReservedSpace</xref></i></entry>
 <entry colname="2">S, D, C</entry>
-<entry colname="3">X</entry>
+<entry colname="3">Dynamic</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper40688.dita#rrefproper40688">derby.storage.pageSize</xref></i></entry>
 <entry colname="2">S, D, C</entry>
-<entry colname="3">X</entry>
+<entry colname="3">Dynamic</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproperrowlocking.dita#rrefproperrowlocking">derby.storage.rowLocking</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper34037.dita#rrefproper34037">derby.storage.tempDirectory</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">X</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproperextdiagsevlevel.dita#rrefproperextdiagsevlevel">derby.stream.error.extendedDiagSeverityLevel</xref></i></entry>
 <entry colname="2">S</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper33027.dita#rrefproper33027">derby.stream.error.field</xref></i></entry>
 <entry colname="2">S</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper18151.dita#rrefproper18151">derby.stream.error.file</xref></i></entry>
 <entry colname="2">S</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproperlogboottrace.dita#rrefproperlogboottrace">derby.stream.error.logBootTrace</xref></i></entry>
 <entry colname="2">S</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper26985.dita#rrefproper26985">derby.stream.error.logSeverityLevel</xref></i></entry>
 <entry colname="2">S</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper35028.dita#rrefproper35028">derby.stream.error.method</xref></i></entry>
 <entry colname="2">S</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproperbootall.dita#rrefproperbootall">derby.system.bootAll</xref></i></entry>
 <entry colname="2">S</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproperdurability.dita#rrefproperdurability">derby.system.durability</xref></i></entry>
 <entry colname="2">S</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper32066.dita#rrefproper32066">derby.system.home</xref></i></entry>
 <entry colname="2">S</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">Static</entry>
 </row>
 <row>
 <entry colname="1"><i><xref href="rrefproper27355.dita#rrefproper27355">derby.user.UserName</xref></i></entry>
 <entry colname="2">S, D</entry>
-<entry colname="3">X</entry>
+<entry colname="3">Dynamic</entry>
 </row>
 </tbody>
 </tgroup>
-</table></p>
-<p id="rrefproper97948">* See the main page for this property for information
-about when changes to the property are dynamic.</p>
+</table>
 <p>There are additional properties associated with the <ph conref="../conrefs.dita#prod/productshortname"></ph> tools.
 For more information about tool-specific properties, see the <ph conref="../conrefs.dita#pub/citutilities"></ph>.</p>
 </conbody>

Modified: db/derby/docs/trunk/src/ref/refderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/refderby.ditamap?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/refderby.ditamap (original)
+++ db/derby/docs/trunk/src/ref/refderby.ditamap Thu Mar 31 16:57:10 2011
@@ -498,10 +498,10 @@ data type"></topicref>
 </topicref>
 <topicref href="rrefsistabssyssequences.dita" navtitle="SYSSEQUENCES system table">
 </topicref>
-<topicref href="rrefsistabslilanguageitemsysstatistics.dita" navtitle="SYSSTATISTICS system table">
-</topicref>
 <topicref href="rrefsistabs33768.dita" navtitle="SYSSTATEMENTS system table">
 </topicref>
+<topicref href="rrefsistabslilanguageitemsysstatistics.dita" navtitle="SYSSTATISTICS system table">
+</topicref>
 <topicref href="rrefsistabssystableperms.dita" navtitle="SYSTABLEPERMS system table">
 </topicref>
 <topicref href="rrefsistabs24269.dita" navtitle="SYSTABLES system table">

Modified: db/derby/docs/trunk/src/ref/rrefjavsqlprst.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjavsqlprst.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjavsqlprst.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjavsqlprst.dita Thu Mar 31 16:57:10 2011
@@ -55,10 +55,11 @@ stream object or the user's own subclass
 <i>java.io.InputStream</i> interface. The object passed to
 <i>setCharacterStream</i> must be a subclass of the abstract
 <i>java.io.Reader</i> class.</p>
-<p>According
-to the JDBC standard, streams can be stored only in columns with the data
-types shown in the following table.<table frame="all" id="jdbc25312"><title>Streamable
-JDBC Data Types</title>
+<p>According to the JDBC standard, streams can be stored only in columns with
+the data types shown in the following table. The word "Preferred" indicates the
+preferred target data type for the type of stream. See
+<xref href="rrefjdbc20377.dita#rrefjdbc20377/jdbc31241"></xref>.</p>
+<table frame="all" id="jdbc25312"><title>Streamable JDBC Data Types</title>
 <tgroup cols="5" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="22*"/>
 <colspec colname="colspec0" colnum="2" colwidth="22*"/><colspec colname="2"
 colnum="3" colwidth="15*"/><colspec colname="3" colnum="4" colwidth="18*"/>
@@ -75,68 +76,65 @@ colnum="3" colwidth="15*"/><colspec coln
 <tbody>
 <row>
 <entry colname="1">CLOB</entry>
-<entry colname="colspec0">java.sql.Clob</entry>
-<entry colname="2">x</entry>
-<entry colname="3">x</entry>
-<entry colname="4">&nbsp;</entry>
+<entry colname="colspec0"><i>java.sql.Clob</i></entry>
+<entry colname="2">Yes</entry>
+<entry colname="3">Yes</entry>
+<entry colname="4">No</entry>
 </row>
 <row>
 <entry colname="1">CHAR</entry>
-<entry colname="colspec0">&nbsp;</entry>
-<entry colname="2">x</entry>
-<entry colname="3">x</entry>
-<entry colname="4">&nbsp;</entry>
+<entry colname="colspec0">None</entry>
+<entry colname="2">Yes</entry>
+<entry colname="3">Yes</entry>
+<entry colname="4">No</entry>
 </row>
 <row>
 <entry colname="1">VARCHAR</entry>
 <entry colname="colspec0">&nbsp;</entry>
-<entry colname="2">x</entry>
-<entry colname="3">x</entry>
-<entry colname="4">&nbsp;</entry>
+<entry colname="2">Yes</entry>
+<entry colname="3">Yes</entry>
+<entry colname="4">No</entry>
 </row>
 <row>
 <entry colname="1">LONGVARCHAR</entry>
-<entry colname="colspec0">&nbsp;</entry>
-<entry colname="2">X</entry>
-<entry colname="3">X</entry>
-<entry colname="4">&nbsp;</entry>
+<entry colname="colspec0">None</entry>
+<entry colname="2">Preferred</entry>
+<entry colname="3">Preferred</entry>
+<entry colname="4">No</entry>
 </row>
 <row>
 <entry colname="1">BINARY</entry>
-<entry colname="colspec0">&nbsp;</entry>
-<entry colname="2">x</entry>
-<entry colname="3">x</entry>
-<entry colname="4">x</entry>
+<entry colname="colspec0">None</entry>
+<entry colname="2">Yes</entry>
+<entry colname="3">Yes</entry>
+<entry colname="4">Yes</entry>
 </row>
 <row>
 <entry colname="1">BLOB</entry>
-<entry colname="colspec0">java.sql.Blob</entry>
-<entry colname="2">x</entry>
-<entry colname="3">x</entry>
-<entry colname="4">x</entry>
+<entry colname="colspec0"><i>java.sql.Blob</i></entry>
+<entry colname="2">Yes</entry>
+<entry colname="3">Yes</entry>
+<entry colname="4">Yes</entry>
 </row>
 <row>
 <entry colname="1">VARBINARY</entry>
-<entry colname="colspec0">&nbsp;</entry>
-<entry colname="2">x</entry>
-<entry colname="3">x</entry>
-<entry colname="4">x</entry>
+<entry colname="colspec0">None</entry>
+<entry colname="2">Yes</entry>
+<entry colname="3">Yes</entry>
+<entry colname="4">Yes</entry>
 </row>
 <row>
 <entry colname="1">LONGVARBINARY</entry>
-<entry colname="colspec0">&nbsp;</entry>
-<entry colname="2">x</entry>
-<entry colname="3">x</entry>
-<entry colname="4">X</entry>
+<entry colname="colspec0">None</entry>
+<entry colname="2">Yes</entry>
+<entry colname="3">Yes</entry>
+<entry colname="4">Preferred</entry>
 </row>
 </tbody>
 </tgroup>
-</table></p><note><ul>
-<li>A large X indicates the preferred target data type for the type of stream.
-See <xref href="rrefjdbc20377.dita#rrefjdbc20377/jdbc31241"></xref>.</li>
-<li>Streams cannot be stored in columns of the other built-in data types or
-columns of user-defined data types.   </li>
-</ul></note></section>
+</table>
+<note>Streams cannot be stored in columns of the other built-in data types or
+columns of user-defined data types.</note></section>
 <example><title>Example</title><p>The following code fragment shows how a user can
 store a streamed, ASCII-encoded <i>java.io.File</i> in a LONG VARCHAR column:</p>
 <codeblock>    Statement s = conn.createStatement();

Modified: db/derby/docs/trunk/src/ref/rrefproper27529.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefproper27529.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefproper27529.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefproper27529.dita Thu Mar 31 16:57:10 2011
@@ -64,4 +64,10 @@ derby.storage.initialPages=30
 -- database-wide property 
 CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY( 
 'derby.storage.initialPages', '30') </b></codeblock>
-</example></refbody></reference>
+</example>
+<section><title>Dynamic or static</title>
+<p>This property is static; if you change it while
+<ph conref="../conrefs.dita#prod/productshortname"></ph> is running, the change
+does not take effect until you reboot.</p>
+</section>
+</refbody></reference>

Modified: db/derby/docs/trunk/src/ref/rrefproper81359.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefproper81359.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefproper81359.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefproper81359.dita Thu Mar 31 16:57:10 2011
@@ -59,7 +59,9 @@ value.</p> </section>
 <codeblock><b>derby.storage.pageCacheSize=160</b></codeblock>
 </example>
 <section><title>Dynamic or static</title>
-<p>Static. You must reboot the system for the change to take effect.</p>
+<p>This property is static; if you change it while
+<ph conref="../conrefs.dita#prod/productshortname"></ph> is running, the change
+does not take effect until you reboot.</p>
 </section>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/ref/rrefsistabs12813.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsistabs12813.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsistabs12813.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsistabs12813.dita Thu Mar 31 16:57:10 2011
@@ -54,7 +54,7 @@ colnum="5" colwidth="24*"/>
 <entry colname="1">DEPENDENTFINDER</entry>
 <entry colname="2"><i>org.apache.derby.catalog. DependableFinder</i> <p>This class
 is not part of the public API.</p></entry>
-<entry colname="3">1</entry>
+<entry colname="3">2,147,483,647</entry>
 <entry colname="4">false</entry>
 <entry colname="5">A system type that describes the view, constraint, or trigger
 that is the dependent</entry>
@@ -70,7 +70,7 @@ that is the dependent</entry>
 <entry colname="1">PROVIDERFINDER</entry>
 <entry colname="2"><i>org.apache.derby.catalog. DependableFinder</i> <p>This class is
 not part of the public API.</p></entry>
-<entry colname="3">1</entry>
+<entry colname="3">2,147,483,647</entry>
 <entry colname="4">false</entry>
 <entry colname="5">A system type that describes the table, conglomerate, constraint,
 and privilege that is the provider</entry>

Modified: db/derby/docs/trunk/src/ref/rrefsistabs22441.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsistabs22441.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsistabs22441.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsistabs22441.dita Thu Mar 31 16:57:10 2011
@@ -60,7 +60,7 @@ colnum="5" colwidth="26*"/>
 <row>
 <entry colname="1">COLUMNNUMBER</entry>
 <entry colname="2">INT</entry>
-<entry colname="3">4</entry>
+<entry colname="3">10</entry>
 <entry colname="4">false</entry>
 <entry colname="5">The position of the column within the table</entry>
 </row>
@@ -69,7 +69,7 @@ colnum="5" colwidth="26*"/>
 <entry colname="2"><i>org.apache.derby.catalog.
 TypeDescriptor</i>   <p>This class
 is not part of the public API.</p></entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">2,147,483,647</entry>
 <entry colname="4">false</entry>
 <entry colname="5">System type that describes precision, length, scale, nullability,
 type name, and storage type of data. For a user-defined type, this column can
@@ -79,7 +79,7 @@ SYS.SYSALIASES.</entry>
 <row>
 <entry colname="1">COLUMNDEFAULT</entry>
 <entry colname="2"><i>java.io.Serializable</i></entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">2,147,483,647</entry>
 <entry colname="4">true</entry>
 <entry colname="5">For tables, describes default value of the column. The <i>toString()</i> method
 on the object stored in the table returns the text of the default value as
@@ -93,25 +93,25 @@ specified in the CREATE TABLE or ALTER T
 <entry colname="5">Unique identifier for the default value </entry>
 </row>
 <row>
-<entry colname="1">AUTOINCREMENT COLUMNVALUE</entry>
+<entry colname="1">AUTOINCREMENTVALUE</entry>
 <entry colname="2">BIGINT</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">19</entry>
 <entry colname="4">true</entry>
 <entry colname="5">What the next value for column will be, if the column is
 an identity column</entry>
 </row>
 <row>
-<entry colname="1">AUTOINCREMENT COLUMNSTART</entry>
+<entry colname="1">AUTOINCREMENTSTART</entry>
 <entry colname="2">BIGINT</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">19</entry>
 <entry colname="4">true</entry>
 <entry colname="5">Initial value of column (if specified), if it is an identity
 column</entry>
 </row>
 <row>
-<entry colname="1">AUTOINCREMENT COLUMNINC</entry>
+<entry colname="1">AUTOINCREMENTINC</entry>
 <entry colname="2">BIGINT</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">19</entry>
 <entry colname="4">true</entry>
 <entry colname="5">Amount column value is automatically incremented (if specified),
 if the column is an identity column</entry>

Modified: db/derby/docs/trunk/src/ref/rrefsistabs23241.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsistabs23241.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsistabs23241.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsistabs23241.dita Thu Mar 31 16:57:10 2011
@@ -86,7 +86,7 @@ with <i>SYSSCHEMAS.SCHEMAID</i>)</entry>
 <row>
 <entry colname="1">REFERENCECOUNT</entry>
 <entry colname="2">INTEGER</entry>
-<entry colname="3">1</entry>
+<entry colname="3">10</entry>
 <entry colname="4">false</entry>
 <entry colname="5">the count of the number of foreign key constraints that
 reference this constraint; this number can be greater than zero only for PRIMARY

Modified: db/derby/docs/trunk/src/ref/rrefsistabs24045.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsistabs24045.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsistabs24045.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsistabs24045.dita Thu Mar 31 16:57:10 2011
@@ -48,7 +48,7 @@ is joined with column of that name in SY
 <row>
 <entry colname="1">VIEWDEFINITION</entry>
 <entry colname="2">LONG VARCHAR</entry>
-<entry colname="3"></entry>
+<entry colname="3">32,700</entry>
 <entry colname="4">false</entry>
 <entry colname="5">text of view definition</entry>
 </row>
@@ -60,7 +60,7 @@ is joined with column of that name in SY
 <entry colname="5">'<i>N</i>' (check option not supported yet)</entry>
 </row>
 <row>
-<entry colname="1">COMPILATION SCHEMAID</entry>
+<entry colname="1">COMPILATIONSCHEMAID</entry>
 <entry colname="2">CHAR</entry>
 <entry colname="3">36</entry>
 <entry colname="4">false</entry>

Modified: db/derby/docs/trunk/src/ref/rrefsistabs24269.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsistabs24269.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsistabs24269.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsistabs24269.dita Thu Mar 31 16:57:10 2011
@@ -56,7 +56,7 @@ colnum="5" colwidth="41*"/>
 <entry colname="2">CHAR</entry>
 <entry colname="3">1</entry>
 <entry colname="4">false</entry>
-<entry colname="5"><i>'S'</i> (system table), '<i>T'</i> (user table), '<i>A'</i> (synonym), or
+<entry colname="5">'<i>S</i>' (system table), '<i>T</i>' (user table), '<i>A</i>' (synonym), or
 '<i>V</i>' (view)</entry>
 </row>
 <row>
@@ -67,7 +67,7 @@ colnum="5" colwidth="41*"/>
 <entry colname="5">schema id for the table or view</entry>
 </row>
 <row>
-<entry colname="1">LOCK GRANULARITY</entry>
+<entry colname="1">LOCKGRANULARITY</entry>
 <entry colname="2">CHAR</entry>
 <entry colname="3">1</entry>
 <entry colname="4">false</entry>

Modified: db/derby/docs/trunk/src/ref/rrefsistabs26665.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsistabs26665.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsistabs26665.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsistabs26665.dita Thu Mar 31 16:57:10 2011
@@ -54,7 +54,7 @@ colnum="5" colwidth="27*"/>
 <row>
 <entry colname="1">CHECKDEFINITION</entry>
 <entry colname="2">LONG VARCHAR</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">32,700</entry>
 <entry colname="4">false</entry>
 <entry colname="5">Text of check constraint definition</entry>
 </row>
@@ -62,7 +62,7 @@ colnum="5" colwidth="27*"/>
 <entry colname="1">REFERENCEDCOLUMNS</entry>
 <entry colname="2"><i>org.apache.derby.catalog. ReferencedColumns</i> <p>This class
 is not part of the public API.</p></entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">2,147,483,647</entry>
 <entry colname="4">false</entry>
 <entry colname="5">Description of the columns referenced by the check constraint</entry>
 </row>

Modified: db/derby/docs/trunk/src/ref/rrefsistabs28114.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsistabs28114.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsistabs28114.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsistabs28114.dita Thu Mar 31 16:57:10 2011
@@ -68,8 +68,8 @@ user-defined type)</entry>
 </row>
 <row>
 <entry colname="1">JAVACLASSNAME</entry>
-<entry colname="2">LONGVARCHAR</entry>
-<entry colname="3">255</entry>
+<entry colname="2">LONG VARCHAR</entry>
+<entry colname="3">32,700</entry>
 <entry colname="4">false</entry>
 <entry colname="5">The Java class name</entry>
 </row>
@@ -92,7 +92,7 @@ user-defined type)</entry>
 <row>
 <entry colname="1">SYSTEMALIAS</entry>
 <entry colname="2">BOOLEAN</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">1</entry>
 <entry colname="4">false</entry>
 <entry colname="5"><i>true</i> (system supplied or built-in alias)   <p><i>false</i> (alias
 created by a user)</p></entry>
@@ -101,7 +101,7 @@ created by a user)</p></entry>
 <entry colname="1">ALIASINFO</entry>
 <entry colname="2"><i>org.apache.derby.
 catalog.AliasInfo</i> <p>This class is not part of the public API.</p></entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">2,147,483,647</entry>
 <entry colname="4">true</entry>
 <entry colname="5">A Java interface that encapsulates the additional information
 that is specific to an alias</entry>

Modified: db/derby/docs/trunk/src/ref/rrefsistabs33768.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsistabs33768.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsistabs33768.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsistabs33768.dita Thu Mar 31 16:57:10 2011
@@ -68,26 +68,26 @@ colnum="5" colwidth="26*"/>
 <row>
 <entry colname="1">VALID</entry>
 <entry colname="2">BOOLEAN</entry>
-<entry colname="3"></entry>
+<entry colname="3">1</entry>
 <entry colname="4">false</entry>
 <entry colname="5">TRUE if valid, FALSE if invalid</entry>
 </row>
 <row>
 <entry colname="1">TEXT</entry>
 <entry colname="2">LONG VARCHAR</entry>
-<entry colname="3"></entry>
+<entry colname="3">32,700</entry>
 <entry colname="4">false</entry>
 <entry colname="5">text of the statement</entry>
 </row>
 <row>
 <entry colname="1">LASTCOMPILED</entry>
 <entry colname="2">TIMESTAMP</entry>
-<entry colname="3"></entry>
+<entry colname="3">29</entry>
 <entry colname="4">true</entry>
 <entry colname="5">time that the statement was compiled</entry>
 </row>
 <row>
-<entry colname="1">COMPILATION SCHEMAID</entry>
+<entry colname="1">COMPILATIONSCHEMAID</entry>
 <entry colname="2">CHAR</entry>
 <entry colname="3">36</entry>
 <entry colname="4">false</entry>
@@ -96,7 +96,7 @@ colnum="5" colwidth="26*"/>
 <row>
 <entry colname="1">USINGTEXT</entry>
 <entry colname="2">LONG VARCHAR</entry>
-<entry colname="3"></entry>
+<entry colname="3">32,700</entry>
 <entry colname="4">true</entry>
 <entry colname="5">text of the USING clause of the CREATE STATEMENT and ALTER
 STATEMENT statements</entry>

Modified: db/derby/docs/trunk/src/ref/rrefsistabs39391.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsistabs39391.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsistabs39391.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsistabs39391.dita Thu Mar 31 16:57:10 2011
@@ -61,7 +61,7 @@ colnum="5" colwidth="23*"/>
 <row>
 <entry colname="1">CONGLOMERATENUMBER</entry>
 <entry colname="2">BIGINT</entry>
-<entry colname="3">8</entry>
+<entry colname="3">19</entry>
 <entry colname="4">false</entry>
 <entry colname="5">Conglomerate id for the conglomerate (heap or index)</entry>
 </row>
@@ -84,7 +84,7 @@ table ID</entry>
 <entry colname="1">DESCRIPTOR</entry>
 <entry colname="2"> <i>org.apache.derby.
 catalog.IndexDescriptor</i> <p>This class is not part of the public API.</p></entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">2,147,483,647</entry>
 <entry colname="4">true</entry>
 <entry colname="5">System type describing the index</entry>
 </row>

Modified: db/derby/docs/trunk/src/ref/rrefsistabs40972.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsistabs40972.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsistabs40972.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsistabs40972.dita Thu Mar 31 16:57:10 2011
@@ -61,7 +61,7 @@ colnum="5" colwidth="27*"/>
 <row>
 <entry colname="1">GENERATIONID</entry>
 <entry colname="2">BIGINT</entry>
-<entry colname="3"></entry>
+<entry colname="3">19</entry>
 <entry colname="4">false</entry>
 <entry colname="5">Generation number for the file. When jar files are replaced,
 their generation identifiers are changed.</entry>

Modified: db/derby/docs/trunk/src/ref/rrefsistabs79888.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsistabs79888.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsistabs79888.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsistabs79888.dita Thu Mar 31 16:57:10 2011
@@ -65,7 +65,7 @@ colname="5" colnum="5" colwidth="2902*"/
 <row>
 <entry colname="1">CREATIONTIMESTAMP</entry>
 <entry colname="2">TIMESTAMP</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">29</entry>
 <entry colname="4">false</entry>
 <entry colname="5">Time the trigger was created</entry>
 </row>
@@ -124,7 +124,7 @@ colname="5" colnum="5" colwidth="2902*"/
 <entry colname="2"><i>org.apache.derby.catalog.
 ReferencedColumns</i> <p>This class
 is not part of the public API.</p></entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">2,147,483,647</entry>
 <entry colname="4">true</entry>
 <entry colname="5">Descriptor of the columns to be updated, if this trigger is
 an update trigger (that is, if the EVENT column contains 'U')</entry>
@@ -132,14 +132,14 @@ an update trigger (that is, if the EVENT
 <row>
 <entry colname="1">TRIGGERDEFINITION</entry>
 <entry colname="2">LONG VARCHAR</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">32,700</entry>
 <entry colname="4">true</entry>
 <entry colname="5">Text of the action SQL statement</entry>
 </row>
 <row>
 <entry colname="1">REFERENCINGOLD</entry>
 <entry colname="2">BOOLEAN</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">1</entry>
 <entry colname="4">true</entry>
 <entry colname="5">Whether or not the OLDREFERENCINGNAME, if non-null, refers
 to the OLD row or table</entry>
@@ -147,7 +147,7 @@ to the OLD row or table</entry>
 <row>
 <entry colname="1">REFERENCINGNEW </entry>
 <entry colname="2">BOOLEAN</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">1</entry>
 <entry colname="4">true</entry>
 <entry colname="5">Whether or not the NEWREFERENCINGNAME, if non-null, refers
 to the NEW row or table</entry>

Modified: db/derby/docs/trunk/src/ref/rrefsistabslilanguageitemsysstatistics.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsistabslilanguageitemsysstatistics.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsistabslilanguageitemsysstatistics.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsistabslilanguageitemsysstatistics.dita Thu Mar 31 16:57:10 2011
@@ -69,7 +69,7 @@ CONGLOMERATEID)</entry>
 <row>
 <entry colname="1">CREATIONTIMESTAMP</entry>
 <entry colname="2">TIMESTAMP</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">29</entry>
 <entry colname="4">false</entry>
 <entry colname="5">Time when this statistic was created or updated</entry>
 </row>
@@ -83,14 +83,14 @@ CONGLOMERATEID)</entry>
 <row>
 <entry colname="1">VALID</entry>
 <entry colname="2">BOOLEAN</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">1</entry>
 <entry colname="4">false</entry>
 <entry colname="5">Whether the statistic is still valid</entry>
 </row>
 <row>
 <entry colname="1">COLCOUNT</entry>
 <entry colname="2">INTEGER</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">10</entry>
 <entry colname="4">false</entry>
 <entry colname="5">Number of columns in the statistic</entry>
 </row>
@@ -99,7 +99,7 @@ CONGLOMERATEID)</entry>
 <entry colname="2"><i>org.apache.
 derby.catalog.
 Statistics</i> <p>This class is not part of the public API.</p></entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">2,147,483,647</entry>
 <entry colname="4">true</entry>
 <entry colname="5">Statistics information</entry>
 </row>

Modified: db/derby/docs/trunk/src/ref/rrefsistabssyscolperms.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsistabssyscolperms.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsistabssyscolperms.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsistabssyscolperms.dita Thu Mar 31 16:57:10 2011
@@ -102,7 +102,7 @@ have been granted.</entry>
 iapi.services.io.
 FormatableBitSet</i>
 <p>This class is not part of the public API.</p> </entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">2,147,483,647</entry>
 <entry colname="4">false</entry>
 <entry colname="5">A list of columns to which the privilege applies. </entry>
 </row>

Modified: db/derby/docs/trunk/src/ref/rrefsistabssysperms.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsistabssysperms.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsistabssysperms.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsistabssysperms.dita Thu Mar 31 16:57:10 2011
@@ -48,7 +48,7 @@ colnum="5" colwidth="38*"/>
 </thead>
 <tbody>
 <row>
-<entry colname="1">PERMISSIONID</entry>
+<entry colname="1">UUID</entry>
 <entry colname="2">CHAR</entry>
 <entry colname="3">36</entry>
 <entry colname="4">False</entry>

Modified: db/derby/docs/trunk/src/ref/rrefsistabssyssequences.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsistabssyssequences.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsistabssyssequences.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsistabssyssequences.dita Thu Mar 31 16:57:10 2011
@@ -54,14 +54,6 @@ colnum="5" colwidth="38*"/>
 <entry colname="5">The id of the sequence generator. This is the primary key.</entry>
 </row>
 <row>
-<entry colname="1">SCHEMAID</entry>
-<entry colname="2">CHAR</entry>
-<entry colname="3">36</entry>
-<entry colname="4">false</entry>
-<entry colname="5">The id of the schema which holds the sequence generator.
-There is a foreign key linking this column to SYS.SYSSCHEMAS.SCHEMAID.</entry>
-</row>
-<row>
 <entry colname="1">SEQUENCENAME</entry>
 <entry colname="2">VARCHAR</entry>
 <entry colname="3">128</entry>
@@ -70,11 +62,19 @@ There is a foreign key linking this colu
 on (SCHEMAID, SEQUENCENAME).</entry>
 </row>
 <row>
+<entry colname="1">SCHEMAID</entry>
+<entry colname="2">CHAR</entry>
+<entry colname="3">36</entry>
+<entry colname="4">false</entry>
+<entry colname="5">The id of the schema which holds the sequence generator.
+There is a foreign key linking this column to SYS.SYSSCHEMAS.SCHEMAID.</entry>
+</row>
+<row>
 <entry colname="1">SEQUENCEDATATYPE</entry>
 <entry colname="2"><i>org.apache.derby.
 catalog.TypeDescriptor</i>
 <p>This class is not part of the public API.</p></entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">2,147,483,647</entry>
 <entry colname="4">false</entry>
 <entry colname="5">System type that describes the precision, length, scale,
 nullability, type name, and storage type of the data.</entry>
@@ -82,7 +82,7 @@ nullability, type name, and storage type
 <row>
 <entry colname="1">CURRENTVALUE</entry>
 <entry colname="2">BIGINT</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">19</entry>
 <entry colname="4">true</entry>
 <entry colname="5">The current value of the sequence generator. The initial
 value of this column is STARTVALUE. This column is NULL only if the sequence
@@ -91,28 +91,28 @@ generator is exhausted and cannot issue 
 <row>
 <entry colname="1">STARTVALUE</entry>
 <entry colname="2">BIGINT</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">19</entry>
 <entry colname="4">false</entry>
 <entry colname="5">The initial value of the sequence generator.</entry>
 </row>
 <row>
 <entry colname="1">MINIMUMVALUE</entry>
 <entry colname="2">BIGINT</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">19</entry>
 <entry colname="4">false</entry>
 <entry colname="5">The minimum value of the sequence generator.</entry>
 </row>
 <row>
 <entry colname="1">MAXIMUMVALUE</entry>
 <entry colname="2">BIGINT</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">19</entry>
 <entry colname="4">false</entry>
 <entry colname="5">The maximum value of the sequence generator.</entry>
 </row>
 <row>
 <entry colname="1">INCREMENT</entry>
 <entry colname="2">BIGINT</entry>
-<entry colname="3">&nbsp;</entry>
+<entry colname="3">19</entry>
 <entry colname="4">false</entry>
 <entry colname="5">The step size of the sequence generator.</entry>
 </row>

Modified: db/derby/docs/trunk/src/ref/rrefsistabssystableperms.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsistabssystableperms.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsistabssystableperms.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsistabssystableperms.dita Thu Mar 31 16:57:10 2011
@@ -124,7 +124,7 @@ values are: <lines>'y' (non-grantable pr
 'N' (no privilege)</lines></entry>
 </row>
 <row>
-<entry colname="1">REFERENCEPRIV</entry>
+<entry colname="1">REFERENCESPRIV</entry>
 <entry colname="2">CHAR</entry>
 <entry colname="3">1</entry>
 <entry colname="4">False</entry>

Modified: db/derby/docs/trunk/src/ref/rrefsqlj33923.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj33923.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj33923.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj33923.dita Thu Mar 31 16:57:10 2011
@@ -32,41 +32,35 @@ over a set of values as well as count ro
 built-in aggregates can operate on the data types shown in <xref href="rrefsqlj33923.dita#rrefsqlj33923/sqlj92398"></xref>.
   <table frame="all" id="sqlj92398"><title>Permitted Data Types for Built-in
 Aggregates</title>
-<tgroup cols="3" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="20*"/>
-<colspec colname="2" colnum="2" colwidth="20*"/><colspec colname="3" colnum="3"
-colwidth="20*"/>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="1" colnum="1" colwidth="20*"/>
+<colspec colname="2" colnum="2" colwidth="40*"/>
 <thead>
 <row>
 <entry align="left" colname="1" valign="bottom">Function Name</entry>
-<entry align="left" colname="2" valign="bottom">All Types</entry>
-<entry align="left" colname="3" valign="bottom">Numeric Built-in Data Types</entry>
+<entry align="left" colname="2" valign="bottom">Permitted Data Types</entry>
 </row>
 </thead>
 <tbody>
 <row>
 <entry colname="1">COUNT</entry>
-<entry colname="2">X</entry>
-<entry colname="3">X</entry>
+<entry colname="2">All types</entry>
 </row>
 <row>
 <entry colname="1">MIN</entry>
-<entry colname="2">&nbsp;</entry>
-<entry colname="3">X</entry>
+<entry colname="2">Numeric built-in data types</entry>
 </row>
 <row>
 <entry colname="1">MAX</entry>
-<entry colname="2">&nbsp;</entry>
-<entry colname="3">X</entry>
+<entry colname="2">Numeric built-in data types</entry>
 </row>
 <row>
 <entry colname="1">AVG</entry>
-<entry colname="2">&nbsp;</entry>
-<entry colname="3">X</entry>
+<entry colname="2">Numeric built-in data types</entry>
 </row>
 <row>
 <entry colname="1">SUM</entry>
-<entry colname="2">&nbsp;</entry>
-<entry colname="3">X</entry>
+<entry colname="2">Numeric built-in data types</entry>
 </row>
 </tbody>
 </tgroup>

Modified: db/derby/docs/trunk/src/ref/rrefsqljargmatching.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljargmatching.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljargmatching.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljargmatching.dita Thu Mar 31 16:57:10 2011
@@ -198,13 +198,13 @@ types to Java data types:
     
     <row>
       <entry colname="sqltype">DECIMAL</entry>
-      <entry colname="primitive">-</entry>
+      <entry colname="primitive">None</entry>
       <entry colname="wrapper"><i>java.math.BigDecimal</i></entry>
     </row>
     
     <row>
       <entry colname="sqltype">NUMERIC</entry>
-      <entry colname="primitive">-</entry>
+      <entry colname="primitive">None</entry>
       <entry colname="wrapper"><i>java.math.BigDecimal</i></entry>
     </row>
     
@@ -228,79 +228,79 @@ types to Java data types:
     
     <row>
       <entry colname="sqltype">CHAR</entry>
-      <entry colname="primitive">-</entry>
+      <entry colname="primitive">None</entry>
       <entry colname="wrapper"><i>java.lang.String</i></entry>
     </row>
 
     <row>
       <entry colname="sqltype">VARCHAR</entry>
-      <entry colname="primitive">-</entry>
+      <entry colname="primitive">None</entry>
       <entry colname="wrapper"><i>java.lang.String</i></entry>
     </row>
     
     <row>
       <entry colname="sqltype">LONG VARCHAR</entry>
-      <entry colname="primitive">-</entry>
+      <entry colname="primitive">None</entry>
       <entry colname="wrapper"><i>java.lang.String</i></entry>
     </row>
     
     <row>
       <entry colname="sqltype">CHAR FOR BIT DATA</entry>
       <entry colname="primitive"><i>byte[]</i></entry>
-      <entry colname="wrapper">-</entry>
+      <entry colname="wrapper">None</entry>
     </row>
     
     <row>
       <entry colname="sqltype">VARCHAR FOR BIT DATA</entry>
       <entry colname="primitive"><i>byte[]</i></entry>
-      <entry colname="wrapper">-</entry>
+      <entry colname="wrapper">None</entry>
     </row>
     
     <row>
       <entry colname="sqltype">LONG VARCHAR FOR BIT DATA</entry>
       <entry colname="primitive"><i>byte[]</i></entry>
-      <entry colname="wrapper">-</entry>
+      <entry colname="wrapper">None</entry>
     </row>
     
     <row>
       <entry colname="sqltype">CLOB</entry>
-      <entry colname="primitive">-</entry>
+      <entry colname="primitive">None</entry>
       <entry colname="wrapper"><i>java.sql.Clob</i></entry>
     </row>
     
     <row>
       <entry colname="sqltype">BLOB</entry>
-      <entry colname="primitive">-</entry>
+      <entry colname="primitive">None</entry>
       <entry colname="wrapper"><i>java.sql.Blob</i></entry>
     </row>
     
     <row>
       <entry colname="sqltype">DATE</entry>
-      <entry colname="primitive">-</entry>
+      <entry colname="primitive">None</entry>
       <entry colname="wrapper"><i>java.sql.Date</i></entry>
     </row>
     
     <row>
       <entry colname="sqltype">TIME</entry>
-      <entry colname="primitive">-</entry>
+      <entry colname="primitive">None</entry>
       <entry colname="wrapper"><i>java.sql.Time</i></entry>
     </row>
     
     <row>
       <entry colname="sqltype">TIMESTAMP</entry>
-      <entry colname="primitive">-</entry>
+      <entry colname="primitive">None</entry>
       <entry colname="wrapper"><i>java.sql.Timestamp</i></entry>
     </row>
     
     <row>
       <entry colname="sqltype">XML</entry>
-      <entry colname="primitive">-</entry>
-      <entry colname="wrapper">-</entry>
+      <entry colname="primitive">None</entry>
+      <entry colname="wrapper">None</entry>
     </row>
     
     <row>
       <entry colname="sqltype">User-defined type</entry>
-      <entry colname="primitive">-</entry>
+      <entry colname="primitive">None</entry>
       <entry colname="wrapper">Underlying Java class</entry>
     </row>
     

Modified: db/derby/docs/trunk/src/ref/rrefsysxplain_resultset_timings.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsysxplain_resultset_timings.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsysxplain_resultset_timings.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsysxplain_resultset_timings.dita Thu Mar 31 16:57:10 2011
@@ -81,7 +81,7 @@ SYSXPLAIN_RESULTSETS table.</entry>
 <row>
 <entry colname="1">CONSTRUCTOR_TIME</entry>
 <entry colname="2">BIGINT</entry>
-<entry colname="3"></entry>
+<entry colname="3">19</entry>
 <entry colname="4">true</entry>
 <entry colname="5">The time it took to construct this instance of this
 result set, in milliseconds.</entry>
@@ -89,7 +89,7 @@ result set, in milliseconds.</entry>
 <row>
 <entry colname="1">OPEN_TIME</entry>
 <entry colname="2">BIGINT</entry>
-<entry colname="3"></entry>
+<entry colname="3">19</entry>
 <entry colname="4">true</entry>
 <entry colname="5">The time it took to open this instance of this
     result set, in milliseconds. Note that if this result set was opened
@@ -99,7 +99,7 @@ result set, in milliseconds.</entry>
 <row>
 <entry colname="1">NEXT_TIME</entry>
 <entry colname="2">BIGINT</entry>
-<entry colname="3"></entry>
+<entry colname="3">19</entry>
 <entry colname="4">true</entry>
 <entry colname="5">The accumulated time for all the calls to fetch the
     next row from this result set, in milliseconds,
@@ -108,7 +108,7 @@ result set, in milliseconds.</entry>
 <row>
 <entry colname="1">CLOSE_TIME</entry>
 <entry colname="2">BIGINT</entry>
-<entry colname="3"></entry>
+<entry colname="3">19</entry>
 <entry colname="4">true</entry>
 <entry colname="5">The time it took to close this instance of the result
 set, in milliseconds.</entry>
@@ -116,7 +116,7 @@ set, in milliseconds.</entry>
 <row>
 <entry colname="1">EXECUTE_TIME</entry>
 <entry colname="2">BIGINT</entry>
-<entry colname="3"></entry>
+<entry colname="3">19</entry>
 <entry colname="4">true</entry>
 <entry colname="5">The time for all operations performed by this
     result set, excluding the time taken by all the children result sets of
@@ -126,7 +126,7 @@ set, in milliseconds.</entry>
 <row>
 <entry colname="1">AVG_NEXT_TIME_PER_ROW</entry>
 <entry colname="2">BIGINT</entry>
-<entry colname="3"></entry>
+<entry colname="3">19</entry>
 <entry colname="4">true</entry>
 <entry colname="5">If there was at least one row returned from this result
     set, then this value is the NEXT_TIME value divided by the number of rows
@@ -136,7 +136,7 @@ milliseconds, that it took to retrieve a
 <row>
 <entry colname="1">PROJECTION_TIME</entry>
 <entry colname="2">BIGINT</entry>
-<entry colname="3"></entry>
+<entry colname="3">19</entry>
 <entry colname="4">true</entry>
 <entry colname="5">This value is NULL unless this result set is a
     PROJECTION result set, in which case this column contains the time,
@@ -146,7 +146,7 @@ rows in this result set.</entry>
 <row>
 <entry colname="1">RESTRICTION_TIME</entry>
 <entry colname="2">BIGINT</entry>
-<entry colname="3"></entry>
+<entry colname="3">19</entry>
 <entry colname="4">true</entry>
 <entry colname="5">This value is NULL unless this result set is a
 PROJECTION result set, in which case this column contains the time,
@@ -156,7 +156,7 @@ rows in this result set.</entry>
 <row>
 <entry colname="1">TEMP_CONG_CREATE_TIME</entry>
 <entry colname="2">BIGINT</entry>
-<entry colname="3"></entry>
+<entry colname="3">19</entry>
 <entry colname="4">true</entry>
 <entry colname="5">For result sets which involve a materialization of
     a temporary intermediate result set, this value is the time it took to
@@ -167,7 +167,7 @@ result is too large to hold in memory?</
 <row>
 <entry colname="1">TEMP_CONG_FETCH_TIME</entry>
 <entry colname="2">BIGINT</entry>
-<entry colname="3"></entry>
+<entry colname="3">19</entry>
 <entry colname="4">true</entry>
 <entry colname="5">Similar to TEMP_CONG_CREATE_TIME, this value is
     the time it took to retrieve rows from the materialized result set, in

Modified: db/derby/docs/trunk/src/ref/rrefsysxplain_resultsets.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsysxplain_resultsets.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsysxplain_resultsets.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsysxplain_resultsets.dita Thu Mar 31 16:57:10 2011
@@ -82,7 +82,7 @@ colnum="5" colwidth="29*"/>
 <row>
 <entry colname="1">OP_IDENTIFIER</entry>
 <entry colname="2">VARCHAR</entry>
-<entry colname="3">128</entry>
+<entry colname="3">32,672</entry>
 <entry colname="4">false</entry>
 <entry colname="5">A code indicating what type of result set these statistics
     are for.
@@ -92,7 +92,7 @@ Should I try to list all the result set 
 <row>
 <entry colname="1">OP_DETAILS</entry>
 <entry colname="2">VARCHAR</entry>
-<entry colname="3">256</entry>
+<entry colname="3">32,672</entry>
 <entry colname="4">true</entry>
 <entry colname="5">Additional string information which varies for each
     different type of result set. Interpreting this information currently
@@ -103,7 +103,7 @@ Should I try to list all the result set 
 <row>
 <entry colname="1">NO_OPENS</entry>
 <entry colname="2">INTEGER</entry>
-<entry colname="3"></entry>
+<entry colname="3">10</entry>
 <entry colname="4">true</entry>
 <entry colname="5">Number of times this result set was opened during
 execution of the containing statement.</entry>
@@ -111,7 +111,7 @@ execution of the containing statement.</
 <row>
 <entry colname="1">NO_INDEX_UPDATES</entry>
 <entry colname="2">INTEGER</entry>
-<entry colname="3"></entry>
+<entry colname="3">10</entry>
 <entry colname="4">true</entry>
 <entry colname="5">The number of index updates performed by this
     result set. This value is NULL for result sets used by queries, but may have
@@ -157,7 +157,7 @@ together.</entry>
 <row>
 <entry colname="1">EST_ROW_COUNT</entry>
 <entry colname="2">DOUBLE</entry>
-<entry colname="3"></entry>
+<entry colname="3">52</entry>
 <entry colname="4">true</entry>
 <entry colname="5">The optimizer's estimate of the total number of rows
     for this result set.
@@ -166,7 +166,7 @@ together.</entry>
 <row>
 <entry colname="1">EST_COST</entry>
 <entry colname="2">DOUBLE</entry>
-<entry colname="3"></entry>
+<entry colname="3">52</entry>
 <entry colname="4">true</entry>
 <entry colname="5">The optimizer's estimated cost for this result set.
     The value indicates the number of milliseconds that the optimizer
@@ -176,7 +176,7 @@ together.</entry>
 <row>
 <entry colname="1">AFFECTED_ROWS</entry>
 <entry colname="2">INTEGER</entry>
-<entry colname="3"></entry>
+<entry colname="3">10</entry>
 <entry colname="4">true</entry>
 <entry colname="5">This column is only non-null for INSERT, UPDATE, and
     DELETE result sets. For those result sets, this column holds the number of
@@ -198,7 +198,7 @@ rows which were inserted, updated, or de
 <row>
 <entry colname="1">INPUT_ROWS</entry>
 <entry colname="2">INTEGER</entry>
-<entry colname="3"></entry>
+<entry colname="3">10</entry>
 <entry colname="4">true</entry>
 <entry colname="5">This column is used for SORT, AGGREGATE, and GROUPBY
     result sets, and indicates the number of rows that were input to the
@@ -207,7 +207,7 @@ result set, and thus were sorted by the 
 <row>
 <entry colname="1">SEEN_ROWS</entry>
 <entry colname="2">INTEGER</entry>
-<entry colname="3"></entry>
+<entry colname="3">10</entry>
 <entry colname="4">true</entry>
 <entry colname="5">For join and set nodes, this is the number of rows
     seen by the "left" side of the processing. For aggregate, group, sort,
@@ -218,7 +218,7 @@ result set, and thus were sorted by the 
 <row>
 <entry colname="1">SEEN_ROWS_RIGHT</entry>
 <entry colname="2">INTEGER</entry>
-<entry colname="3"></entry>
+<entry colname="3">10</entry>
 <entry colname="4">true</entry>
 <entry colname="5">For join and set nodes, this is the number of rows
     seen by the "right" side of the processing. For example, in the statement
@@ -232,7 +232,7 @@ result set, and thus were sorted by the 
 <row>
 <entry colname="1">FILTERED_ROWS</entry>
 <entry colname="2">INTEGER</entry>
-<entry colname="3"></entry>
+<entry colname="3">10</entry>
 <entry colname="4">true</entry>
 <entry colname="5">This column holds the number of rows which were
 eliminated from the result set during processing.</entry>
@@ -240,7 +240,7 @@ eliminated from the result set during pr
 <row>
 <entry colname="1">RETURNED_ROWS</entry>
 <entry colname="2">INTEGER</entry>
-<entry colname="3"></entry>
+<entry colname="3">10</entry>
 <entry colname="4">true</entry>
 <entry colname="5">This column holds the number of rows which were
     returned by the result set to its caller. Generally speaking, the number
@@ -250,7 +250,7 @@ of rows FILTERED.</entry>
 <row>
 <entry colname="1">EMPTY_RIGHT_ROWS</entry>
 <entry colname="2">INTEGER</entry>
-<entry colname="3"></entry>
+<entry colname="3">10</entry>
 <entry colname="4">true</entry>
 <entry colname="5">This column is used for left outer joins, and, if not null,
     holds the number of empty rows which had to be constructed because no

Modified: db/derby/docs/trunk/src/ref/rrefsysxplain_scan_props.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsysxplain_scan_props.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsysxplain_scan_props.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsysxplain_scan_props.dita Thu Mar 31 16:57:10 2011
@@ -108,7 +108,7 @@ Codes include 'T' for Table, 'I' for Ind
 <row>
 <entry colname="1">ISOLATION_LEVEL</entry>
 <entry colname="2">CHAR</entry>
-<entry colname="3">6</entry>
+<entry colname="3">3</entry>
 <entry colname="4">true</entry>
 <entry colname="5">The isolation level being used for this scan.
     Isolation levels are identified by a code: 'RU' for Read Uncommitted,
@@ -118,7 +118,7 @@ Codes include 'T' for Table, 'I' for Ind
 <row>
 <entry colname="1">NO_VISITED_PAGES</entry>
 <entry colname="2">INTEGER</entry>
-<entry colname="3"></entry>
+<entry colname="3">10</entry>
 <entry colname="4">true</entry>
 <entry colname="5">Number of database pages that this scan touched.
 For btree scans this number only includes the leaf pages visited.</entry>
@@ -126,7 +126,7 @@ For btree scans this number only include
 <row>
 <entry colname="1">NO_VISITED_ROWS</entry>
 <entry colname="2">INTEGER</entry>
-<entry colname="3"></entry>
+<entry colname="3">10</entry>
 <entry colname="4">true</entry>
 <entry colname="5">Number of database rows that were examined by this scan.
     This number includes all rows, including those rows marked deleted,
@@ -136,14 +136,14 @@ returned by the scan.</entry>
 <row>
 <entry colname="1">NO_QUALIFIED_ROWS</entry>
 <entry colname="2">INTEGER</entry>
-<entry colname="3"></entry>
+<entry colname="3">10</entry>
 <entry colname="4">true</entry>
 <entry colname="5">Number of rows that satisfied the qualifiers for this scan.</entry>
 </row>
 <row>
 <entry colname="1">NO_VISITED_DELETED_ROWS</entry>
 <entry colname="2">INTEGER</entry>
-<entry colname="3"></entry>
+<entry colname="3">10</entry>
 <entry colname="4">true</entry>
 <entry colname="5">Number of the database rows that were examined by this
 scan which were found to be rows that were marked deleted.</entry>
@@ -151,21 +151,21 @@ scan which were found to be rows that we
 <row>
 <entry colname="1">NO_FETCHED_COLUMNS</entry>
 <entry colname="2">INTEGER</entry>
-<entry colname="3"></entry>
+<entry colname="3">10</entry>
 <entry colname="4">true</entry>
 <entry colname="5">Number of columns that were fetched from each qualifying row.</entry>
 </row>
 <row>
 <entry colname="1">BITSET_OF_FETCHED_COLUMNS</entry>
 <entry colname="2">VARCHAR</entry>
-<entry colname="3">512</entry>
+<entry colname="3">32,672</entry>
 <entry colname="4">true</entry>
 <entry colname="5">Description of the columns which were fetched from each qualifying row.</entry>
 </row>
 <row>
 <entry colname="1">BTREE_HEIGHT</entry>
 <entry colname="2">INTEGER</entry>
-<entry colname="3"></entry>
+<entry colname="3">10</entry>
 <entry colname="4">true</entry>
 <entry colname="5">For a scan of type BTREE, this column holds the height
     of the BTREE index. The typical height of a BTREE is 2-4; BTREE heights
@@ -179,7 +179,7 @@ scan which were found to be rows that we
 <row>
 <entry colname="1">FETCH_SIZE</entry>
 <entry colname="2">INTEGER</entry>
-<entry colname="3"></entry>
+<entry colname="3">10</entry>
 <entry colname="4">true</entry>
 <entry colname="5">I think this is the number of pages fetched at a time
     when the scan is retrieving pages from disk? I expected this to be 16
@@ -189,7 +189,7 @@ it be 16 for INDEXSCAN?</entry>
 <row>
 <entry colname="1">START_POSITION</entry>
 <entry colname="2">VARCHAR</entry>
-<entry colname="3">1024</entry>
+<entry colname="3">32,672</entry>
 <entry colname="4">true</entry>
 <entry colname="5">For index and constraint scans, this column holds a
     textual representation of the operator, if any, which was used to position
@@ -198,7 +198,7 @@ it be 16 for INDEXSCAN?</entry>
 <row>
 <entry colname="1">STOP_POSITION</entry>
 <entry colname="2">VARCHAR</entry>
-<entry colname="3">1024</entry>
+<entry colname="3">32,672</entry>
 <entry colname="4">true</entry>
 <entry colname="5">For index and constraint scans, this column holds a
     textual representation of the operator, if any, which was used to position
@@ -207,7 +207,7 @@ it be 16 for INDEXSCAN?</entry>
 <row>
 <entry colname="1">SCAN_QUALIFIERS</entry>
 <entry colname="2">VARCHAR</entry>
-<entry colname="3">1024</entry>
+<entry colname="3">32,672</entry>
 <entry colname="4">true</entry>
 <entry colname="5">If the query specified values which are to be used to
     limit the rows that are scanned, information about those values is
@@ -216,7 +216,7 @@ captured in this column.</entry>
 <row>
 <entry colname="1">NEXT_QUALIFIERS</entry>
 <entry colname="2">VARCHAR</entry>
-<entry colname="3">1024</entry>
+<entry colname="3">32,672</entry>
 <entry colname="4">true</entry>
 <entry colname="5">If the query specified values which are to be used to
 limit the rows that are scanned, information about those values is
@@ -225,14 +225,14 @@ captured in this column.</entry>
 <row>
 <entry colname="1">HASH_KEY_COLUMN_NUMBERS</entry>
 <entry colname="2">VARCHAR</entry>
-<entry colname="3">1024</entry>
+<entry colname="3">32,672</entry>
 <entry colname="4">true</entry>
 <entry colname="5">For hash joins, this column contains information about which column is being used to hash the rows that are joined.</entry>
 </row>
 <row>
 <entry colname="1">HASH_TABLE_SIZE</entry>
 <entry colname="2">INTEGER</entry>
-<entry colname="3"></entry>
+<entry colname="3">10</entry>
 <entry colname="4">true</entry>
 <entry colname="5">For hash joins, this column contains information about
     the size of the hash table that will be used to hold the rows being

Modified: db/derby/docs/trunk/src/ref/rrefsysxplain_sort_props.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsysxplain_sort_props.dita?rev=1087370&r1=1087369&r2=1087370&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsysxplain_sort_props.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsysxplain_sort_props.dita Thu Mar 31 16:57:10 2011
@@ -84,14 +84,14 @@ external sort used one or more external 
 <row>
 <entry colname="1">NO_INPUT_ROWS</entry>
 <entry colname="2">INTEGER</entry>
-<entry colname="3"></entry>
+<entry colname="3">10</entry>
 <entry colname="4">true</entry>
 <entry colname="5">Number of rows which were provided to the sorter.</entry>
 </row>
 <row>
 <entry colname="1">NO_OUTPUT_ROWS</entry>
 <entry colname="2">INTEGER</entry>
-<entry colname="3"></entry>
+<entry colname="3">10</entry>
 <entry colname="4">true</entry>
 <entry colname="5">Number of rows which were returned by the sorter.
     Note that this may be fewer rows than were input, for example when
@@ -101,7 +101,7 @@ external sort used one or more external 
 <row>
 <entry colname="1">NO_MERGE_RUNS</entry>
 <entry colname="2">INTEGER</entry>
-<entry colname="3"></entry>
+<entry colname="3">10</entry>
 <entry colname="4">true</entry>
 <entry colname="5">Number of merge runs which were provided. This value
     will be NULL for an internal sort, but for an external sort it
@@ -114,7 +114,7 @@ external sort used one or more external 
 <row>
 <entry colname="1">MERGE_RUN_DETAILS</entry>
 <entry colname="2">VARCHAR</entry>
-<entry colname="3">256</entry>
+<entry colname="3">32,672</entry>
 <entry colname="4">true</entry>
 <entry colname="5">Additional information about the size of the merge runs.
 This value will be NULL for an internal sort.</entry>



Mime
View raw message