svn commit: r1601410 - /db/derby/docs/trunk/src/ref/rrefsqljmerge.dita

[ch...@apache.org]

Author: chaase3
Date: Mon Jun  9 15:36:33 2014
New Revision: 1601410

URL: http://svn.apache.org/r1601410
Log:
DERBY-6526  Document the MERGE statement

Modified a Reference Manual topic to add upgrade information. 

Patches: DERBY-6526-upgrade.diff

Modified:
    db/derby/docs/trunk/src/ref/rrefsqljmerge.dita

Modified: db/derby/docs/trunk/src/ref/rrefsqljmerge.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljmerge.dita?rev=1601410&r1=1601409&r2=1601410&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljmerge.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljmerge.dita Mon Jun  9 15:36:33 2014
@@ -53,6 +53,11 @@ or <i>sourceTable</i>. Functions mention
 modify SQL data.</p>
 <p>The row count for a successful MERGE statement is the total number of rows
 inserted, updated, and deleted by the statement.</p>
+<note>The MERGE statement is valid only after a database has been fully upgraded
+to <ph conref="../conrefs.dita#prod/productshortname"></ph> Release 10.11 or
+higher. (See "Upgrading a database" in the
+<ph conref="../conrefs.dita#pub/citdevelop"></ph> for more information.) This
+statement has no meaning in a database that is at Release 10.10 or lower.</note>
 </refsyn>
 <refsyn id="mergewhen"><title>mergeWhenClause</title>
 <codeblock><b><i><xref href="rrefsqljmerge.dita#rrefsqljmerge/whenmatched">mergeWhenMatched</xref></i> | <i><xref href="rrefsqljmerge.dita#rrefsqljmerge/whennotmatched">mergeWhenNotMatched</xref></i>