Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit3f62e63

Browse files
committed
Merge branch 'PGPRO9_6_TASK941' of gitlab.postgrespro.ru:pgpro-dev/postgrespro into PGPRO9_6_TASK941
2 parents1247603 +ac77653 commit3f62e63

File tree

2 files changed

+27
-24
lines changed

2 files changed

+27
-24
lines changed

‎doc/src/sgml/release-pro-9.6.sgml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -51,41 +51,41 @@
5151
<para>To upgrade from a <productname>Postgres Pro</productname> version based on
5252
any previous <productname>PostgreSQL</productname> major release, you can perform a dump/restore using
5353
<xref linkend="app-pg-dumpall">, or use the <xref linkend="pgupgrade"> utility.
54-
The first option is safer, while the second is faster and can
54+
The first option is safer, while the second is faster and can significantly
5555
speed up the upgrade process for large databases.
5656
</para>
5757
<para>To upgrade from a <productname>Postgres Pro</productname> version
5858
based on the same <productname>PostgreSQL</productname> major release,
59-
the <literal>pgpro_upgrade</literal> script provided
60-
in this distribution is required:
61-
<itemizedlist>
62-
<listitem>
63-
<para>If you are upgrading your <productname>Postgres Pro</productname>
64-
installation from a binary package, the <literal>pgpro_upgrade</literal> script
65-
is run automatically, or you are prompted to run it manually.
66-
</para>
67-
</listitem>
68-
<listitem>
69-
<para>If you have compiled <productname>Postgres Pro</productname>
70-
from source code or created your database in a non-default location,
71-
you must always run the <literal>pgpro_upgrade</literal> script manually.
72-
Before running the script, you should stop postgres service.
73-
Script should be run on behalf of the user owning the database
74-
(typically postgres) and PGDATA environment variable should be
75-
set to the directory where database resides.
76-
</para>
77-
</listitem>
78-
</itemizedlist>
59+
a dump/restore is not required. Instead of the <literal>pg_upgrade</literal>,
60+
you must use the <literal>pgpro_upgrade</literal> script provided
61+
in this distribution. This script updates metadata information to
62+
handle catalog number format change introduced in
63+
<productname>Postgres Pro</productname> 9.6.4.1. If you are upgrading your
64+
<productname>Postgres Pro</productname> installation from a binary package, the
65+
<literal>pgpro_upgrade</literal> script is run automatically, or you
66+
are prompted to run it manually.
67+
</para>
68+
<important>
69+
<para>
70+
If you run <literal>pgpro_upgrade</literal> manually,
71+
you must stop postgres service.
72+
The script must be run on behalf of the user owning the database
73+
(typically postgres) and PGDATA environment variable should be
74+
set to the directory where database resides. Running <literal>pgpro_upgrade</literal>
75+
as root will result in an error.
76+
</para>
77+
</important>
78+
<para>If you have compiled <productname>Postgres Pro</productname>
79+
from source code or created your database in a non-default location,
80+
you must run the <literal>pgpro_upgrade</literal> script manually.
81+
</para>
7982
<note>
8083
<para>On RPM-based Linux distributions, if you are upgrading from
8184
version 9.6.2.1 or lower, make sure to move the data directory from
8285
<filename>pgsql</filename> to the <filename>pgpro</filename>
8386
directory before running the <literal>pgpro_upgrade</literal> script.
84-
Besides, after you upgrade to a newer version, you will have to use
85-
the <literal>systemd</literal> service manager.
8687
</para>
8788
</note>
88-
</para>
8989
<para>To migrate from vanilla PostgreSQL 9.6.x, perform a dump/restore using
9090
<xref linkend="app-pg-dumpall">.
9191
</para>

‎src/bin/pg_controldata/pg_controldata.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@
1818

1919
#include"postgres.h"
2020

21+
#include<sys/stat.h>
22+
#include<sys/time.h>
2123
#include<time.h>
24+
#include<unistd.h>
2225

2326
#include"access/xlog.h"
2427
#include"access/xlog_internal.h"

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp