diff options
| author | Bernd Helmle | 2011-06-15 15:13:25 +0000 |
|---|---|---|
| committer | Bernd Helmle | 2011-06-15 15:13:25 +0000 |
| commit | 682cd6c79b296baa97877c4d05241f9c0a694fea (patch) | |
| tree | eedb94cc08ca455237365ad2fd0126053a75c1f6 /doc/src | |
| parent | 74375c8a693ff03da416b0df95b02831f4812c01 (diff) | |
| parent | 264a6b127a918800d9f8bac80b5f4a8a8799d0f1 (diff) | |
Merge branch 'master' of ../bernd_pg into notnull_constraintnotnull_constraint
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/sgml/ddl.sgml | 5 | ||||
| -rw-r--r-- | doc/src/sgml/pgupgrade.sgml | 11 | ||||
| -rw-r--r-- | doc/src/sgml/ref/psql-ref.sgml | 26 |
3 files changed, 22 insertions, 20 deletions
diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml index 4c9fc5d57a..ca6b863793 100644 --- a/doc/src/sgml/ddl.sgml +++ b/doc/src/sgml/ddl.sgml @@ -2332,8 +2332,9 @@ VALUES ('New York', NULL, NULL, 'NY'); <para> Bulk loads and deletes can be accomplished by adding or removing partitions, if that requirement is planned into the partitioning design. - <command>ALTER TABLE</> is far faster than a bulk operation. - It also entirely avoids the <command>VACUUM</command> + <command>ALTER TABLE NO INHERIT</> and <command>DROP TABLE</> are + both far faster than a bulk operation. + These commands also entirely avoid the <command>VACUUM</command> overhead caused by a bulk <command>DELETE</>. </para> </listitem> diff --git a/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/pgupgrade.sgml index 8bd5f74178..a505707cc0 100644 --- a/doc/src/sgml/pgupgrade.sgml +++ b/doc/src/sgml/pgupgrade.sgml @@ -256,7 +256,8 @@ gmake prefix=/usr/local/pgsql.new install so you might want to set authentication to <literal>trust</> in <filename>pg_hba.conf</>, or if using <literal>md5</> authentication, use a <filename>~/.pgpass</> file (see <xref linkend="libpq-pgpass">) - to avoid being prompted repeatedly for a password. + to avoid being prompted repeatedly for a password. Also make sure + pg_upgrade is the only program that can connect to the clusters. </para> </step> @@ -295,9 +296,11 @@ NET STOP pgsql-8.3 (<productname>PostgreSQL</> 8.3 and older used a different s data and executable (<filename>bin</>) directories. You can also specify separate user and port values, and whether you want the data linked instead of copied (the default). If you use linking, the upgrade will be much - faster (no data copying), but you will no longer be able to access your - old cluster once you start the new cluster after the upgrade. See - <literal>pg_upgrade --help</> for a full list of options. + faster (hard link data files rather than copying them), but you + will no longer be able to access your old cluster once you start + the new cluster after the upgrade. Link mode also requires that the + old and new cluster data directories be in the same file system. + See <literal>pg_upgrade --help</> for a full list of options. </para> <para> diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index eaf901d328..c9713d3c2a 100644 --- a/doc/src/sgml/ref/psql-ref.sgml +++ b/doc/src/sgml/ref/psql-ref.sgml @@ -878,8 +878,8 @@ testdb=> <listitem> <para> - For each relation (table, view, index, sequence or foreign table) - matching the + For each relation (table, view, index, sequence, or foreign table) + or composite type matching the <replaceable class="parameter">pattern</replaceable>, show all columns, their types, the tablespace (if not the default) and any special attributes such as <literal>NOT NULL</literal> or defaults. @@ -2770,18 +2770,16 @@ bar <term><varname>ON_ERROR_STOP</varname></term> <listitem> <para> - By default, if non-interactive scripts encounter an error, such - as a malformed <acronym>SQL</acronym> command or internal - meta-command, processing continues. This has been the - traditional behavior of <application>psql</application> but it - is sometimes not desirable. If this variable is set, script - processing will immediately terminate. If the script was called - from another script it will terminate in the same fashion. If - the outermost script was not called from an interactive - <application>psql</application> session but rather using the - <option>-f</option> option, <application>psql</application> will - return error code 3, to distinguish this case from fatal error - conditions (error code 1). + By default, command processing continues after an error. When this + variale is set, it will instead stop immediately. In interactive mode, + <application>psql</application> will return to the command prompt; + otherwise, <application>psql</application> will exit, returning + error code 3 to distinguish this case from fatal error + conditions, which are reported using error code 1. In either case, + any currently running scripts (the toplevel script, if any, and any + other scripts which it may have in invoked) will be terminated + immediately. If the toplevel command string contained multiple SQL + commands, processing will stop with the current command. </para> </listitem> </varlistentry> |