Skip to content

Commit b039809

Browse files
vbwagnervbwagner
committed
Merge branch 'REL9_5_STABLE' into PGPRO9_5
Fix merge conflict in install-windows sgml
2 parents f38db8a + 4edbb26 commit b039809

40 files changed

+1044
-659
lines changed

‎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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7330,7 +7330,7 @@ else
73307330
echo '%%' > conftest.l
73317331
if $pgac_candidate -t conftest.l 2>/dev/null | grep FLEX_SCANNER >/dev/null 2>&1; then
73327332
pgac_flex_version=`$pgac_candidate --version 2>/dev/null`
7333-
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;}'
7333+
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;}'
73347334
then
73357335
pgac_cv_path_flex=$pgac_candidate
73367336
break 2
@@ -7428,7 +7428,7 @@ if test "$PERL"; then
74287428
{ $as_echo "$as_me:${as_lineno-$LINENO}: using perl $pgac_perl_version" >&5
74297429
$as_echo "$as_me: using perl $pgac_perl_version" >&6;}
74307430
if echo "$pgac_perl_version" | sed 's/[.a-z_]/ /g' | \
7431-
$AWK '{ if ($1 = 5 && $2 >= 8) exit 1; else exit 0;}'
7431+
$AWK '{ if ($1 == 5 && $2 >= 8) exit 1; else exit 0;}'
74327432
then
74337433
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
74347434
*** The installed version of Perl, $PERL, is too old to use with PostgreSQL.

‎contrib/pageinspect/btreefuncs.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ PG_FUNCTION_INFO_V1(bt_page_stats);
4242
#define IS_INDEX(r) ((r)->rd_rel->relkind == RELKIND_INDEX)
4343
#define IS_BTREE(r) ((r)->rd_rel->relam == BTREE_AM_OID)
4444

45-
#define CHECK_PAGE_OFFSET_RANGE(pg, offnum) { \
46-
if ( !(FirstOffsetNumber <= (offnum) && \
47-
(offnum) <= PageGetMaxOffsetNumber(pg)) ) \
48-
elog(ERROR, "page offset number out of range"); }
49-
5045
/* note: BlockNumber is unsigned, hence can't be negative */
5146
#define CHECK_RELATION_BLOCK_RANGE(rel, blkno) { \
5247
if ( RelationGetNumberOfBlocks(rel) <= (BlockNumber) (blkno) ) \

‎contrib/pgstattuple/pgstatindex.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,6 @@ PG_FUNCTION_INFO_V1(pgstatginindex);
5757
#define IS_BTREE(r) ((r)->rd_rel->relam == BTREE_AM_OID)
5858
#define IS_GIN(r) ((r)->rd_rel->relam == GIN_AM_OID)
5959

60-
#define CHECK_PAGE_OFFSET_RANGE(pg, offnum) { \
61-
if ( !(FirstOffsetNumber <= (offnum) && \
62-
(offnum) <= PageGetMaxOffsetNumber(pg)) ) \
63-
elog(ERROR, "page offset number out of range"); }
64-
65-
/* note: BlockNumber is unsigned, hence can't be negative */
66-
#define CHECK_RELATION_BLOCK_RANGE(rel, blkno) { \
67-
if ( RelationGetNumberOfBlocks(rel) <= (BlockNumber) (blkno) ) \
68-
elog(ERROR, "block number out of range"); }
69-
7060
/* ------------------------------------------------
7161
* A structure for a whole btree index statistics
7262
* used by pgstatindex().

0 commit comments

Comments
 (0)