Skip to content

Commit 8ca9462

Browse files
vbwagnervbwagner
committed
Merge branch 'REL9_6_STABLE' into PGPRO9_6
Merge 9.6.2 stamp
2 parents e6ea61b + 6a18e4b commit 8ca9462

File tree

171 files changed

+44385
-15680
lines changed

Some content is hidden

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

171 files changed

+44385
-15680
lines changed

‎configure

Lines changed: 12 additions & 12 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.1.
3+
# Generated by GNU Autoconf 2.69 for PostgreSQL 9.6.2.
44
#
55
# Report bugs to <bugs@postgrespro.ru>.
66
#
@@ -583,8 +583,8 @@ MAKEFLAGS=
583583
# Identity of this package.
584584
PACKAGE_NAME='PostgreSQL'
585585
PACKAGE_TARNAME='postgrespro'
586-
PACKAGE_VERSION='9.6.1'
587-
PACKAGE_STRING='PostgreSQL 9.6.1'
586+
PACKAGE_VERSION='9.6.2'
587+
PACKAGE_STRING='PostgreSQL 9.6.2'
588588
PACKAGE_BUGREPORT='bugs@postgrespro.ru'
589589
PACKAGE_URL=''
590590

@@ -1404,7 +1404,7 @@ if test "$ac_init_help" = "long"; then
14041404
# Omit some internal or obsolete options to make the list less imposing.
14051405
# This message is too long to be a string in the A/UX 3.1 sh.
14061406
cat <<_ACEOF
1407-
\`configure' configures PostgreSQL 9.6.1 to adapt to many kinds of systems.
1407+
\`configure' configures PostgreSQL 9.6.2 to adapt to many kinds of systems.
14081408

14091409
Usage: $0 [OPTION]... [VAR=VALUE]...
14101410

@@ -1469,7 +1469,7 @@ fi
14691469

14701470
if test -n "$ac_init_help"; then
14711471
case $ac_init_help in
1472-
short | recursive ) echo "Configuration of PostgreSQL 9.6.1:";;
1472+
short | recursive ) echo "Configuration of PostgreSQL 9.6.2:";;
14731473
esac
14741474
cat <<\_ACEOF
14751475

@@ -1622,7 +1622,7 @@ fi
16221622
test -n "$ac_init_help" && exit $ac_status
16231623
if $ac_init_version; then
16241624
cat <<\_ACEOF
1625-
PostgreSQL configure 9.6.1
1625+
PostgreSQL configure 9.6.2
16261626
generated by GNU Autoconf 2.69
16271627

16281628
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2334,7 +2334,7 @@ cat >config.log <<_ACEOF
23342334
This file contains any messages produced by compilers while
23352335
running configure, to aid debugging if configure makes a mistake.
23362336

2337-
It was created by PostgreSQL $as_me 9.6.1, which was
2337+
It was created by PostgreSQL $as_me 9.6.2, which was
23382338
generated by GNU Autoconf 2.69. Invocation command line was
23392339

23402340
$ $0 $@
@@ -2751,7 +2751,7 @@ else
27512751
fi
27522752

27532753

2754-
PGPRO_VERSION="$PACKAGE_VERSION.3"
2754+
PGPRO_VERSION="$PACKAGE_VERSION.1"
27552755
PGPRO_PACKAGE_NAME="PostgresPro"
27562756
PGPRO_EDITION="standard"
27572757

@@ -7159,7 +7159,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
71597159
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
71607160

71617161
# When Autoconf chooses install-sh as install program it tries to generate
7162-
# a relative path to it in each makefile where it subsitutes it. This clashes
7162+
# a relative path to it in each makefile where it substitutes it. This clashes
71637163
# with our Makefile.global concept. This workaround helps.
71647164
case $INSTALL in
71657165
*install-sh*) install_bin='';;
@@ -7303,7 +7303,7 @@ fi
73037303
$as_echo "$MKDIR_P" >&6; }
73047304

73057305
# When Autoconf chooses install-sh as mkdir -p program it tries to generate
7306-
# a relative path to it in each makefile where it subsitutes it. This clashes
7306+
# a relative path to it in each makefile where it substitutes it. This clashes
73077307
# with our Makefile.global concept. This workaround helps.
73087308
case $MKDIR_P in
73097309
*install-sh*) MKDIR_P='\${SHELL} \${top_srcdir}/config/install-sh -c -d';;
@@ -18473,7 +18473,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1847318473
# report actual input values of CONFIG_FILES etc. instead of their
1847418474
# values after options handling.
1847518475
ac_log="
18476-
This file was extended by PostgreSQL $as_me 9.6.1, which was
18476+
This file was extended by PostgreSQL $as_me 9.6.2, which was
1847718477
generated by GNU Autoconf 2.69. Invocation command line was
1847818478

1847918479
CONFIG_FILES = $CONFIG_FILES
@@ -18543,7 +18543,7 @@ _ACEOF
1854318543
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1854418544
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1854518545
ac_cs_version="\\
18546-
PostgreSQL config.status 9.6.1
18546+
PostgreSQL config.status 9.6.2
1854718547
configured by $0, generated by GNU Autoconf 2.69,
1854818548
with options \\"\$ac_cs_config\\"
1854918549

‎configure.in

Lines changed: 4 additions & 4 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.1], [bugs@postgrespro.ru],[postgrespro])
20+
AC_INIT([PostgreSQL], [9.6.2], [bugs@postgrespro.ru],[postgrespro])
2121
PACKAGE_TARNAME=postgrespro
2222

2323
m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
@@ -38,7 +38,7 @@ AC_DEFINE_UNQUOTED(PG_MAJORVERSION, "$PG_MAJORVERSION", [PostgreSQL major versio
3838
PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],
3939
[PG_VERSION="$PACKAGE_VERSION$withval"],
4040
[PG_VERSION="$PACKAGE_VERSION"])
41-
PGPRO_VERSION="$PACKAGE_VERSION.3"
41+
PGPRO_VERSION="$PACKAGE_VERSION.1"
4242
PGPRO_PACKAGE_NAME="PostgresPro"
4343
PGPRO_EDITION="standard"
4444
AC_SUBST(PGPRO_PACKAGE_NAME)
@@ -914,7 +914,7 @@ fi
914914

915915
AC_PROG_INSTALL
916916
# When Autoconf chooses install-sh as install program it tries to generate
917-
# a relative path to it in each makefile where it subsitutes it. This clashes
917+
# a relative path to it in each makefile where it substitutes it. This clashes
918918
# with our Makefile.global concept. This workaround helps.
919919
case $INSTALL in
920920
*install-sh*) install_bin='';;
@@ -927,7 +927,7 @@ AC_PROG_LN_S
927927
AC_PROG_AWK
928928
AC_PROG_MKDIR_P
929929
# When Autoconf chooses install-sh as mkdir -p program it tries to generate
930-
# a relative path to it in each makefile where it subsitutes it. This clashes
930+
# a relative path to it in each makefile where it substitutes it. This clashes
931931
# with our Makefile.global concept. This workaround helps.
932932
case $MKDIR_P in
933933
*install-sh*) MKDIR_P='\${SHELL} \${top_srcdir}/config/install-sh -c -d';;

‎contrib/bloom/blvacuum.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ blbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats,
5151
initBloomState(&state, index);
5252

5353
/*
54-
* Interate over the pages. We don't care about concurrently added pages,
54+
* Iterate over the pages. We don't care about concurrently added pages,
5555
* they can't contain tuples to delete.
5656
*/
5757
npages = RelationGetNumberOfBlocks(index);

‎contrib/cube/expected/cube.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,7 @@ SELECT cube_dim('(4,8,15,16,23),(4,8,15,16,23)'::cube);
10191019
5
10201020
(1 row)
10211021

1022-
-- Test of cube_ll_coord function (retrieves LL coodinate values)
1022+
-- Test of cube_ll_coord function (retrieves LL coordinate values)
10231023
--
10241024
SELECT cube_ll_coord('(-1,1),(2,-2)'::cube, 1);
10251025
cube_ll_coord
@@ -1075,7 +1075,7 @@ SELECT cube_ll_coord('(42,137)'::cube, 3);
10751075
0
10761076
(1 row)
10771077

1078-
-- Test of cube_ur_coord function (retrieves UR coodinate values)
1078+
-- Test of cube_ur_coord function (retrieves UR coordinate values)
10791079
--
10801080
SELECT cube_ur_coord('(-1,1),(2,-2)'::cube, 1);
10811081
cube_ur_coord

‎contrib/cube/expected/cube_1.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,7 @@ SELECT cube_dim('(4,8,15,16,23),(4,8,15,16,23)'::cube);
10191019
5
10201020
(1 row)
10211021

1022-
-- Test of cube_ll_coord function (retrieves LL coodinate values)
1022+
-- Test of cube_ll_coord function (retrieves LL coordinate values)
10231023
--
10241024
SELECT cube_ll_coord('(-1,1),(2,-2)'::cube, 1);
10251025
cube_ll_coord
@@ -1075,7 +1075,7 @@ SELECT cube_ll_coord('(42,137)'::cube, 3);
10751075
0
10761076
(1 row)
10771077

1078-
-- Test of cube_ur_coord function (retrieves UR coodinate values)
1078+
-- Test of cube_ur_coord function (retrieves UR coordinate values)
10791079
--
10801080
SELECT cube_ur_coord('(-1,1),(2,-2)'::cube, 1);
10811081
cube_ur_coord

‎contrib/cube/expected/cube_2.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,7 @@ SELECT cube_dim('(4,8,15,16,23),(4,8,15,16,23)'::cube);
10191019
5
10201020
(1 row)
10211021

1022-
-- Test of cube_ll_coord function (retrieves LL coodinate values)
1022+
-- Test of cube_ll_coord function (retrieves LL coordinate values)
10231023
--
10241024
SELECT cube_ll_coord('(-1,1),(2,-2)'::cube, 1);
10251025
cube_ll_coord
@@ -1075,7 +1075,7 @@ SELECT cube_ll_coord('(42,137)'::cube, 3);
10751075
0
10761076
(1 row)
10771077

1078-
-- Test of cube_ur_coord function (retrieves UR coodinate values)
1078+
-- Test of cube_ur_coord function (retrieves UR coordinate values)
10791079
--
10801080
SELECT cube_ur_coord('(-1,1),(2,-2)'::cube, 1);
10811081
cube_ur_coord

‎contrib/cube/expected/cube_3.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,7 @@ SELECT cube_dim('(4,8,15,16,23),(4,8,15,16,23)'::cube);
10191019
5
10201020
(1 row)
10211021

1022-
-- Test of cube_ll_coord function (retrieves LL coodinate values)
1022+
-- Test of cube_ll_coord function (retrieves LL coordinate values)
10231023
--
10241024
SELECT cube_ll_coord('(-1,1),(2,-2)'::cube, 1);
10251025
cube_ll_coord
@@ -1075,7 +1075,7 @@ SELECT cube_ll_coord('(42,137)'::cube, 3);
10751075
0
10761076
(1 row)
10771077

1078-
-- Test of cube_ur_coord function (retrieves UR coodinate values)
1078+
-- Test of cube_ur_coord function (retrieves UR coordinate values)
10791079
--
10801080
SELECT cube_ur_coord('(-1,1),(2,-2)'::cube, 1);
10811081
cube_ur_coord

‎contrib/cube/sql/cube.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ SELECT cube_dim('(0,0,0)'::cube);
246246
SELECT cube_dim('(42,42,42),(42,42,42)'::cube);
247247
SELECT cube_dim('(4,8,15,16,23),(4,8,15,16,23)'::cube);
248248

249-
-- Test of cube_ll_coord function (retrieves LL coodinate values)
249+
-- Test of cube_ll_coord function (retrieves LL coordinate values)
250250
--
251251
SELECT cube_ll_coord('(-1,1),(2,-2)'::cube, 1);
252252
SELECT cube_ll_coord('(-1,1),(2,-2)'::cube, 2);
@@ -258,7 +258,7 @@ SELECT cube_ll_coord('(42,137)'::cube, 1);
258258
SELECT cube_ll_coord('(42,137)'::cube, 2);
259259
SELECT cube_ll_coord('(42,137)'::cube, 3);
260260

261-
-- Test of cube_ur_coord function (retrieves UR coodinate values)
261+
-- Test of cube_ur_coord function (retrieves UR coordinate values)
262262
--
263263
SELECT cube_ur_coord('(-1,1),(2,-2)'::cube, 1);
264264
SELECT cube_ur_coord('(-1,1),(2,-2)'::cube, 2);

‎contrib/earthdistance/earthdistance--1.1.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ CREATE FUNCTION earth() RETURNS float8
1111
LANGUAGE SQL IMMUTABLE PARALLEL SAFE
1212
AS 'SELECT ''6378168''::float8';
1313

14-
-- Astromers may want to change the earth function so that distances will be
14+
-- Astronomers may want to change the earth function so that distances will be
1515
-- returned in degrees. To do this comment out the above definition and
1616
-- uncomment the one below. Note that doing this will break the regression
1717
-- tests.

‎contrib/isn/ISSN.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* Product 9 + 21 + 7 + 3 + 1 + 12 + 4 + 24 + 7 + 15 + 0 + 0 = 103
2424
* 103 / 10 = 10 remainder 3
2525
* Check digit 10 - 3 = 7
26-
* => 977-1144875-00-7 ?? <- suplemental number (number of the week, month, etc.)
26+
* => 977-1144875-00-7 ?? <- supplemental number (number of the week, month, etc.)
2727
* ^^ 00 for non-daily publications (01=Monday, 02=Tuesday, ...)
2828
*
2929
* The hyphenation is always in after the four digits of the ISSN code.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy