You are viewing a plain text version of this content. The canonical link for it is here.

Posted to derby-commits@db.apache.org by rh...@apache.org on 2014/08/07 19:10:28 UTC

svn commit: r1616546 - /db/derby/docs/branches/10.11/src/ref/rrefexcept71493.dita

Author: rhillegas
Date: Thu Aug  7 17:10:27 2014
New Revision: 1616546

URL: http://svn.apache.org/r1616546
Log:
[RELEASE CHECKIN] Check in SQLState tables as part of building a release.

Modified:
    db/derby/docs/branches/10.11/src/ref/rrefexcept71493.dita

Modified: db/derby/docs/branches/10.11/src/ref/rrefexcept71493.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.11/src/ref/rrefexcept71493.dita?rev=1616546&r1=1616545&r2=1616546&view=diff
==============================================================================
--- db/derby/docs/branches/10.11/src/ref/rrefexcept71493.dita (original)
+++ db/derby/docs/branches/10.11/src/ref/rrefexcept71493.dita Thu Aug  7 17:10:27 2014
@@ -2099,6 +2099,10 @@ the corresponding text in messages.xml a
                             <entry colname="col2">Bulk insert replace is not permitted on '<varname>&lt;tableName&gt;</varname>' because it has an enabled trigger (<varname>&lt;triggerName&gt;</varname>).</entry>
                         </row>
                         <row>
+                            <entry colname="col1">42Z09</entry>
+                            <entry colname="col2">Aggregates are not permitted in the MERGE matching clause.</entry>
+                        </row>
+                        <row>
                             <entry colname="col1">42Z15</entry>
                             <entry colname="col2">Invalid type specified for column '<varname>&lt;columnName&gt;</varname>'. The type of a column may not be changed.  </entry>
                         </row>