Skip to content

Commit 2972a66

Browse files
kelvichkelvich
committed
Merge branch 'pgmaster' into logical_twophase
2 parents 2f82e00 + 64ee636 commit 2972a66

File tree

440 files changed

+12357
-4120
lines changed

Some content is hidden

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

440 files changed

+12357
-4120
lines changed

‎configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7088,7 +7088,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
70887088
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
70897089

70907090
# When Autoconf chooses install-sh as install program it tries to generate
7091-
# a relative path to it in each makefile where it subsitutes it. This clashes
7091+
# a relative path to it in each makefile where it substitutes it. This clashes
70927092
# with our Makefile.global concept. This workaround helps.
70937093
case $INSTALL in
70947094
*install-sh*) install_bin='';;
@@ -7232,7 +7232,7 @@ fi
72327232
$as_echo "$MKDIR_P" >&6; }
72337233

72347234
# When Autoconf chooses install-sh as mkdir -p program it tries to generate
7235-
# a relative path to it in each makefile where it subsitutes it. This clashes
7235+
# a relative path to it in each makefile where it substitutes it. This clashes
72367236
# with our Makefile.global concept. This workaround helps.
72377237
case $MKDIR_P in
72387238
*install-sh*) MKDIR_P='\${SHELL} \${top_srcdir}/config/install-sh -c -d';;

‎configure.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,7 @@ fi
887887

888888
AC_PROG_INSTALL
889889
# When Autoconf chooses install-sh as install program it tries to generate
890-
# a relative path to it in each makefile where it subsitutes it. This clashes
890+
# a relative path to it in each makefile where it substitutes it. This clashes
891891
# with our Makefile.global concept. This workaround helps.
892892
case $INSTALL in
893893
*install-sh*) install_bin='';;
@@ -900,7 +900,7 @@ AC_PROG_LN_S
900900
AC_PROG_AWK
901901
AC_PROG_MKDIR_P
902902
# When Autoconf chooses install-sh as mkdir -p program it tries to generate
903-
# a relative path to it in each makefile where it subsitutes it. This clashes
903+
# a relative path to it in each makefile where it substitutes it. This clashes
904904
# with our Makefile.global concept. This workaround helps.
905905
case $MKDIR_P in
906906
*install-sh*) MKDIR_P='\${SHELL} \${top_srcdir}/config/install-sh -c -d';;

‎contrib/bloom/blutils.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,9 @@ blhandler(PG_FUNCTION_ARGS)
138138
amroutine->amendscan = blendscan;
139139
amroutine->ammarkpos = NULL;
140140
amroutine->amrestrpos = NULL;
141+
amroutine->amestimateparallelscan = NULL;
142+
amroutine->aminitparallelscan = NULL;
143+
amroutine->amparallelrescan = NULL;
141144

142145
PG_RETURN_POINTER(amroutine);
143146
}

‎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
@@ -1056,7 +1056,7 @@ SELECT cube_dim('(4,8,15,16,23),(4,8,15,16,23)'::cube);
10561056
5
10571057
(1 row)
10581058

1059-
-- Test of cube_ll_coord function (retrieves LL coodinate values)
1059+
-- Test of cube_ll_coord function (retrieves LL coordinate values)
10601060
--
10611061
SELECT cube_ll_coord('(-1,1),(2,-2)'::cube, 1);
10621062
cube_ll_coord
@@ -1112,7 +1112,7 @@ SELECT cube_ll_coord('(42,137)'::cube, 3);
11121112
0
11131113
(1 row)
11141114

1115-
-- Test of cube_ur_coord function (retrieves UR coodinate values)
1115+
-- Test of cube_ur_coord function (retrieves UR coordinate values)
11161116
--
11171117
SELECT cube_ur_coord('(-1,1),(2,-2)'::cube, 1);
11181118
cube_ur_coord

‎contrib/cube/expected/cube_2.out

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

1059-
-- Test of cube_ll_coord function (retrieves LL coodinate values)
1059+
-- Test of cube_ll_coord function (retrieves LL coordinate values)
10601060
--
10611061
SELECT cube_ll_coord('(-1,1),(2,-2)'::cube, 1);
10621062
cube_ll_coord
@@ -1112,7 +1112,7 @@ SELECT cube_ll_coord('(42,137)'::cube, 3);
11121112
0
11131113
(1 row)
11141114

1115-
-- Test of cube_ur_coord function (retrieves UR coodinate values)
1115+
-- Test of cube_ur_coord function (retrieves UR coordinate values)
11161116
--
11171117
SELECT cube_ur_coord('(-1,1),(2,-2)'::cube, 1);
11181118
cube_ur_coord

‎contrib/cube/sql/cube.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ SELECT cube_dim('(0,0,0)'::cube);
256256
SELECT cube_dim('(42,42,42),(42,42,42)'::cube);
257257
SELECT cube_dim('(4,8,15,16,23),(4,8,15,16,23)'::cube);
258258

259-
-- Test of cube_ll_coord function (retrieves LL coodinate values)
259+
-- Test of cube_ll_coord function (retrieves LL coordinate values)
260260
--
261261
SELECT cube_ll_coord('(-1,1),(2,-2)'::cube, 1);
262262
SELECT cube_ll_coord('(-1,1),(2,-2)'::cube, 2);
@@ -268,7 +268,7 @@ SELECT cube_ll_coord('(42,137)'::cube, 1);
268268
SELECT cube_ll_coord('(42,137)'::cube, 2);
269269
SELECT cube_ll_coord('(42,137)'::cube, 3);
270270

271-
-- Test of cube_ur_coord function (retrieves UR coodinate values)
271+
-- Test of cube_ur_coord function (retrieves UR coordinate values)
272272
--
273273
SELECT cube_ur_coord('(-1,1),(2,-2)'::cube, 1);
274274
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/hstore_plperl/Makefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ include $(top_srcdir)/contrib/contrib-global.mk
2424
endif
2525

2626
# We must link libperl explicitly
27-
ifeq ($(PORTNAME), aix)
28-
rpathdir = $(pkglibdir):$(perl_archlibexp)/CORE
29-
SHLIB_LINK += $(perl_embed_ldflags)
30-
else
3127
ifeq ($(PORTNAME), win32)
3228
# these settings are the same as for plperl
3329
override CPPFLAGS += -DPLPERL_HAVE_UID_GID -Wno-comment
@@ -37,7 +33,6 @@ else
3733
rpathdir = $(perl_archlibexp)/CORE
3834
SHLIB_LINK += $(perl_embed_ldflags)
3935
endif
40-
endif
4136

4237
# As with plperl we need to make sure that the CORE directory is included
4338
# last, probably because it sometimes contains some header files with names

‎contrib/hstore_plpython/Makefile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,12 @@ include $(top_srcdir)/contrib/contrib-global.mk
2424
endif
2525

2626
# We must link libpython explicitly
27-
ifeq ($(PORTNAME), aix)
28-
rpathdir = $(pkglibdir):$(python_libdir)
29-
SHLIB_LINK += $(python_libspec) $(python_additional_libs)
30-
else
3127
ifeq ($(PORTNAME), win32)
3228
# ... see silliness in plpython Makefile ...
3329
SHLIB_LINK += $(sort $(wildcard ../../src/pl/plpython/libpython*.a))
3430
else
3531
rpathdir = $(python_libdir)
36-
SHLIB_LINK += $(python_libspec)
37-
endif
32+
SHLIB_LINK += $(python_libspec) $(python_additional_libs)
3833
endif
3934

4035
REGRESS_OPTS += --load-extension=hstore

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