Skip to content

Commit ec67d66

Browse files
funbringerfunbringer
committed
Merge branch 'PGPRO9_5' into dump_stat_extension
2 parents 2c9c13e + f24c625 commit ec67d66

File tree

171 files changed

+37266
-22077
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

+37266
-22077
lines changed

‎COPYRIGHT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PostgreSQL Database Management System
22
(formerly known as Postgres, then as Postgres95)
33

4-
Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
4+
Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
55

66
Portions Copyright (c) 1994, The Regents of the University of California
77

‎GNUmakefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
7676

7777
##########################################################################
7878

79-
distdir = postgresql-$(VERSION)
79+
distdir = postgrespro-$(VERSION)
8080
dummy = =install=
8181
garbage = =* "#"* ."#"* *~* *.orig *.rej core postgresql-*
8282

‎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.69 for PostgresPro 9.5rc1.1.
3+
# Generated by GNU Autoconf 2.69 for PostgresPro 9.5.0.1.
44
#
55
# Report bugs to <pgsql-bugs@postgrespro.com>.
66
#
@@ -582,8 +582,8 @@ MAKEFLAGS=
582582
# Identity of this package.
583583
PACKAGE_NAME='PostgresPro'
584584
PACKAGE_TARNAME='postgrespro'
585-
PACKAGE_VERSION='9.5rc1.1'
586-
PACKAGE_STRING='PostgresPro 9.5rc1.1'
585+
PACKAGE_VERSION='9.5.0.1'
586+
PACKAGE_STRING='PostgresPro 9.5.0.1'
587587
PACKAGE_BUGREPORT='pgsql-bugs@postgrespro.com'
588588
PACKAGE_URL=''
589589

@@ -1395,7 +1395,7 @@ if test "$ac_init_help" = "long"; then
13951395
# Omit some internal or obsolete options to make the list less imposing.
13961396
# This message is too long to be a string in the A/UX 3.1 sh.
13971397
cat <<_ACEOF
1398-
\`configure' configures PostgresPro 9.5rc1.1 to adapt to many kinds of systems.
1398+
\`configure' configures PostgresPro 9.5.0.1 to adapt to many kinds of systems.
13991399
14001400
Usage: $0 [OPTION]... [VAR=VALUE]...
14011401
@@ -1460,7 +1460,7 @@ fi
14601460

14611461
if test -n "$ac_init_help"; then
14621462
case $ac_init_help in
1463-
short | recursive ) echo "Configuration of PostgresPro 9.5rc1.1:";;
1463+
short | recursive ) echo "Configuration of PostgresPro 9.5.0.1:";;
14641464
esac
14651465
cat <<\_ACEOF
14661466
@@ -1610,7 +1610,7 @@ fi
16101610
test -n "$ac_init_help" && exit $ac_status
16111611
if $ac_init_version; then
16121612
cat <<\_ACEOF
1613-
PostgresPro configure 9.5rc1.1
1613+
PostgresPro configure 9.5.0.1
16141614
generated by GNU Autoconf 2.69
16151615
16161616
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2321,7 +2321,7 @@ cat >config.log <<_ACEOF
23212321
This file contains any messages produced by compilers while
23222322
running configure, to aid debugging if configure makes a mistake.
23232323
2324-
It was created by PostgresPro $as_me 9.5rc1.1, which was
2324+
It was created by PostgresPro $as_me 9.5.0.1, which was
23252325
generated by GNU Autoconf 2.69. Invocation command line was
23262326
23272327
$ $0 $@
@@ -11183,7 +11183,7 @@ else
1118311183
We can't simply define LARGE_OFF_T to be 9223372036854775807,
1118411184
since some C++ compilers masquerading as C compilers
1118511185
incorrectly reject 9223372036854775807. */
11186-
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
11186+
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
1118711187
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
1118811188
&& LARGE_OFF_T % 2147483647 == 1)
1118911189
? 1 : -1];
@@ -11229,7 +11229,7 @@ else
1122911229
We can't simply define LARGE_OFF_T to be 9223372036854775807,
1123011230
since some C++ compilers masquerading as C compilers
1123111231
incorrectly reject 9223372036854775807. */
11232-
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
11232+
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
1123311233
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
1123411234
&& LARGE_OFF_T % 2147483647 == 1)
1123511235
? 1 : -1];
@@ -11253,7 +11253,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1125311253
We can't simply define LARGE_OFF_T to be 9223372036854775807,
1125411254
since some C++ compilers masquerading as C compilers
1125511255
incorrectly reject 9223372036854775807. */
11256-
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
11256+
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
1125711257
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
1125811258
&& LARGE_OFF_T % 2147483647 == 1)
1125911259
? 1 : -1];
@@ -11298,7 +11298,7 @@ else
1129811298
We can't simply define LARGE_OFF_T to be 9223372036854775807,
1129911299
since some C++ compilers masquerading as C compilers
1130011300
incorrectly reject 9223372036854775807. */
11301-
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
11301+
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
1130211302
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
1130311303
&& LARGE_OFF_T % 2147483647 == 1)
1130411304
? 1 : -1];
@@ -11322,7 +11322,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1132211322
We can't simply define LARGE_OFF_T to be 9223372036854775807,
1132311323
since some C++ compilers masquerading as C compilers
1132411324
incorrectly reject 9223372036854775807. */
11325-
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
11325+
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
1132611326
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
1132711327
&& LARGE_OFF_T % 2147483647 == 1)
1132811328
? 1 : -1];
@@ -12518,7 +12518,7 @@ if test x"$pgac_cv_var_rl_completion_append_character" = x"yes"; then
1251812518
$as_echo "#define HAVE_RL_COMPLETION_APPEND_CHARACTER 1" >>confdefs.h
1251912519

1252012520
fi
12521-
for ac_func in rl_completion_matches rl_filename_completion_function
12521+
for ac_func in rl_completion_matches rl_filename_completion_function rl_reset_screen_size
1252212522
do :
1252312523
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
1252412524
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -16142,7 +16142,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1614216142
# report actual input values of CONFIG_FILES etc. instead of their
1614316143
# values after options handling.
1614416144
ac_log="
16145-
This file was extended by PostgresPro $as_me 9.5rc1.1, which was
16145+
This file was extended by PostgresPro $as_me 9.5.0.1, which was
1614616146
generated by GNU Autoconf 2.69. Invocation command line was
1614716147
1614816148
CONFIG_FILES = $CONFIG_FILES
@@ -16212,7 +16212,7 @@ _ACEOF
1621216212
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1621316213
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1621416214
ac_cs_version="\\
16215-
PostgresPro config.status 9.5rc1.1
16215+
PostgresPro config.status 9.5.0.1
1621616216
configured by $0, generated by GNU Autoconf 2.69,
1621716217
with options \\"\$ac_cs_config\\"
1621816218

‎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([PostgresPro], [9.5rc1.1], [pgsql-bugs@postgrespro.com])
20+
AC_INIT([PostgresPro], [9.5.0.1], [pgsql-bugs@postgrespro.com])
2121

2222
m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
2323
Untested combinations of 'autoconf' and PostgreSQL versions are not
@@ -1559,7 +1559,7 @@ LIBS="$LIBS_including_readline"
15591559

15601560
if test "$with_readline" = yes; then
15611561
PGAC_VAR_RL_COMPLETION_APPEND_CHARACTER
1562-
AC_CHECK_FUNCS([rl_completion_matches rl_filename_completion_function])
1562+
AC_CHECK_FUNCS([rl_completion_matches rl_filename_completion_function rl_reset_screen_size])
15631563
AC_CHECK_FUNCS([append_history history_truncate_file])
15641564
fi
15651565

‎contrib/pageinspect/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ OBJS = rawpage.o heapfuncs.o btreefuncs.o fsmfuncs.o \
55
brinfuncs.o ginfuncs.o $(WIN32RES)
66

77
EXTENSION = pageinspect
8-
DATA = pageinspect--1.3.sql pageinspect--1.2--1.3.sql \
9-
pageinspect--1.1--1.2.sql pageinspect--1.0--1.1.sql \
10-
pageinspect--unpackaged--1.0.sql
8+
DATA = pageinspect--1.4.sql pageinspect--1.3--1.4.sql \
9+
pageinspect--1.2--1.3.sql pageinspect--1.1--1.2.sql \
10+
pageinspect--1.0--1.1.sql pageinspect--unpackaged--1.0.sql
1111
PGFILEDESC = "pageinspect - functions to inspect contents of database pages"
1212

1313
ifdef USE_PGXS

0 commit comments

Comments
 (0)