Skip to content

Commit 3ff594b

Browse files
danielcodedanielcode
committed
Merge remote-tracking branch 'upstream/master'
2 parents 0c619a6 + ee65565 commit 3ff594b

File tree

528 files changed

+14555
-10512
lines changed

Some content is hidden

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

528 files changed

+14555
-10512
lines changed

‎config/c-library.m4

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ res = _timezone / 60;
1818
[pgac_cv_var_int_timezone=yes],
1919
[pgac_cv_var_int_timezone=no])])
2020
if test x"$pgac_cv_var_int_timezone" = xyes ; then
21-
AC_DEFINE(HAVE_INT_TIMEZONE,, [Define to 1 if you have the global variable 'int timezone'.])
21+
AC_DEFINE(HAVE_INT_TIMEZONE, 1,
22+
[Define to 1 if you have the global variable 'int timezone'.])
2223
fi])# PGAC_VAR_INT_TIMEZONE
2324

2425

@@ -68,7 +69,8 @@ gettimeofday(tp,tzp);],
6869
[pgac_cv_func_gettimeofday_1arg=no],
6970
[pgac_cv_func_gettimeofday_1arg=yes])])
7071
if test x"$pgac_cv_func_gettimeofday_1arg" = xyes ; then
71-
AC_DEFINE(GETTIMEOFDAY_1ARG,, [Define to 1 if gettimeofday() takes only 1 argument.])
72+
AC_DEFINE(GETTIMEOFDAY_1ARG, 1,
73+
[Define to 1 if gettimeofday() takes only 1 argument.])
7274
fi
7375
AH_VERBATIM(GETTIMEOFDAY_1ARG_,
7476
[@%:@ifdef GETTIMEOFDAY_1ARG
@@ -95,7 +97,8 @@ getpwuid_r(uid, space, buf, bufsize, result);],
9597
[pgac_cv_func_getpwuid_r_5arg=yes],
9698
[pgac_cv_func_getpwuid_r_5arg=no])])
9799
if test x"$pgac_cv_func_getpwuid_r_5arg" = xyes ; then
98-
AC_DEFINE(GETPWUID_R_5ARG,, [Define to 1 if getpwuid_r() takes a 5th argument.])
100+
AC_DEFINE(GETPWUID_R_5ARG, 1,
101+
[Define to 1 if getpwuid_r() takes a 5th argument.])
99102
fi
100103
])# PGAC_FUNC_GETPWUID_R_5ARG
101104

@@ -117,7 +120,8 @@ int strerror_r();
117120
[pgac_cv_func_strerror_r_int=yes],
118121
[pgac_cv_func_strerror_r_int=no])])
119122
if test x"$pgac_cv_func_strerror_r_int" = xyes ; then
120-
AC_DEFINE(STRERROR_R_INT,, [Define to 1 if strerror_r() returns a int.])
123+
AC_DEFINE(STRERROR_R_INT, 1,
124+
[Define to 1 if strerror_r() returns a int.])
121125
fi
122126
])# PGAC_FUNC_STRERROR_R_INT
123127

@@ -210,7 +214,8 @@ sigaction(0, &act, &oact);],
210214
[pgac_cv_func_posix_signals=yes],
211215
[pgac_cv_func_posix_signals=no])])
212216
if test x"$pgac_cv_func_posix_signals" = xyes ; then
213-
AC_DEFINE(HAVE_POSIX_SIGNALS,, [Define to 1 if you have the POSIX signal interface.])
217+
AC_DEFINE(HAVE_POSIX_SIGNALS, 1,
218+
[Define to 1 if you have the POSIX signal interface.])
214219
fi
215220
HAVE_POSIX_SIGNALS=$pgac_cv_func_posix_signals
216221
AC_SUBST(HAVE_POSIX_SIGNALS)])# PGAC_FUNC_POSIX_SIGNALS

‎configure

Lines changed: 15 additions & 15 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.63 for PostgreSQL 9.3beta1.
3+
# Generated by GNU Autoconf 2.63 for PostgreSQL 9.4devel.
44
#
55
# Report bugs to <pgsql-bugs@postgresql.org>.
66
#
@@ -598,8 +598,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
598598
# Identity of this package.
599599
PACKAGE_NAME='PostgreSQL'
600600
PACKAGE_TARNAME='postgresql'
601-
PACKAGE_VERSION='9.3beta1'
602-
PACKAGE_STRING='PostgreSQL 9.3beta1'
601+
PACKAGE_VERSION='9.4devel'
602+
PACKAGE_STRING='PostgreSQL 9.4devel'
603603
PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
604604

605605
ac_unique_file="src/backend/access/common/heaptuple.c"
@@ -1412,7 +1412,7 @@ if test "$ac_init_help" = "long"; then
14121412
# Omit some internal or obsolete options to make the list less imposing.
14131413
# This message is too long to be a string in the A/UX 3.1 sh.
14141414
cat <<_ACEOF
1415-
\`configure' configures PostgreSQL 9.3beta1 to adapt to many kinds of systems.
1415+
\`configure' configures PostgreSQL 9.4devel to adapt to many kinds of systems.
14161416

14171417
Usage: $0 [OPTION]... [VAR=VALUE]...
14181418

@@ -1477,7 +1477,7 @@ fi
14771477

14781478
if test -n "$ac_init_help"; then
14791479
case $ac_init_help in
1480-
short | recursive ) echo "Configuration of PostgreSQL 9.3beta1:";;
1480+
short | recursive ) echo "Configuration of PostgreSQL 9.4devel:";;
14811481
esac
14821482
cat <<\_ACEOF
14831483

@@ -1623,7 +1623,7 @@ fi
16231623
test -n "$ac_init_help" && exit $ac_status
16241624
if $ac_init_version; then
16251625
cat <<\_ACEOF
1626-
PostgreSQL configure 9.3beta1
1626+
PostgreSQL configure 9.4devel
16271627
generated by GNU Autoconf 2.63
16281628

16291629
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1639,7 +1639,7 @@ cat >config.log <<_ACEOF
16391639
This file contains any messages produced by compilers while
16401640
running configure, to aid debugging if configure makes a mistake.
16411641

1642-
It was created by PostgreSQL $as_me 9.3beta1, which was
1642+
It was created by PostgreSQL $as_me 9.4devel, which was
16431643
generated by GNU Autoconf 2.63. Invocation command line was
16441644

16451645
$ $0 $@
@@ -19492,7 +19492,7 @@ $as_echo "$pgac_cv_var_int_timezone" >&6; }
1949219492
if test x"$pgac_cv_var_int_timezone" = xyes ; then
1949319493

1949419494
cat >>confdefs.h <<\_ACEOF
19495-
#define HAVE_INT_TIMEZONE /**/
19495+
#define HAVE_INT_TIMEZONE 1
1949619496
_ACEOF
1949719497

1949819498
fi
@@ -19660,7 +19660,7 @@ $as_echo "$pgac_cv_func_gettimeofday_1arg" >&6; }
1966019660
if test x"$pgac_cv_func_gettimeofday_1arg" = xyes ; then
1966119661

1966219662
cat >>confdefs.h <<\_ACEOF
19663-
#define GETTIMEOFDAY_1ARG /**/
19663+
#define GETTIMEOFDAY_1ARG 1
1966419664
_ACEOF
1966519665

1966619666
fi
@@ -20676,7 +20676,7 @@ $as_echo "$pgac_cv_var_PS_STRINGS" >&6; }
2067620676
if test "$pgac_cv_var_PS_STRINGS" = yes ; then
2067720677

2067820678
cat >>confdefs.h <<\_ACEOF
20679-
#define HAVE_PS_STRINGS /**/
20679+
#define HAVE_PS_STRINGS 1
2068020680
_ACEOF
2068120681

2068220682
fi
@@ -23937,7 +23937,7 @@ $as_echo "$pgac_cv_func_getpwuid_r_5arg" >&6; }
2393723937
if test x"$pgac_cv_func_getpwuid_r_5arg" = xyes ; then
2393823938

2393923939
cat >>confdefs.h <<\_ACEOF
23940-
#define GETPWUID_R_5ARG /**/
23940+
#define GETPWUID_R_5ARG 1
2394123941
_ACEOF
2394223942

2394323943
fi
@@ -24000,7 +24000,7 @@ $as_echo "$pgac_cv_func_strerror_r_int" >&6; }
2400024000
if test x"$pgac_cv_func_strerror_r_int" = xyes ; then
2400124001

2400224002
cat >>confdefs.h <<\_ACEOF
24003-
#define STRERROR_R_INT /**/
24003+
#define STRERROR_R_INT 1
2400424004
_ACEOF
2400524005

2400624006
fi
@@ -28638,7 +28638,7 @@ $as_echo "$pgac_cv_func_posix_signals" >&6; }
2863828638
if test x"$pgac_cv_func_posix_signals" = xyes ; then
2863928639

2864028640
cat >>confdefs.h <<\_ACEOF
28641-
#define HAVE_POSIX_SIGNALS /**/
28641+
#define HAVE_POSIX_SIGNALS 1
2864228642
_ACEOF
2864328643

2864428644
fi
@@ -30815,7 +30815,7 @@ exec 6>&1
3081530815
# report actual input values of CONFIG_FILES etc. instead of their
3081630816
# values after options handling.
3081730817
ac_log="
30818-
This file was extended by PostgreSQL $as_me 9.3beta1, which was
30818+
This file was extended by PostgreSQL $as_me 9.4devel, which was
3081930819
generated by GNU Autoconf 2.63. Invocation command line was
3082030820

3082130821
CONFIG_FILES = $CONFIG_FILES
@@ -30882,7 +30882,7 @@ Report bugs to <bug-autoconf@gnu.org>."
3088230882
_ACEOF
3088330883
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3088430884
ac_cs_version="\\
30885-
PostgreSQL config.status 9.3beta1
30885+
PostgreSQL config.status 9.4devel
3088630886
configured by $0, generated by GNU Autoconf 2.63,
3088730887
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
3088830888

‎configure.in

Lines changed: 2 additions & 2 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.3beta1], [pgsql-bugs@postgresql.org])
20+
AC_INIT([PostgreSQL], [9.4devel], [pgsql-bugs@postgresql.org])
2121

2222
m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required.
2323
Untested combinations of 'autoconf' and PostgreSQL versions are not
@@ -1268,7 +1268,7 @@ PS_STRINGS->ps_argvstr = "foo";],
12681268
[pgac_cv_var_PS_STRINGS=yes],
12691269
[pgac_cv_var_PS_STRINGS=no])])
12701270
if test "$pgac_cv_var_PS_STRINGS" = yes ; then
1271-
AC_DEFINE([HAVE_PS_STRINGS], [], [Define to 1 if the PS_STRINGS thing exists.])
1271+
AC_DEFINE([HAVE_PS_STRINGS], 1, [Define to 1 if the PS_STRINGS thing exists.])
12721272
fi
12731273

12741274

‎contrib/btree_gist/btree_bit.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ gbt_bit_xfrm(bytea *leaf)
9797
static GBT_VARKEY *
9898
gbt_bit_l2n(GBT_VARKEY *leaf)
9999
{
100-
101100
GBT_VARKEY *out = leaf;
102101
GBT_VARKEY_R r = gbt_var_key_readable(leaf);
103102
bytea *o;

‎contrib/btree_gist/btree_text.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ gbt_text_compress(PG_FUNCTION_ARGS)
121121
Datum
122122
gbt_bpchar_compress(PG_FUNCTION_ARGS)
123123
{
124-
125124
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
126125
GISTENTRY *retval;
127126

‎contrib/btree_gist/btree_ts.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,6 @@ gbt_ts_union(PG_FUNCTION_ARGS)
382382
Datum
383383
gbt_ts_penalty(PG_FUNCTION_ARGS)
384384
{
385-
386385
tsKEY *origentry = (tsKEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(0))->key);
387386
tsKEY *newentry = (tsKEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
388387
float *result = (float *) PG_GETARG_POINTER(2);

‎contrib/btree_gist/btree_utils_num.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ gbt_num_union(GBT_NUMKEY *out, const GistEntryVector *entryvec, const gbtree_nin
137137
bool
138138
gbt_num_same(const GBT_NUMKEY *a, const GBT_NUMKEY *b, const gbtree_ninfo *tinfo)
139139
{
140-
141140
GBT_NUMKEY_R b1,
142141
b2;
143142

@@ -159,7 +158,6 @@ gbt_num_same(const GBT_NUMKEY *a, const GBT_NUMKEY *b, const gbtree_ninfo *tinfo
159158
void
160159
gbt_num_bin_union(Datum *u, GBT_NUMKEY *e, const gbtree_ninfo *tinfo)
161160
{
162-
163161
GBT_NUMKEY_R rd;
164162

165163
rd.lower = &e[0];

‎contrib/btree_gist/btree_utils_var.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ gbt_var_decompress(PG_FUNCTION_ARGS)
5656
GBT_VARKEY_R
5757
gbt_var_key_readable(const GBT_VARKEY *k)
5858
{
59-
6059
GBT_VARKEY_R r;
6160

6261
r.lower = (bytea *) &(((char *) k)[VARHDRSZ]);
@@ -270,7 +269,6 @@ gbt_var_bin_union(Datum *u, GBT_VARKEY *e, Oid collation,
270269
GISTENTRY *
271270
gbt_var_compress(GISTENTRY *entry, const gbtree_vinfo *tinfo)
272271
{
273-
274272
GISTENTRY *retval;
275273

276274
if (entry->leafkey)
@@ -299,7 +297,6 @@ GBT_VARKEY *
299297
gbt_var_union(const GistEntryVector *entryvec, int32 *size, Oid collation,
300298
const gbtree_vinfo *tinfo)
301299
{
302-
303300
int i = 0,
304301
numranges = entryvec->n;
305302
GBT_VARKEY *cur;

‎contrib/dblink/dblink.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1973,7 +1973,7 @@ dblink_fdw_validator(PG_FUNCTION_ARGS)
19731973
ereport(ERROR,
19741974
(errcode(ERRCODE_FDW_OUT_OF_MEMORY),
19751975
errmsg("out of memory"),
1976-
errdetail("could not get libpq's default connection options")));
1976+
errdetail("could not get libpq's default connection options")));
19771977
}
19781978

19791979
/* Validate each supplied option. */
@@ -1984,9 +1984,9 @@ dblink_fdw_validator(PG_FUNCTION_ARGS)
19841984
if (!is_valid_dblink_option(options, def->defname, context))
19851985
{
19861986
/*
1987-
* Unknown option, or invalid option for the context specified,
1988-
* so complain about it. Provide a hint with list of valid
1989-
* options for the context.
1987+
* Unknown option, or invalid option for the context specified, so
1988+
* complain about it. Provide a hint with list of valid options
1989+
* for the context.
19901990
*/
19911991
StringInfoData buf;
19921992
const PQconninfoOption *opt;

‎contrib/file_fdw/file_fdw.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ static void fileGetOptions(Oid foreigntableid,
140140
char **filename, List **other_options);
141141
static List *get_file_fdw_attribute_options(Oid relid);
142142
static bool check_selective_binary_conversion(RelOptInfo *baserel,
143-
Oid foreigntableid,
144-
List **columns);
143+
Oid foreigntableid,
144+
List **columns);
145145
static void estimate_size(PlannerInfo *root, RelOptInfo *baserel,
146146
FileFdwPlanState *fdw_private);
147147
static void estimate_costs(PlannerInfo *root, RelOptInfo *baserel,
@@ -478,7 +478,7 @@ fileGetForeignPaths(PlannerInfo *root,
478478
&startup_cost, &total_cost);
479479

480480
/*
481-
* Create a ForeignPath node and add it as only possible path. We use the
481+
* Create a ForeignPath node and add it as only possible path. We use the
482482
* fdw_private list of the path to carry the convert_selectively option;
483483
* it will be propagated into the fdw_private list of the Plan node.
484484
*/
@@ -770,7 +770,7 @@ check_selective_binary_conversion(RelOptInfo *baserel,
770770
/* Add all the attributes used by restriction clauses. */
771771
foreach(lc, baserel->baserestrictinfo)
772772
{
773-
RestrictInfo *rinfo = (RestrictInfo *) lfirst(lc);
773+
RestrictInfo *rinfo = (RestrictInfo *) lfirst(lc);
774774

775775
pull_varattnos((Node *) rinfo->clause, baserel->relid,
776776
&attrs_used);

0 commit comments

Comments
 (0)