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

Commit29ef2db

Browse files
committed
merge with 9.6-stable
2 parents7b25e26 +12ac252 commit29ef2db

File tree

442 files changed

+57403
-40210
lines changed

Some content is hidden

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

442 files changed

+57403
-40210
lines changed

‎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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ all check install installdirs installcheck installcheck-parallel uninstall clean
2929
\
3030
if [ x"$${GMAKE+set}"= xset ];then \
3131
echo"Using GNU make found at$${GMAKE}";\
32+
unset MAKEFLAGS;unset MAKELEVEL;\
3233
$${GMAKE}$@;\
3334
else\
3435
echo"You must use GNU make to build PostgreSQL.";\

‎README‎

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 athttp://www.postgresql.org/.
26+
https://www.postgresql.org/download/. For more information look at our
27+
web site located athttps://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

‎config/perl.m4‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,33 @@ AC_DEFUN([PGAC_CHECK_PERL_CONFIGS],
4949
[m4_foreach([pgac_item],[$1],[PGAC_CHECK_PERL_CONFIG(pgac_item)])])
5050

5151

52+
# PGAC_CHECK_PERL_EMBED_CCFLAGS
53+
# -----------------------------
54+
# We selectively extract stuff from $Config{ccflags}. We don't really need
55+
# anything except -D switches, and other sorts of compiler switches can
56+
# actively break things if Perl was compiled with a different compiler.
57+
# Moreover, although Perl likes to put stuff like -D_LARGEFILE_SOURCE and
58+
# -D_FILE_OFFSET_BITS=64 here, it would be fatal to try to compile PL/Perl
59+
# to a different libc ABI than core Postgres uses. The available information
60+
# says that all the symbols that affect Perl's own ABI begin with letters,
61+
# so it should be sufficient to adopt -D switches for symbols not beginning
62+
# with underscore. An exception is that we need to let through
63+
# -D_USE_32BIT_TIME_T if it's present. (We probably could restrict that to
64+
# only get through on Windows, but for the moment we let it through always.)
65+
# For debugging purposes, let's have the configure output report the raw
66+
# ccflags value as well as the set of flags we chose to adopt.
67+
AC_DEFUN([PGAC_CHECK_PERL_EMBED_CCFLAGS],
68+
[AC_REQUIRE([PGAC_PATH_PERL])
69+
AC_MSG_CHECKING([for CFLAGS recommended by Perl])
70+
perl_ccflags=`$PERL -MConfig -e['print $Config{ccflags}']`
71+
AC_MSG_RESULT([$perl_ccflags])
72+
AC_MSG_CHECKING([for CFLAGS to compile embedded Perl])
73+
perl_embed_ccflags=`$PERL -MConfig -e['foreach $f (split(" ",$Config{ccflags})) {print $f, " " if ($f =~ /^-D[^_]/ || $f =~ /^-D_USE_32BIT_TIME_T/)}']`
74+
AC_SUBST(perl_embed_ccflags)dnl
75+
AC_MSG_RESULT([$perl_embed_ccflags])
76+
])# PGAC_CHECK_PERL_EMBED_CCFLAGS
77+
78+
5279
# PGAC_CHECK_PERL_EMBED_LDFLAGS
5380
# -----------------------------
5481
# We are after Embed's ldopts, but without the subset mentioned in

‎configure‎

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 for PostgreSQL 9.6.2.
3+
# Generated by GNU Autoconf 2.69 for PostgreSQL 9.6.5.
44
#
55
# Report bugs to <pgsql-bugs@postgresql.org>.
66
#
@@ -582,8 +582,8 @@ MAKEFLAGS=
582582
# Identity of this package.
583583
PACKAGE_NAME='PostgreSQL'
584584
PACKAGE_TARNAME='postgresql'
585-
PACKAGE_VERSION='9.6.2'
586-
PACKAGE_STRING='PostgreSQL 9.6.2'
585+
PACKAGE_VERSION='9.6.5'
586+
PACKAGE_STRING='PostgreSQL 9.6.5'
587587
PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
588588
PACKAGE_URL=''
589589

@@ -670,6 +670,7 @@ python_version
670670
python_majorversion
671671
PYTHON
672672
perl_embed_ldflags
673+
perl_embed_ccflags
673674
perl_useshrplib
674675
perl_privlibexp
675676
perl_archlibexp
@@ -1398,7 +1399,7 @@ if test "$ac_init_help" = "long"; then
13981399
# Omit some internal or obsolete options to make the list less imposing.
13991400
# This message is too long to be a string in the A/UX 3.1 sh.
14001401
cat<<_ACEOF
1401-
\`configure' configures PostgreSQL 9.6.2 to adapt to many kinds of systems.
1402+
\`configure' configures PostgreSQL 9.6.5 to adapt to many kinds of systems.
14021403
14031404
Usage:$0 [OPTION]... [VAR=VALUE]...
14041405
@@ -1463,7 +1464,7 @@ fi
14631464

14641465
iftest -n"$ac_init_help";then
14651466
case$ac_init_helpin
1466-
short | recursive )echo"Configuration of PostgreSQL 9.6.2:";;
1467+
short | recursive )echo"Configuration of PostgreSQL 9.6.5:";;
14671468
esac
14681469
cat<<\_ACEOF
14691470
@@ -1615,7 +1616,7 @@ fi
16151616
test -n "$ac_init_help" && exit $ac_status
16161617
if $ac_init_version; then
16171618
cat <<\_ACEOF
1618-
PostgreSQL configure 9.6.2
1619+
PostgreSQL configure 9.6.5
16191620
generated by GNU Autoconf 2.69
16201621
16211622
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2326,7 +2327,7 @@ cat >config.log <<_ACEOF
23262327
This file contains any messages produced by compilers while
23272328
running configure, to aid debugging if configure makes a mistake.
23282329
2329-
It was created by PostgreSQL$as_me 9.6.2, which was
2330+
It was created by PostgreSQL$as_me 9.6.5, which was
23302331
generated by GNU Autoconf 2.69. Invocation command line was
23312332
23322333
$$0$@
@@ -7511,6 +7512,18 @@ documentation for details. Use --without-perl to disable building
75117512
PL/Perl.""$LINENO" 5
75127513
fi
75137514

7515+
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for CFLAGS recommended by Perl">&5
7516+
$as_echo_n"checking for CFLAGS recommended by Perl...">&6; }
7517+
perl_ccflags=`$PERL -MConfig -e'print $Config{ccflags}'`
7518+
{$as_echo"$as_me:${as_lineno-$LINENO}: result:$perl_ccflags">&5
7519+
$as_echo"$perl_ccflags">&6; }
7520+
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for CFLAGS to compile embedded Perl">&5
7521+
$as_echo_n"checking for CFLAGS to compile embedded Perl...">&6; }
7522+
perl_embed_ccflags=`$PERL -MConfig -e'foreach $f (split(" ",$Config{ccflags})) {print $f, " " if ($f =~ /^-D[^_]/ || $f =~ /^-D_USE_32BIT_TIME_T/)}'`
7523+
{$as_echo"$as_me:${as_lineno-$LINENO}: result:$perl_embed_ccflags">&5
7524+
$as_echo"$perl_embed_ccflags">&6; }
7525+
7526+
75147527
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for flags to link embedded Perl">&5
75157528
$as_echo_n"checking for flags to link embedded Perl...">&6; }
75167529
iftest"$PORTNAME" ="win32";then
@@ -12504,7 +12517,7 @@ fi
1250412517
LIBS_including_readline="$LIBS"
1250512518
LIBS=`echo"$LIBS"| sed -e's/-ledit//g' -e's/-lreadline//g'`
1250612519

12507-
forac_funcin cbrt dlopen fdatasync getifaddrs getpeerucred getrlimit mbstowcs_l memmove poll pstat pthread_is_threaded_np readlink setproctitle setsid shm_open symlink sync_file_range towlower utime utimes wcstombs wcstombs_l
12520+
forac_funcin cbrt dlopen fdatasync getifaddrs getpeerucred getrlimit mbstowcs_l memmove pollposix_fallocatepstat pthread_is_threaded_np readlink setproctitle setsid shm_open symlink sync_file_range towlower utime utimes wcstombs wcstombs_l
1250812521
do:
1250912522
as_ac_var=`$as_echo"ac_cv_func_$ac_func"|$as_tr_sh`
1251012523
ac_fn_c_check_func"$LINENO""$ac_func""$as_ac_var"
@@ -13713,24 +13726,6 @@ cat >>confdefs.h <<_ACEOF
1371313726
_ACEOF
1371413727

1371513728

13716-
13717-
iftest x"$HAVE_LONG_LONG_INT_64" = xyes;then
13718-
cat confdefs.h -<<_ACEOF >conftest.$ac_ext
13719-
/* end confdefs.h. */
13720-
13721-
#define INT64CONST(x) x##LL
13722-
long long int foo = INT64CONST(0x1234567890123456);
13723-
13724-
_ACEOF
13725-
if ac_fn_c_try_compile"$LINENO";then:
13726-
13727-
$as_echo"#define HAVE_LL_CONSTANTS 1">>confdefs.h
13728-
13729-
fi
13730-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13731-
fi
13732-
13733-
1373413729
# If we found "long int" is 64 bits, assume snprintf handles it. If
1373513730
# we found we need to use "long long int", better check. We cope with
1373613731
# snprintfs that use %lld, %qd, or %I64d as the format. If none of these
@@ -16464,7 +16459,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1646416459
# report actual input values of CONFIG_FILES etc. instead of their
1646516460
# values after options handling.
1646616461
ac_log="
16467-
This file was extended by PostgreSQL $as_me 9.6.2, which was
16462+
This file was extended by PostgreSQL $as_me 9.6.5, which was
1646816463
generated by GNU Autoconf 2.69. Invocation command line was
1646916464
1647016465
CONFIG_FILES = $CONFIG_FILES
@@ -16534,7 +16529,7 @@ _ACEOF
1653416529
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1653516530
ac_cs_config="`$as_echo"$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1653616531
ac_cs_version="\\
16537-
PostgreSQL config.status 9.6.2
16532+
PostgreSQL config.status 9.6.5
1653816533
configured by$0, generated by GNU Autoconf 2.69,
1653916534
with options\\"\$ac_cs_config\\"
1654016535

‎configure.in‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dnl Read the Autoconf manual for details.
1717
dnl
1818
m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
1919

20-
AC_INIT([PostgreSQL], [9.6.2], [pgsql-bugs@postgresql.org])
20+
AC_INIT([PostgreSQL], [9.6.5], [pgsql-bugs@postgresql.org])
2121

2222
m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
2323
Untested combinations of 'autoconf' and PostgreSQL versions are not
@@ -928,6 +928,7 @@ You might have to rebuild your Perl installation. Refer to the
928928
documentation for details. Use --without-perl to disable building
929929
PL/Perl.])
930930
fi
931+
PGAC_CHECK_PERL_EMBED_CCFLAGS
931932
PGAC_CHECK_PERL_EMBED_LDFLAGS
932933
fi
933934

@@ -1456,7 +1457,7 @@ PGAC_FUNC_WCSTOMBS_L
14561457
LIBS_including_readline="$LIBS"
14571458
LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
14581459

1459-
AC_CHECK_FUNCS([cbrt dlopen fdatasync getifaddrs getpeerucred getrlimit mbstowcs_l memmove poll pstat pthread_is_threaded_np readlink setproctitle setsid shm_open symlink sync_file_range towlower utime utimes wcstombs wcstombs_l])
1460+
AC_CHECK_FUNCS([cbrt dlopen fdatasync getifaddrs getpeerucred getrlimit mbstowcs_l memmove pollposix_fallocatepstat pthread_is_threaded_np readlink setproctitle setsid shm_open symlink sync_file_range towlower utime utimes wcstombs wcstombs_l])
14601461

14611462
AC_REPLACE_FUNCS(fseeko)
14621463
case $host_os in
@@ -1750,18 +1751,6 @@ fi
17501751
AC_DEFINE_UNQUOTED(PG_INT64_TYPE, $pg_int64_type,
17511752
[Define to the name of a signed 64-bit integer type.])
17521753

1753-
dnl If we need to use "long long int", figure out whether nnnLL notation works.
1754-
1755-
if test x"$HAVE_LONG_LONG_INT_64" = xyes ; then
1756-
AC_COMPILE_IFELSE([AC_LANG_SOURCE([
1757-
#define INT64CONST(x) x##LL
1758-
long long int foo = INT64CONST(0x1234567890123456);
1759-
])],
1760-
[AC_DEFINE(HAVE_LL_CONSTANTS, 1, [Define to 1 if constants of type 'long long int' should have the suffix LL.])],
1761-
[])
1762-
fi
1763-
1764-
17651754
# If we found "long int" is 64 bits, assume snprintf handles it. If
17661755
# we found we need to use "long long int", better check. We cope with
17671756
# snprintfs that use %lld, %qd, or %I64d as the format. If none of these

‎contrib/hstore_plperl/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ endif
4343
# last, probably because it sometimes contains some header files with names
4444
# that clash with some of ours, or with some that we include, notably on
4545
# Windows.
46-
overrideCPPFLAGS :=$(CPPFLAGS) -I$(perl_archlibexp)/CORE
46+
overrideCPPFLAGS :=$(CPPFLAGS)$(perl_embed_ccflags)-I$(perl_archlibexp)/CORE

‎contrib/hstore_plperl/expected/hstore_plperlu.out‎

Lines changed: 11 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,12 @@ TRANSFORM FOR TYPE hstore
2020
AS $$
2121
use Data::Dumper;
2222
$Data::Dumper::Sortkeys = 1;
23+
$Data::Dumper::Indent = 0;
2324
elog(INFO, Dumper($_[0]));
2425
return scalar(keys %{$_[0]});
2526
$$;
2627
SELECT test1('aa=>bb, cc=>NULL'::hstore);
27-
INFO: $VAR1 = {
28-
'aa' => 'bb',
29-
'cc' => undef
30-
};
31-
28+
INFO: $VAR1 = {'aa' => 'bb','cc' => undef};
3229
test1
3330
-------
3431
2
@@ -39,12 +36,12 @@ LANGUAGE plperlu
3936
AS $$
4037
use Data::Dumper;
4138
$Data::Dumper::Sortkeys = 1;
39+
$Data::Dumper::Indent = 0;
4240
elog(INFO, Dumper($_[0]));
4341
return scalar(keys %{$_[0]});
4442
$$;
4543
SELECT test1none('aa=>bb, cc=>NULL'::hstore);
4644
INFO: $VAR1 = '"aa"=>"bb", "cc"=>NULL';
47-
4845
test1none
4946
-----------
5047
0
@@ -56,15 +53,12 @@ TRANSFORM FOR TYPE hstore
5653
AS $$
5754
use Data::Dumper;
5855
$Data::Dumper::Sortkeys = 1;
56+
$Data::Dumper::Indent = 0;
5957
elog(INFO, Dumper($_[0]));
6058
return scalar(keys %{$_[0]});
6159
$$;
6260
SELECT test1list('aa=>bb, cc=>NULL'::hstore);
63-
INFO: $VAR1 = {
64-
'aa' => 'bb',
65-
'cc' => undef
66-
};
67-
61+
INFO: $VAR1 = {'aa' => 'bb','cc' => undef};
6862
test1list
6963
-----------
7064
2
@@ -77,18 +71,12 @@ TRANSFORM FOR TYPE hstore
7771
AS $$
7872
use Data::Dumper;
7973
$Data::Dumper::Sortkeys = 1;
74+
$Data::Dumper::Indent = 0;
8075
elog(INFO, Dumper($_[0]->[0], $_[0]->[1]));
8176
return scalar(keys %{$_[0]});
8277
$$;
8378
SELECT test1arr(array['aa=>bb, cc=>NULL'::hstore, 'dd=>ee']);
84-
INFO: $VAR1 = {
85-
'aa' => 'bb',
86-
'cc' => undef
87-
};
88-
$VAR2 = {
89-
'dd' => 'ee'
90-
};
91-
79+
INFO: $VAR1 = {'aa' => 'bb','cc' => undef};$VAR2 = {'dd' => 'ee'};
9280
test1arr
9381
----------
9482
2
@@ -101,6 +89,7 @@ TRANSFORM FOR TYPE hstore
10189
AS $$
10290
use Data::Dumper;
10391
$Data::Dumper::Sortkeys = 1;
92+
$Data::Dumper::Indent = 0;
10493

10594
$rv = spi_exec_query(q{SELECT 'aa=>bb, cc=>NULL'::hstore AS col1});
10695
elog(INFO, Dumper($rv->{rows}[0]->{col1}));
@@ -111,13 +100,8 @@ $rv = spi_exec_prepared($plan, {}, $val);
111100
elog(INFO, Dumper($rv->{rows}[0]->{col1}));
112101
$$;
113102
SELECT test3();
114-
INFO: $VAR1 = {
115-
'aa' => 'bb',
116-
'cc' => undef
117-
};
118-
103+
INFO: $VAR1 = {'aa' => 'bb','cc' => undef};
119104
INFO: $VAR1 = '"a"=>"1", "b"=>"boo", "c"=>NULL';
120-
121105
test3
122106
-------
123107

@@ -138,6 +122,7 @@ TRANSFORM FOR TYPE hstore
138122
AS $$
139123
use Data::Dumper;
140124
$Data::Dumper::Sortkeys = 1;
125+
$Data::Dumper::Indent = 0;
141126
elog(INFO, Dumper($_TD->{new}));
142127
if ($_TD->{new}{a} == 1) {
143128
$_TD->{new}{b} = {a => 1, b => 'boo', c => undef};
@@ -147,14 +132,7 @@ return "MODIFY";
147132
$$;
148133
CREATE TRIGGER test4 BEFORE UPDATE ON test1 FOR EACH ROW EXECUTE PROCEDURE test4();
149134
UPDATE test1 SET a = a;
150-
INFO: $VAR1 = {
151-
'a' => '1',
152-
'b' => {
153-
'aa' => 'bb',
154-
'cc' => undef
155-
}
156-
};
157-
135+
INFO: $VAR1 = {'a' => '1','b' => {'aa' => 'bb','cc' => undef}};
158136
SELECT * FROM test1;
159137
a | b
160138
---+---------------------------------

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp