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

Commit8bd370d

Browse files
committed
Merge branch 'PGPRO9_5' into pathman_pgpro9_5
2 parents018de77 +7951d67 commit8bd370d

File tree

404 files changed

+45100
-20871
lines changed

Some content is hidden

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

404 files changed

+45100
-20871
lines changed

‎GNUmakefile.in‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,11 @@ GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
7575

7676

7777
##########################################################################
78-
78+
ifeq ($PGPRO_VERSION,)
7979
distdir= postgrespro-$(VERSION)
80+
else
81+
distdir= postgrespro-$(PGPRO_VERSION)
82+
endif
8083
dummy= =install=
8184
garbage = =* "#"* ."#"* *~* *.orig *.rej core postgresql-*
8285

@@ -106,6 +109,7 @@ distdir:
106109
$(MAKE) -C $(distdir)/doc/src/sgml/ INSTALL
107110
cp $(distdir)/doc/src/sgml/INSTALL $(distdir)/
108111
$(MAKE) -C $(distdir) distclean
112+
$(MAKE) -C $(distdir)/contrib/pg_arman/doc pg_arman.1 XMLTO=/usr/bin/xmlto ASCIIDOC=/usr/bin/asciidoc
109113
rm -f $(distdir)/README.git
110114

111115
distcheck: dist

‎config/perl.m4‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if test "$PERL"; then
1313
pgac_perl_version=`$PERL -v 2>/dev/null | sed -n['s/This is perl.*v[a-z]*\([0-9]\.[0-9][0-9.]*\).*$/\1/p']`
1414
AC_MSG_NOTICE([using perl $pgac_perl_version])
1515
if echo "$pgac_perl_version" | sed['s/[.a-z_]/ /g'] | \
16-
$AWK '{ if ([$]1 = 5 &&[$]2 >= 8) exit 1; else exit 0;}'
16+
$AWK '{ if ([$]1 == 5 &&[$]2 >= 8) exit 1; else exit 0;}'
1717
then
1818
AC_MSG_WARN([
1919
*** The installed version of Perl, $PERL, is too old to use with PostgreSQL.

‎config/programs.m4‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ else
7777
echo '%%' > conftest.l
7878
if $pgac_candidate -t conftest.l 2>/dev/null | grep FLEX_SCANNER >/dev/null 2>&1; then
7979
pgac_flex_version=`$pgac_candidate --version 2>/dev/null`
80-
if echo "$pgac_flex_version" | sed['s/[.a-z]/ /g'] | $AWK '{ if ([$]1 = 2 && ([$]2 > 5 || ([$]2 = 5 &&[$]3 >= 31))) exit 0; else exit 1;}'
80+
if echo "$pgac_flex_version" | sed['s/[.a-z]/ /g'] | $AWK '{ if ([$]1 == 2 && ([$]2 > 5 || ([$]2== 5 &&[$]3 >= 31))) exit 0; else exit 1;}'
8181
then
8282
pgac_cv_path_flex=$pgac_candidate
8383
break 2

‎configure‎

Lines changed: 45 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 forPostgresPro 9.5.1.3.
3+
# Generated by GNU Autoconf 2.69 forPostgreSQL 9.5.3.
44
#
5-
# Report bugs to <pgsql-bugs@postgrespro.com>.
5+
# Report bugs to <pgsql-bugs@postgresql.org>.
66
#
77
#
88
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -270,7 +270,7 @@ fi
270270
$as_echo"$0: be upgraded to zsh 4.3.4 or later."
271271
else
272272
$as_echo"$0: Please tell bug-autoconf@gnu.org and
273-
$0: pgsql-bugs@postgrespro.com about your system, including
273+
$0: pgsql-bugs@postgresql.org about your system, including
274274
$0: any error possibly output before this message. Then
275275
$0: install a modern shell, or manually run the script
276276
$0: under such a shell if you do have one."
@@ -581,11 +581,11 @@ MFLAGS=
581581
MAKEFLAGS=
582582

583583
# Identity of this package.
584-
PACKAGE_NAME='PostgresPro'
585-
PACKAGE_TARNAME='postgrespro'
586-
PACKAGE_VERSION='9.5.1.3'
587-
PACKAGE_STRING='PostgresPro 9.5.1.3'
588-
PACKAGE_BUGREPORT='pgsql-bugs@postgrespro.com'
584+
PACKAGE_NAME='PostgreSQL'
585+
PACKAGE_TARNAME='postgresql'
586+
PACKAGE_VERSION='9.5.3'
587+
PACKAGE_STRING='PostgreSQL 9.5.3'
588+
PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
589589
PACKAGE_URL=''
590590

591591
ac_unique_file="src/backend/access/common/heaptuple.c"
@@ -627,6 +627,7 @@ ac_includes_default="\
627627
#endif"
628628

629629
ac_subst_vars='LTLIBOBJS
630+
PGPRO_VERSION
630631
vpath_build
631632
PG_VERSION_NUM
632633
PROVE
@@ -754,6 +755,7 @@ build_os
754755
build_vendor
755756
build_cpu
756757
build
758+
PGPRO_PACKAGE_NAME
757759
PG_MAJORVERSION
758760
configure_args
759761
target_alias
@@ -1398,7 +1400,7 @@ if test "$ac_init_help" = "long"; then
13981400
# Omit some internal or obsolete options to make the list less imposing.
13991401
# This message is too long to be a string in the A/UX 3.1 sh.
14001402
cat<<_ACEOF
1401-
\`configure' configuresPostgresPro 9.5.1.3 to adapt to many kinds of systems.
1403+
\`configure' configuresPostgreSQL 9.5.3 to adapt to many kinds of systems.
14021404
14031405
Usage:$0 [OPTION]... [VAR=VALUE]...
14041406
@@ -1446,7 +1448,7 @@ Fine tuning of the installation directories:
14461448
--infodir=DIR info documentation [DATAROOTDIR/info]
14471449
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
14481450
--mandir=DIR man documentation [DATAROOTDIR/man]
1449-
--docdir=DIR documentation root [DATAROOTDIR/doc/postgrespro]
1451+
--docdir=DIR documentation root [DATAROOTDIR/doc/postgresql]
14501452
--htmldir=DIR html documentation [DOCDIR]
14511453
--dvidir=DIR dvi documentation [DOCDIR]
14521454
--pdfdir=DIR pdf documentation [DOCDIR]
@@ -1463,7 +1465,7 @@ fi
14631465

14641466
iftest -n"$ac_init_help";then
14651467
case$ac_init_helpin
1466-
short | recursive )echo"Configuration ofPostgresPro 9.5.1.3:";;
1468+
short | recursive )echo"Configuration ofPostgreSQL 9.5.3:";;
14671469
esac
14681470
cat<<\_ACEOF
14691471
@@ -1551,7 +1553,7 @@ Some influential environment variables:
15511553
Use these variables to override the choices made by`configure' or to help
15521554
it to find libraries and programs with nonstandard names/locations.
15531555
1554-
Report bugs to <pgsql-bugs@postgrespro.com>.
1556+
Report bugs to <pgsql-bugs@postgresql.org>.
15551557
_ACEOF
15561558
ac_status=$?
15571559
fi
@@ -1614,7 +1616,7 @@ fi
16141616
test -n "$ac_init_help" && exit $ac_status
16151617
if $ac_init_version; then
16161618
cat <<\_ACEOF
1617-
PostgresPro configure 9.5.1.3
1619+
PostgreSQL configure 9.5.3
16181620
generated by GNU Autoconf 2.69
16191621
16201622
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1889,9 +1891,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
18891891
$as_echo"$as_me: WARNING:$2: section\"Present But Cannot Be Compiled\"">&2;}
18901892
{$as_echo"$as_me:${as_lineno-$LINENO}: WARNING:$2: proceeding with the compiler's result">&5
18911893
$as_echo"$as_me: WARNING:$2: proceeding with the compiler's result">&2;}
1892-
($as_echo"## ----------------------------------------- ##
1893-
## Report this to pgsql-bugs@postgrespro.com ##
1894-
## ----------------------------------------- ##"
1894+
($as_echo"## ---------------------------------------- ##
1895+
## Report this to pgsql-bugs@postgresql.org ##
1896+
## ---------------------------------------- ##"
18951897
)| sed"s/^/$as_me: WARNING: /">&2
18961898
;;
18971899
esac
@@ -2326,7 +2328,7 @@ cat >config.log <<_ACEOF
23262328
This file contains any messages produced by compilers while
23272329
running configure, to aid debugging if configure makes a mistake.
23282330
2329-
It was created byPostgresPro$as_me 9.5.1.3, which was
2331+
It was created byPostgreSQL$as_me 9.5.3, which was
23302332
generated by GNU Autoconf 2.69. Invocation command line was
23312333
23322334
$$0$@
@@ -2743,11 +2745,26 @@ fi
27432745

27442746

27452747

2748+
PGPRO_VERSION="$PACKAGE_VERSION.2"
2749+
PGPRO_PACKAGE_NAME="PostgresPro"
2750+
2751+
2752+
27462753
cat>>confdefs.h<<_ACEOF
27472754
#define PG_VERSION "$PG_VERSION"
27482755
_ACEOF
27492756

27502757

2758+
cat>>confdefs.h<<_ACEOF
2759+
#define PGPRO_PACKAGE_NAME "$PGPRO_PACKAGE_NAME"
2760+
_ACEOF
2761+
2762+
2763+
cat>>confdefs.h<<_ACEOF
2764+
#define PGPRO_VERSION "$PGPRO_VERSION"
2765+
_ACEOF
2766+
2767+
27512768
# Make sure we can run config.sub.
27522769
$SHELL"$ac_aux_dir/config.sub" sun4>/dev/null2>&1||
27532770
as_fn_error$?"cannot run$SHELL$ac_aux_dir/config.sub""$LINENO" 5
@@ -7313,7 +7330,7 @@ else
73137330
echo'%%'> conftest.l
73147331
if$pgac_candidate -t conftest.l2>/dev/null| grep FLEX_SCANNER>/dev/null2>&1;then
73157332
pgac_flex_version=`$pgac_candidate --version2>/dev/null`
7316-
ifecho"$pgac_flex_version"| sed's/[.a-z]/ /g'|$AWK'{ if ($1 = 2 && ($2 > 5 || ($2 = 5 && $3 >= 31))) exit 0; else exit 1;}'
7333+
ifecho"$pgac_flex_version"| sed's/[.a-z]/ /g'|$AWK'{ if ($1 == 2 && ($2 > 5 || ($2== 5 && $3 >= 31))) exit 0; else exit 1;}'
73177334
then
73187335
pgac_cv_path_flex=$pgac_candidate
73197336
break 2
@@ -7411,7 +7428,7 @@ if test "$PERL"; then
74117428
{$as_echo"$as_me:${as_lineno-$LINENO}: using perl$pgac_perl_version">&5
74127429
$as_echo"$as_me: using perl$pgac_perl_version">&6;}
74137430
ifecho"$pgac_perl_version"| sed's/[.a-z_]/ /g'| \
7414-
$AWK'{ if ($1 = 5 && $2 >= 8) exit 1; else exit 0;}'
7431+
$AWK'{ if ($1 == 5 && $2 >= 8) exit 1; else exit 0;}'
74157432
then
74167433
{$as_echo"$as_me:${as_lineno-$LINENO}: WARNING:
74177434
*** The installed version of Perl,$PERL, is too old to use with PostgreSQL.
@@ -17492,10 +17509,14 @@ fi
1749217509

1749317510

1749417511
cat>>confdefs.h<<_ACEOF
17495-
#define PG_VERSION_STR "PostgresPro$PG_VERSION on$host, compiled by$cc_string,`expr$ac_cv_sizeof_void_p\* 8`-bit"
17512+
#define PG_VERSION_STR "PostgreSQL$PG_VERSION on$host, compiled by$cc_string,`expr$ac_cv_sizeof_void_p\* 8`-bit"
1749617513
_ACEOF
1749717514

1749817515

17516+
cat>>confdefs.h<<_ACEOF
17517+
#define PGPRO_VERSION_STR "$PGPRO_PACKAGE_NAME$PGPRO_VERSION on$host, compiled by$cc_string,`expr$ac_cv_sizeof_void_p\* 8`-bit"
17518+
_ACEOF
17519+
1749917520
# Supply a numeric version string for use by 3rd party add-ons
1750017521
# awk -F is a regex on some platforms, and not on others, so make "." a tab
1750117522
PG_VERSION_NUM="`echo"$PACKAGE_VERSION"| sed's/[A-Za-z].*$//'|
@@ -17540,6 +17561,7 @@ fi
1754017561

1754117562

1754217563

17564+
1754317565
ac_config_files="$ac_config_files GNUmakefile src/Makefile.global"
1754417566

1754517567

@@ -18067,7 +18089,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1806718089
# report actual input values of CONFIG_FILES etc. instead of their
1806818090
# values after options handling.
1806918091
ac_log="
18070-
This file was extended byPostgresPro $as_me 9.5.1.3, which was
18092+
This file was extended byPostgreSQL $as_me 9.5.3, which was
1807118093
generated by GNU Autoconf 2.69. Invocation command line was
1807218094
1807318095
CONFIG_FILES = $CONFIG_FILES
@@ -18131,13 +18153,13 @@ $config_links
1813118153
Configuration commands:
1813218154
$config_commands
1813318155
18134-
Report bugs to<pgsql-bugs@postgrespro.com>."
18156+
Report bugs to<pgsql-bugs@postgresql.org>."
1813518157
1813618158
_ACEOF
1813718159
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1813818160
ac_cs_config="`$as_echo"$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1813918161
ac_cs_version="\\
18140-
PostgresPro config.status 9.5.1.3
18162+
PostgreSQL config.status 9.5.3
1814118163
configured by$0, generated by GNU Autoconf 2.69,
1814218164
with options\\"\$ac_cs_config\\"
1814318165

‎configure.in‎

Lines changed: 13 additions & 3 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([PostgresPro], [9.5.1.3], [pgsql-bugs@postgrespro.com])
20+
AC_INIT([PostgreSQL], [9.5.3], [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
@@ -37,7 +37,14 @@ AC_DEFINE_UNQUOTED(PG_MAJORVERSION, "$PG_MAJORVERSION", [PostgreSQL major versio
3737
PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],
3838
[PG_VERSION="$PACKAGE_VERSION$withval"],
3939
[PG_VERSION="$PACKAGE_VERSION"])
40+
41+
PGPRO_VERSION="$PACKAGE_VERSION.2"
42+
PGPRO_PACKAGE_NAME="PostgresPro"
43+
AC_SUBST(PGPRO_PACKAGE_NAME)
44+
4045
AC_DEFINE_UNQUOTED(PG_VERSION, "$PG_VERSION", [PostgreSQL version as a string])
46+
AC_DEFINE_UNQUOTED(PGPRO_PACKAGE_NAME, "$PGPRO_PACKAGE_NAME", [PostgresPro name as a string])
47+
AC_DEFINE_UNQUOTED(PGPRO_VERSION, "$PGPRO_VERSION", [PostgresPro version as a string])
4148

4249
AC_CANONICAL_HOST
4350

@@ -2205,9 +2212,11 @@ else
22052212
fi
22062213

22072214
AC_DEFINE_UNQUOTED(PG_VERSION_STR,
2208-
["PostgresPro $PG_VERSION on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit"],
2215+
["PostgreSQL $PG_VERSION on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit"],
2216+
[A string containing the version number, platform, and C compiler])
2217+
AC_DEFINE_UNQUOTED(PGPRO_VERSION_STR,
2218+
["$PGPRO_PACKAGE_NAME $PGPRO_VERSION on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit"],
22092219
[A string containing the version number, platform, and C compiler])
2210-
22112220
# Supply a numeric version string for use by 3rd party add-ons
22122221
# awk -F is a regex on some platforms, and not on others, so make "." a tab
22132222
[PG_VERSION_NUM="`echo "$PACKAGE_VERSION" | sed 's/[A-Za-z].*$//' |
@@ -2242,6 +2251,7 @@ else
22422251
fi
22432252
AC_SUBST(vpath_build)
22442253

2254+
AC_SUBST(PGPRO_VERSION)
22452255

22462256
AC_CONFIG_FILES([GNUmakefile src/Makefile.global])
22472257

‎contrib/Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,14 @@ SUBDIRS = \
3434
oid2name\
3535
pageinspect\
3636
passwordcheck\
37+
pg_arman\
3738
pg_buffercache\
3839
pg_freespacemap\
3940
pg_prewarm\
4041
pg_standby\
4142
pg_stat_statements\
4243
pg_trgm\
44+
pg_variables\
4345
pgcrypto\
4446
pgrowlocks\
4547
pgstattuple\

‎contrib/btree_gist/expected/not_equal.out‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ INSERT INTO test_ne SELECT '2009-01-01', 10.7 FROM generate_series(1,1000);
99
INSERT INTO test_ne VALUES('2007-02-03', -91.3);
1010
INSERT INTO test_ne VALUES('2011-09-01', 43.7);
1111
INSERT INTO test_ne SELECT '2009-01-01', 10.7 FROM generate_series(1,1000);
12+
SET enable_indexscan to false;
1213
EXPLAIN (COSTS OFF) SELECT * FROM test_ne WHERE a <> '2009-01-01' AND b <> 10.7;
1314
QUERY PLAN
1415
------------------------------------------------------------------------------------------------------
@@ -25,6 +26,7 @@ SELECT * FROM test_ne WHERE a <> '2009-01-01' AND b <> 10.7;
2526
Thu Sep 01 00:00:00 2011 | 43.7
2627
(2 rows)
2728

29+
RESET enable_indexscan;
2830
-- test search for "not equals" using an exclusion constraint
2931
CREATE TABLE zoo (
3032
cage INTEGER,

‎contrib/btree_gist/sql/not_equal.sql‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,14 @@ INSERT INTO test_ne VALUES('2007-02-03', -91.3);
1414
INSERT INTO test_neVALUES('2011-09-01',43.7);
1515
INSERT INTO test_neSELECT'2009-01-01',10.7FROM generate_series(1,1000);
1616

17+
SET enable_indexscan to false;
18+
1719
EXPLAIN (COSTS OFF)SELECT*FROM test_neWHERE a<>'2009-01-01'AND b<>10.7;
1820

1921
SELECT*FROM test_neWHERE a<>'2009-01-01'AND b<>10.7;
2022

23+
RESET enable_indexscan;
24+
2125
-- test search for "not equals" using an exclusion constraint
2226

2327
CREATETABLEzoo (

0 commit comments

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