Skip to content

Commit f2e0802

Browse files
Ashwin AgrawalEkta Khannabaobao0306Paul GuoRichard Guo
committed
Merge with PostgreSQL 9.4 STABLE (tag: 9.4.20)
This merges upto upstream commit 4f0bf33 (tag: REL9_4_20). Co-authored-by: Ashwin Agrawal <[email protected]> Co-authored-by: Ekta Khanna <[email protected]> Co-authored-by: Jinbao Chen <[email protected]> Co-authored-by: Paul Guo <[email protected]> Co-authored-by: Richard Guo <[email protected]> Co-authored-by: Shaoqi Bai <[email protected]>
2 parents 5cec42e + 4f0bf33 commit f2e0802

File tree

1,539 files changed

+506512
-118827
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,539 files changed

+506512
-118827
lines changed

‎.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,4 @@ src/backend/regex/re_syntax.n -whitespace
3333
src/backend/snowball/libstemmer/*.c -whitespace
3434
src/backend/utils/mb/Unicode/*-std.txt -whitespace
3535
src/include/snowball/libstemmer/* -whitespace
36+
src/timezone/data/* -whitespace

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ lib*.pc
5555

5656
# Local excludes in root directory
5757
/GNUmakefile
58+
/config.cache
5859
/config.log
5960
/config.status
6061
/VERSION

‎COPYRIGHT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ the PostgreSQL License is provided below:
1414
PostgreSQL Database Management System
1515
(formerly known as Postgres, then as Postgres95)
1616

17-
Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
17+
Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
1818

1919
Portions Copyright (c) 1994, The Regents of the University of California
2020

‎HISTORY

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Release notes for all versions of PostgreSQL can be found on-line at
2-
http://www.postgresql.org/docs/current/static/release.html
2+
https://www.postgresql.org/docs/current/static/release.html
33

44
Distribution file sets include release notes for their version and preceding
55
versions. Visit the file doc/src/sgml/html/release.html in an HTML browser.

‎Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
# GNUmakefile won't exist yet, so we catch that case as well.
1212

1313

14+
# AIX make defaults to building *every* target of the first rule. Start with
15+
# a single-target, empty rule to make the other targets non-default.
16+
all:
17+
1418
all check install installdirs installcheck installcheck-parallel uninstall clean distclean maintainer-clean dist distcheck world check-world install-world installcheck-world installcheck-resgroup:
1519
@if [ ! -f GNUmakefile ] ; then \
1620
echo "You need to run the 'configure' program first. See the file"; \

‎README.PostgreSQL

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ and functions. This distribution also contains C language bindings.
1111

1212
PostgreSQL has many language interfaces, many of which are listed here:
1313

14-
http://www.postgresql.org/download
14+
https://www.postgresql.org/download
1515

1616
See the file INSTALL for instructions on how to build and install
1717
PostgreSQL. That file also lists supported operating systems and
@@ -23,5 +23,5 @@ distribution; it can be read as described in the installation
2323
instructions.
2424

2525
The latest version of this software may be obtained at
26-
http://www.postgresql.org/download/. For more information look at our
27-
web site located at http://www.postgresql.org/.
26+
https://www.postgresql.org/download/. For more information look at our
27+
web site located at https://www.postgresql.org/.

‎README.git

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ git and so will not be present if you are using a git checkout.
66

77
If you are using a git checkout, you can view the most recent installation
88
instructions at:
9-
http://www.postgresql.org/docs/devel/static/installation.html
9+
https://www.postgresql.org/docs/devel/static/installation.html
1010

1111
Users compiling from git will also need compatible versions of Bison, Flex,
1212
and Perl, as discussed in the install documentation. These programs are not

‎concourse/scripts/test_upgrade.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ compare_dumps() {
317317
scp "$DIRNAME/dumpsort.gawk" ${MASTER_HOST}:~
318318

319319
ssh -n ${MASTER_HOST} "
320-
diff -U3 --speed-large-files --ignore-space-change \
320+
diff -w -U3 --speed-large-files --ignore-space-change \
321321
<(gawk -f ~/dumpsort.gawk < '$old_dump') \
322322
<(gawk -f ~/dumpsort.gawk < '$new_dump')
323323
"

‎config/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ include $(top_builddir)/src/Makefile.global
77

88
install: all installdirs
99
$(INSTALL_SCRIPT) $(srcdir)/install-sh '$(DESTDIR)$(pgxsdir)/config/install-sh'
10+
$(INSTALL_SCRIPT) $(srcdir)/missing '$(DESTDIR)$(pgxsdir)/config/missing'
1011

1112
installdirs:
1213
$(MKDIR_P) '$(DESTDIR)$(pgxsdir)/config'
1314

1415
uninstall:
1516
rm -f '$(DESTDIR)$(pgxsdir)/config/install-sh'
17+
rm -f '$(DESTDIR)$(pgxsdir)/config/missing'

‎config/c-library.m4

Lines changed: 40 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -105,23 +105,23 @@ fi
105105

106106
# PGAC_FUNC_STRERROR_R_INT
107107
# ---------------------------
108-
# Check if strerror_r() returns an int (SUSv3) rather than a char * (GNU libc)
109-
# If so, define STRERROR_R_INT
108+
# Check if strerror_r() returns int (POSIX) rather than char * (GNU libc).
109+
# If so, define STRERROR_R_INT.
110+
# The result is uncertain if strerror_r() isn't provided,
111+
# but we don't much care.
110112
AC_DEFUN([PGAC_FUNC_STRERROR_R_INT],
111113
[AC_CACHE_CHECK(whether strerror_r returns int,
112114
pgac_cv_func_strerror_r_int,
113115
[AC_TRY_COMPILE([#include <string.h>],
114-
[#ifndef _AIX
115-
int strerror_r(int, char *, size_t);
116-
#else
117-
/* Older AIX has 'int' for the third argument so we don't test the args. */
118-
int strerror_r();
119-
#endif],
116+
[char buf[100];
117+
switch (strerror_r(1, buf, sizeof(buf)))
118+
{ case 0: break; default: break; }
119+
],
120120
[pgac_cv_func_strerror_r_int=yes],
121121
[pgac_cv_func_strerror_r_int=no])])
122122
if test x"$pgac_cv_func_strerror_r_int" = xyes ; then
123123
AC_DEFINE(STRERROR_R_INT, 1,
124-
[Define to 1 if strerror_r() returns a int.])
124+
[Define to 1 if strerror_r() returns int.])
125125
fi
126126
])# PGAC_FUNC_STRERROR_R_INT
127127

@@ -366,4 +366,34 @@ fi
366366
if test "$pgac_cv_type_locale_t" = 'yes (in xlocale.h)'; then
367367
AC_DEFINE(LOCALE_T_IN_XLOCALE, 1,
368368
[Define to 1 if `locale_t' requires <xlocale.h>.])
369-
fi])])# PGAC_HEADER_XLOCALE
369+
fi])# PGAC_TYPE_LOCALE_T
370+
371+
372+
# PGAC_FUNC_WCSTOMBS_L
373+
# --------------------
374+
# Try to find a declaration for wcstombs_l(). It might be in stdlib.h
375+
# (following the POSIX requirement for wcstombs()), or in locale.h, or in
376+
# xlocale.h. If it's in the latter, define WCSTOMBS_L_IN_XLOCALE.
377+
#
378+
AC_DEFUN([PGAC_FUNC_WCSTOMBS_L],
379+
[AC_CACHE_CHECK([for wcstombs_l declaration], pgac_cv_func_wcstombs_l,
380+
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
381+
[#include <stdlib.h>
382+
#include <locale.h>],
383+
[#ifndef wcstombs_l
384+
(void) wcstombs_l;
385+
#endif])],
386+
[pgac_cv_func_wcstombs_l='yes'],
387+
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
388+
[#include <stdlib.h>
389+
#include <locale.h>
390+
#include <xlocale.h>],
391+
[#ifndef wcstombs_l
392+
(void) wcstombs_l;
393+
#endif])],
394+
[pgac_cv_func_wcstombs_l='yes (in xlocale.h)'],
395+
[pgac_cv_func_wcstombs_l='no'])])])
396+
if test "$pgac_cv_func_wcstombs_l" = 'yes (in xlocale.h)'; then
397+
AC_DEFINE(WCSTOMBS_L_IN_XLOCALE, 1,
398+
[Define to 1 if `wcstombs_l' requires <xlocale.h>.])
399+
fi])# PGAC_FUNC_WCSTOMBS_L

0 commit comments

Comments
 (0)