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.

‎contrib/isn/isn.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ dehyphenate(char *bufO, char *bufI)
160160
* into bufO using the given hyphenation range TABLE.
161161
* Assumes the input string to be used is of only digits.
162162
*
163-
* Returns the number of characters acctually hyphenated.
163+
* Returns the number of characters actually hyphenated.
164164
*/
165165
static unsigned
166166
hyphenate(char *bufO, char *bufI, const char *(*TABLE)[2], const unsigned TABLE_index[10][2])
@@ -748,7 +748,7 @@ string2ean(const char *str, bool errorOK, ean13 *result,
748748
}
749749
else if (*aux2 == '!' && *(aux2 + 1) == '\0')
750750
{
751-
/* the invalid check digit sufix was found, set it */
751+
/* the invalid check digit suffix was found, set it */
752752
if (!magic)
753753
valid = false;
754754
magic = true;

‎contrib/ltree/expected/ltree.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1105,7 +1105,7 @@ SELECT '{a.b.c.d.e,B.df}'::ltree[] ? '{A.b.c.d.e,*.df}';
11051105
t
11061106
(1 row)
11071107

1108-
--exractors
1108+
--extractors
11091109
SELECT ('{3456,1.2.3.34}'::ltree[] ?@> '1.2.3.4') is null;
11101110
?column?
11111111
----------

‎contrib/ltree/ltxtquery_io.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ pushval_asis(QPRS_STATE *state, int type, char *strval, int lenval, uint16 flag)
197197

198198
#define STACKDEPTH 32
199199
/*
200-
* make polish notaion of query
200+
* make polish notation of query
201201
*/
202202
static int32
203203
makepol(QPRS_STATE *state)

‎contrib/ltree/sql/ltree.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ SELECT 'a.b.c.d.e'::ltree ? '{A.b.c.d.e, a.*}';
204204
SELECT '{a.b.c.d.e,B.df}'::ltree[] ? '{A.b.c.d.e}';
205205
SELECT '{a.b.c.d.e,B.df}'::ltree[] ? '{A.b.c.d.e,*.df}';
206206

207-
--exractors
207+
--extractors
208208
SELECT ('{3456,1.2.3.34}'::ltree[] ?@> '1.2.3.4') is null;
209209
SELECT '{3456,1.2.3}'::ltree[] ?@> '1.2.3.4';
210210
SELECT '{3456,1.2.3.4}'::ltree[] ?<@ '1.2.3';

‎contrib/pg_standby/pg_standby.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,7 @@ main(int argc, char **argv)
779779
{
780780
/*
781781
* Once we have restored this file successfully we can remove some
782-
* prior WAL files. If this restore fails we musn't remove any
782+
* prior WAL files. If this restore fails we mustn't remove any
783783
* file because some of them will be requested again immediately
784784
* after the failed restore, or when we restart recovery.
785785
*/

‎contrib/pg_stat_statements/pg_stat_statements.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ typedef struct Counters
138138
{
139139
int64 calls; /* # of times executed */
140140
double total_time; /* total execution time, in msec */
141-
double min_time; /* minimim execution time in msec */
141+
double min_time; /* minimum execution time in msec */
142142
double max_time; /* maximum execution time in msec */
143143
double mean_time; /* mean execution time in msec */
144144
double sum_var_time; /* sum of variances in execution time in msec */

‎contrib/pg_trgm/trgm_op.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ comp_ptrgm(const void *v1, const void *v2)
413413
* ulen1: count of unique trigrams of array "trg1".
414414
* len2: length of array "trg2" and array "trg2indexes".
415415
* len: length of the array "found".
416-
* check_only: if true then only check existaince of similar search pattern in
416+
* check_only: if true then only check existence of similar search pattern in
417417
* text.
418418
*
419419
* Returns word similarity.
@@ -456,7 +456,7 @@ iterate_word_similarity(int *trg2indexes,
456456
lastpos[trgindex] = i;
457457
}
458458

459-
/* Adjust lower bound if this trigram is present in required substing */
459+
/* Adjust lower bound if this trigram is present in required substring */
460460
if (found[trgindex])
461461
{
462462
int prev_lower,
@@ -547,7 +547,7 @@ iterate_word_similarity(int *trg2indexes,
547547
*
548548
* str1: search pattern string, of length slen1 bytes.
549549
* str2: text in which we are looking for a word, of length slen2 bytes.
550-
* check_only: if true then only check existaince of similar search pattern in
550+
* check_only: if true then only check existence of similar search pattern in
551551
* text.
552552
*
553553
* Returns word similarity.

‎contrib/pgcrypto/mbuf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ pullf_read_max(PullFilter *pf, int len, uint8 **data_p, uint8 *tmpbuf)
311311
}
312312

313313
/*
314-
* caller wants exatly len bytes and dont bother with references
314+
* caller wants exactly len bytes and don't bother with references
315315
*/
316316
int
317317
pullf_read_fixed(PullFilter *src, int len, uint8 *dst)

‎contrib/pgcrypto/pgp-mpi-internal.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,16 +139,16 @@ bn_to_mpi(mpz_t *bn)
139139
}
140140

141141
/*
142-
* Decide the number of bits in the random componont k
142+
* Decide the number of bits in the random component k
143143
*
144144
* It should be in the same range as p for signing (which
145145
* is deprecated), but can be much smaller for encrypting.
146146
*
147147
* Until I research it further, I just mimic gpg behaviour.
148148
* It has a special mapping table, for values <= 5120,
149149
* above that it uses 'arbitrary high number'. Following
150-
* algorihm hovers 10-70 bits above gpg values. And for
151-
* larger p, it uses gpg's algorihm.
150+
* algorithm hovers 10-70 bits above gpg values. And for
151+
* larger p, it uses gpg's algorithm.
152152
*
153153
* The point is - if k gets large, encryption will be
154154
* really slow. It does not matter for decryption.

‎contrib/pgcrypto/pgp-mpi-openssl.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,16 @@ bn_to_mpi(BIGNUM *bn)
7474
}
7575

7676
/*
77-
* Decide the number of bits in the random componont k
77+
* Decide the number of bits in the random component k
7878
*
7979
* It should be in the same range as p for signing (which
8080
* is deprecated), but can be much smaller for encrypting.
8181
*
8282
* Until I research it further, I just mimic gpg behaviour.
8383
* It has a special mapping table, for values <= 5120,
8484
* above that it uses 'arbitrary high number'. Following
85-
* algorihm hovers 10-70 bits above gpg values. And for
86-
* larger p, it uses gpg's algorihm.
85+
* algorithm hovers 10-70 bits above gpg values. And for
86+
* larger p, it uses gpg's algorithm.
8787
*
8888
* The point is - if k gets large, encryption will be
8989
* really slow. It does not matter for decryption.

0 commit comments

Comments
 (0)