diff options
author | Pavel Kajaba <pkajaba@redhat.com> | 2015-11-18 10:20:25 +0100 |
---|---|---|
committer | Pavel Kajaba <pkajaba@redhat.com> | 2015-11-18 10:20:25 +0100 |
commit | 412ca9cc5958e5402ad8804e368e2c8c1381cc05 (patch) | |
tree | 185b1ed5c4bbe9c3a83508fea40ec5e09ca12749 /postgresql-socket-dirs-pgupgrade.patch | |
parent | f51c859081bdb81b89293fa7a4d52782ce8429cb (diff) | |
download | postgresql-412ca9cc5958e5402ad8804e368e2c8c1381cc05.tar.gz postgresql-412ca9cc5958e5402ad8804e368e2c8c1381cc05.tar.xz postgresql-412ca9cc5958e5402ad8804e368e2c8c1381cc05.zip |
Added rebase to 9.5
Diffstat (limited to 'postgresql-socket-dirs-pgupgrade.patch')
-rw-r--r-- | postgresql-socket-dirs-pgupgrade.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/postgresql-socket-dirs-pgupgrade.patch b/postgresql-socket-dirs-pgupgrade.patch index 4bb3080..f429669 100644 --- a/postgresql-socket-dirs-pgupgrade.patch +++ b/postgresql-socket-dirs-pgupgrade.patch @@ -5,10 +5,10 @@ are told to run the older server than 9.2 with unix_socket_directories instead of unix_socket_directory. By default, even 9.2 is called with unix_socket_directory which breaks upgrade from RHSCL 9.2. -diff --git a/contrib/pg_upgrade/server.c b/contrib/pg_upgrade/server.c +diff --git a/src/bin/pg_upgrade/server.c b/src/bin/pg_upgrade/server.c index 3d041ef..a9c56e0 100644 ---- a/contrib/pg_upgrade/server.c -+++ b/contrib/pg_upgrade/server.c +--- a/src/bin/pg_upgrade/server.c ++++ b/src/bin/pg_upgrade/server.c @@ -178,6 +178,12 @@ start_postmaster(ClusterInfo *cluster, bool throw_error) bool pg_ctl_return = false; char socket_string[MAXPGPATH + 200]; |