openkylin
/
postgresql-12
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

apply patches

This commit is contained in:
openKylinBot 2022-05-14 02:43:37 +08:00
parent 322901735a b9d5dc146a
commit 03d23364a5
12 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -3,3 +3,6 @@ https://www.postgresql.org/docs/current/static/release.html
Distribution file sets include release notes for their version and preceding
versions. Visit the file doc/src/sgml/html/release.html in an HTML browser.
On Debian systems, the release notes are contained in the postgresql-doc-*
packages, located in /usr/share/doc/postgresql-doc-*/html/release.html.

8
src/Makefile.global.in
View File

@ -120,7 +120,7 @@ libdir := @libdir@
pkglibdir = $(libdir)
ifeq "$(findstring pgsql, $(pkglibdir))" ""
ifeq "$(findstring postgres, $(pkglibdir))" ""
override pkglibdir := $(pkglibdir)/postgresql
override pkglibdir := /usr/lib/postgresql/@PG_MAJORVERSION@/lib
endif
endif
@ -168,7 +168,7 @@ endif # PGXS
# These derived path variables aren't separately configurable.
includedir_server = $(pkgincludedir)/server
includedir_server = $(pkgincludedir)/@PG_MAJORVERSION@/server
includedir_internal = $(pkgincludedir)/internal
pgxsdir = $(pkglibdir)/pgxs
bitcodedir = $(pkglibdir)/bitcode
@ -562,8 +562,8 @@ libpq = -L$(libpq_builddir) -lpq
# on client link lines, since that also appears in $(LIBS).
# libpq_pgport_shlib is the same idea, but for use in client shared libraries.
ifdef PGXS
libpq_pgport = -L$(libdir) -lpgcommon -lpgport $(libpq)
libpq_pgport_shlib = -L$(libdir) -lpgcommon_shlib -lpgport_shlib $(libpq)
libpq_pgport = -L$(pkglibdir) -lpgcommon -lpgport $(libpq)
libpq_pgport_shlib = -L$(pkglibdir) -lpgcommon_shlib -lpgport_shlib $(libpq)
else
libpq_pgport = -L$(top_builddir)/src/common -lpgcommon -L$(top_builddir)/src/port -lpgport $(libpq)
libpq_pgport_shlib = -L$(top_builddir)/src/common -lpgcommon_shlib -L$(top_builddir)/src/port -lpgport_shlib $(libpq)

2
src/bin/initdb/initdb.c
View File

@ -3363,7 +3363,7 @@ main(int argc, char *argv[])
printf(_("\nSuccess. You can now start the database server using:\n\n"
" %s\n\n"),
start_db_cmd->data);
getenv("CLUSTER_START_COMMAND") ? getenv("CLUSTER_START_COMMAND") : start_db_cmd->data);
destroyPQExpBuffer(start_db_cmd);

8
src/bin/pg_config/pg_config.c
View File

@ -27,6 +27,8 @@
#include "port.h"
#include "common/config_info.h"
#include "../port/pg_config_paths.h"
static const char *progname;
/*
@ -148,11 +150,7 @@ main(int argc, char **argv)
}
}
if (find_my_exec(argv[0], my_exec_path) < 0)
{
fprintf(stderr, _("%s: could not find own program executable\n"), progname);
exit(1);
}
snprintf(my_exec_path, sizeof(my_exec_path), "%s/%s", PGBINDIR, progname);
configdata = get_configdata(my_exec_path, &configdata_len);
/* no arguments -> print everything */

4
src/bin/psql/settings.h
View File

@ -20,8 +20,8 @@
#define DEFAULT_EDITOR "notepad.exe"
/* no DEFAULT_EDITOR_LINENUMBER_ARG for Notepad */
#else
#define DEFAULT_EDITOR "vi"
#define DEFAULT_EDITOR_LINENUMBER_ARG "+"
#define DEFAULT_EDITOR "sensible-editor"
/*#define DEFAULT_EDITOR_LINENUMBER_ARG "+"*/
#endif
#define DEFAULT_PROMPT1 "%/%R%# "

15
src/common/Makefile
View File

@ -31,10 +31,11 @@ include $(top_builddir)/src/Makefile.global
# don't include subdirectory-path-dependent -I and -L switches
STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS))
STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/common -L$(top_builddir)/src/port,$(LDFLAGS))
override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\""
# filter build path variation from -fdebug-prefix-map and -ffile-prefix-map
override CPPFLAGS += -DVAL_CONFIGURE="\"$(filter-out -fdebug-prefix-map=% -ffile-prefix-map=%,$(configure_args))\""
override CPPFLAGS += -DVAL_CC="\"$(CC)\""
override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\""
override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\""
override CPPFLAGS += -DVAL_CFLAGS="\"$(filter-out -fdebug-prefix-map=% -ffile-prefix-map=%,$(CFLAGS))\""
override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\""
override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\""
override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\""
@ -78,15 +79,15 @@ distprep: kwlist_d.h
# libpgcommon is needed by some contrib
install: all installdirs
$(INSTALL_STLIB) libpgcommon.a '$(DESTDIR)$(libdir)/libpgcommon.a'
$(INSTALL_STLIB) libpgcommon_shlib.a '$(DESTDIR)$(libdir)/libpgcommon_shlib.a'
$(INSTALL_STLIB) libpgcommon.a '$(DESTDIR)$(pkglibdir)/libpgcommon.a'
$(INSTALL_STLIB) libpgcommon_shlib.a '$(DESTDIR)$(pkglibdir)/libpgcommon_shlib.a'
installdirs:
$(MKDIR_P) '$(DESTDIR)$(libdir)'
$(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
uninstall:
rm -f '$(DESTDIR)$(libdir)/libpgcommon.a'
rm -f '$(DESTDIR)$(libdir)/libpgcommon_shlib.a'
rm -f '$(DESTDIR)$(pkglibdir)/libpgcommon.a'
rm -f '$(DESTDIR)$(pkglibdir)/libpgcommon_shlib.a'
libpgcommon.a: $(OBJS_FRONTEND)
rm -f $@

6
src/fe_utils/Makefile
View File

@ -35,13 +35,13 @@ distprep: psqlscan.c
# libpgfeutils could be useful to contrib, so install it
install: all installdirs
$(INSTALL_STLIB) libpgfeutils.a '$(DESTDIR)$(libdir)/libpgfeutils.a'
$(INSTALL_STLIB) libpgfeutils.a '$(DESTDIR)$(pkglibdir)/libpgfeutils.a'
installdirs:
$(MKDIR_P) '$(DESTDIR)$(libdir)'
$(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
uninstall:
rm -f '$(DESTDIR)$(libdir)/libpgfeutils.a'
rm -f '$(DESTDIR)$(pkglibdir)/libpgfeutils.a'
clean distclean:
rm -f libpgfeutils.a $(OBJS) lex.backup

2
src/include/fe_utils/print.h
View File

@ -18,7 +18,7 @@
/* This is not a particularly great place for this ... */
#ifndef __CYGWIN__
#define DEFAULT_PAGER "more"
#define DEFAULT_PAGER "pager"
#else
#define DEFAULT_PAGER "less"
#endif

2
src/include/pg_config_manual.h
View File

@ -179,7 +179,7 @@
* here's where to twiddle it. You can also override this at runtime
* with the postmaster's -k switch.
*/
#define DEFAULT_PGSOCKET_DIR "/tmp"
#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql"
/*
* This is the default event source for Windows event log.

4
src/interfaces/libpq/pg_service.conf.sample
View File

@ -8,8 +8,8 @@
# to look up such parameters. A sample configuration for postgres is
# included in this file. Lines beginning with '#' are comments.
#
# Copy this to your sysconf directory (typically /usr/local/pgsql/etc) and
# rename it pg_service.conf.
# Copy this to /etc/postgresql-common/ (or select its location with the
# PGSYSCONFDIR environment variable) and rename it pg_service.conf.
#
#
#[postgres]

10
src/port/Makefile
View File

@ -50,15 +50,15 @@ all: libpgport.a libpgport_shlib.a libpgport_srv.a
# libpgport is needed by some contrib
install: all installdirs
$(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a'
$(INSTALL_STLIB) libpgport_shlib.a '$(DESTDIR)$(libdir)/libpgport_shlib.a'
$(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(pkglibdir)/libpgport.a'
$(INSTALL_STLIB) libpgport_shlib.a '$(DESTDIR)$(pkglibdir)/libpgport_shlib.a'
installdirs:
$(MKDIR_P) '$(DESTDIR)$(libdir)'
$(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
uninstall:
rm -f '$(DESTDIR)$(libdir)/libpgport.a'
rm -f '$(DESTDIR)$(libdir)/libpgport_shlib.a'
rm -f '$(DESTDIR)$(pkglibdir)/libpgport.a'
rm -f '$(DESTDIR)$(pkglibdir)/libpgport_shlib.a'
libpgport.a: $(OBJS)
rm -f $@

3
src/tutorial/README
View File

@ -6,8 +6,7 @@ tutorial
This directory contains SQL tutorial scripts. To look at them, first do a
% make
to compile all the scripts and C files for the user-defined functions
and types. (make needs to be GNU make --- it may be named something
different on your system, often 'gmake')
and types. This requires a postgresql-server-dev-* package to be installed.
Then, run psql with the -s (single-step) flag:
% psql -s