diff --git a/doc/src/sgml/glossary.sgml b/doc/src/sgml/glossary.sgml index fe8def41d04..5815fa44710 100644 --- a/doc/src/sgml/glossary.sgml +++ b/doc/src/sgml/glossary.sgml @@ -1097,8 +1097,8 @@ (just like a view), but stores data in the same way that a table does. It cannot be - modified via INSERT, UPDATE, or - DELETE operations. + modified via INSERT, UPDATE, + DELETE, or MERGE operations. For more information, see @@ -1107,6 +1107,23 @@ + + Merge + + + An SQL command used to conditionally add, modify, + or remove rows + in a given table, + using data from a source + relation. + + + For more information, see + . + + + + Multi-version concurrency control (MVCC) diff --git a/doc/src/sgml/ref/merge.sgml b/doc/src/sgml/ref/merge.sgml index 0995fe0c046..d66a0626b42 100644 --- a/doc/src/sgml/ref/merge.sgml +++ b/doc/src/sgml/ref/merge.sgml @@ -102,14 +102,14 @@ DELETE that are referred to in the SET clause. If you specify an insert action, you must have the INSERT privilege on the target_table_name. - If you specify an delete action, you must have the DELETE + If you specify a delete action, you must have the DELETE privilege on the target_table_name. Privileges are tested once at statement start and are checked whether or not particular WHEN clauses are executed. - You will require the SELECT privilege on the - data_source and any column(s) - of the target_table_name - referred to in a condition. + You will require the SELECT privilege on any column(s) + of the data_source and + target_table_name referred to + in any condition or expression.