Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit090c832

Browse files
committed
Merge with 9_6_STABLE
2 parents0b8983c +be182d5 commit090c832

File tree

519 files changed

+66363
-23221
lines changed

Some content is hidden

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

519 files changed

+66363
-23221
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-2016, PostgreSQL Global Development Group
4+
Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
55

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

‎configure

Lines changed: 11 additions & 11 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.0.
3+
# Generated by GNU Autoconf 2.69 for PostgreSQL 9.6.2.
44
#
55
# Report bugs to <pgsql-bugs@postgresql.org>.
66
#
@@ -582,8 +582,8 @@ MAKEFLAGS=
582582
# Identity of this package.
583583
PACKAGE_NAME='PostgreSQL'
584584
PACKAGE_TARNAME='postgresql'
585-
PACKAGE_VERSION='9.6.0'
586-
PACKAGE_STRING='PostgreSQL 9.6.0'
585+
PACKAGE_VERSION='9.6.2'
586+
PACKAGE_STRING='PostgreSQL 9.6.2'
587587
PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
588588
PACKAGE_URL=''
589589

@@ -1398,7 +1398,7 @@ if test "$ac_init_help" = "long"; then
13981398
# Omit some internal or obsolete options to make the list less imposing.
13991399
# This message is too long to be a string in the A/UX 3.1 sh.
14001400
cat<<_ACEOF
1401-
\`configure' configures PostgreSQL 9.6.0 to adapt to many kinds of systems.
1401+
\`configure' configures PostgreSQL 9.6.2 to adapt to many kinds of systems.
14021402
14031403
Usage:$0 [OPTION]... [VAR=VALUE]...
14041404
@@ -1463,7 +1463,7 @@ fi
14631463

14641464
iftest -n"$ac_init_help";then
14651465
case$ac_init_helpin
1466-
short | recursive )echo"Configuration of PostgreSQL 9.6.0:";;
1466+
short | recursive )echo"Configuration of PostgreSQL 9.6.2:";;
14671467
esac
14681468
cat<<\_ACEOF
14691469
@@ -1615,7 +1615,7 @@ fi
16151615
test -n "$ac_init_help" && exit $ac_status
16161616
if $ac_init_version; then
16171617
cat <<\_ACEOF
1618-
PostgreSQL configure 9.6.0
1618+
PostgreSQL configure 9.6.2
16191619
generated by GNU Autoconf 2.69
16201620
16211621
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2326,7 +2326,7 @@ cat >config.log <<_ACEOF
23262326
This file contains any messages produced by compilers while
23272327
running configure, to aid debugging if configure makes a mistake.
23282328
2329-
It was created by PostgreSQL$as_me 9.6.0, which was
2329+
It was created by PostgreSQL$as_me 9.6.2, which was
23302330
generated by GNU Autoconf 2.69. Invocation command line was
23312331
23322332
$$0$@
@@ -7094,7 +7094,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
70947094
test -z"$INSTALL_DATA"&& INSTALL_DATA='${INSTALL} -m 644'
70957095

70967096
# When Autoconf chooses install-sh as install program it tries to generate
7097-
# a relative path to it in each makefile where itsubsitutes it. This clashes
7097+
# a relative path to it in each makefile where itsubstitutes it. This clashes
70987098
# with our Makefile.global concept. This workaround helps.
70997099
case$INSTALLin
71007100
*install-sh*) install_bin='';;
@@ -7238,7 +7238,7 @@ fi
72387238
$as_echo"$MKDIR_P">&6; }
72397239

72407240
# When Autoconf chooses install-sh as mkdir -p program it tries to generate
7241-
# a relative path to it in each makefile where itsubsitutes it. This clashes
7241+
# a relative path to it in each makefile where itsubstitutes it. This clashes
72427242
# with our Makefile.global concept. This workaround helps.
72437243
case$MKDIR_Pin
72447244
*install-sh*) MKDIR_P='\${SHELL} \${top_srcdir}/config/install-sh -c -d';;
@@ -16464,7 +16464,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1646416464
# report actual input values of CONFIG_FILES etc. instead of their
1646516465
# values after options handling.
1646616466
ac_log="
16467-
This file was extended by PostgreSQL $as_me 9.6.0, which was
16467+
This file was extended by PostgreSQL $as_me 9.6.2, which was
1646816468
generated by GNU Autoconf 2.69. Invocation command line was
1646916469
1647016470
CONFIG_FILES = $CONFIG_FILES
@@ -16534,7 +16534,7 @@ _ACEOF
1653416534
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1653516535
ac_cs_config="`$as_echo"$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1653616536
ac_cs_version="\\
16537-
PostgreSQL config.status 9.6.0
16537+
PostgreSQL config.status 9.6.2
1653816538
configured by$0, generated by GNU Autoconf 2.69,
1653916539
with options\\"\$ac_cs_config\\"
1654016540

‎configure.in

Lines changed: 3 additions & 3 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.0], [pgsql-bugs@postgresql.org])
20+
AC_INIT([PostgreSQL], [9.6.2], [pgsql-bugs@postgresql.org])
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
@@ -894,7 +894,7 @@ fi
894894

895895
AC_PROG_INSTALL
896896
# When Autoconf chooses install-sh as install program it tries to generate
897-
# a relative path to it in each makefile where itsubsitutes it. This clashes
897+
# a relative path to it in each makefile where itsubstitutes it. This clashes
898898
# with our Makefile.global concept. This workaround helps.
899899
case $INSTALL in
900900
*install-sh*) install_bin='';;
@@ -907,7 +907,7 @@ AC_PROG_LN_S
907907
AC_PROG_AWK
908908
AC_PROG_MKDIR_P
909909
# When Autoconf chooses install-sh as mkdir -p program it tries to generate
910-
# a relative path to it in each makefile where itsubsitutes it. This clashes
910+
# a relative path to it in each makefile where itsubstitutes it. This clashes
911911
# with our Makefile.global concept. This workaround helps.
912912
case $MKDIR_P in
913913
*install-sh*) MKDIR_P='\${SHELL} \${top_srcdir}/config/install-sh -c -d';;

‎contrib/adminpack/adminpack.c

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -136,27 +136,22 @@ pg_file_write(PG_FUNCTION_ARGS)
136136
(ERRCODE_DUPLICATE_FILE,
137137
errmsg("file \"%s\" exists",filename)));
138138

139-
f=fopen(filename,"wb");
139+
f=AllocateFile(filename,"wb");
140140
}
141141
else
142-
f=fopen(filename,"ab");
142+
f=AllocateFile(filename,"ab");
143143

144144
if (!f)
145145
ereport(ERROR,
146146
(errcode_for_file_access(),
147147
errmsg("could not open file \"%s\" for writing: %m",
148148
filename)));
149149

150-
if (VARSIZE(data)!=0)
151-
{
152-
count=fwrite(VARDATA(data),1,VARSIZE(data)-VARHDRSZ,f);
153-
154-
if (count!=VARSIZE(data)-VARHDRSZ)
155-
ereport(ERROR,
156-
(errcode_for_file_access(),
157-
errmsg("could not write file \"%s\": %m",filename)));
158-
}
159-
fclose(f);
150+
count=fwrite(VARDATA(data),1,VARSIZE(data)-VARHDRSZ,f);
151+
if (count!=VARSIZE(data)-VARHDRSZ||FreeFile(f))
152+
ereport(ERROR,
153+
(errcode_for_file_access(),
154+
errmsg("could not write file \"%s\": %m",filename)));
160155

161156
PG_RETURN_INT64(count);
162157
}

‎contrib/bloom/blinsert.c

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,13 +164,18 @@ blbuildempty(Relation index)
164164
metapage= (Page)palloc(BLCKSZ);
165165
BloomFillMetapage(index,metapage);
166166

167-
/* Write the page. If archiving/streaming, XLOG it. */
167+
/*
168+
* Write the page and log it. It might seem that an immediate sync
169+
* would be sufficient to guarantee that the file exists on disk, but
170+
* recovery itself might remove it while replaying, for example, an
171+
* XLOG_DBASE_CREATE or XLOG_TBLSPC_CREATE record. Therefore, we
172+
* need this even when wal_level=minimal.
173+
*/
168174
PageSetChecksumInplace(metapage,BLOOM_METAPAGE_BLKNO);
169175
smgrwrite(index->rd_smgr,INIT_FORKNUM,BLOOM_METAPAGE_BLKNO,
170176
(char*)metapage, true);
171-
if (XLogIsNeeded())
172-
log_newpage(&index->rd_smgr->smgr_rnode.node,INIT_FORKNUM,
173-
BLOOM_METAPAGE_BLKNO,metapage, false);
177+
log_newpage(&index->rd_smgr->smgr_rnode.node,INIT_FORKNUM,
178+
BLOOM_METAPAGE_BLKNO,metapage, false);
174179

175180
/*
176181
* An immediate sync is required even if we xlog'd the page, because the

‎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 LLcoodinate values)
1022+
-- Test of cube_ll_coord function (retrieves LLcoordinate 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 URcoodinate values)
1078+
-- Test of cube_ur_coord function (retrieves URcoordinate 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 LLcoodinate values)
1022+
-- Test of cube_ll_coord function (retrieves LLcoordinate 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 URcoodinate values)
1078+
-- Test of cube_ur_coord function (retrieves URcoordinate 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 LLcoodinate values)
1022+
-- Test of cube_ll_coord function (retrieves LLcoordinate 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 URcoodinate values)
1078+
-- Test of cube_ur_coord function (retrieves URcoordinate 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 LLcoodinate values)
1022+
-- Test of cube_ll_coord function (retrieves LLcoordinate 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 URcoodinate values)
1078+
-- Test of cube_ur_coord function (retrieves URcoordinate 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 LLcoodinate values)
249+
-- Test of cube_ll_coord function (retrieves LLcoordinate 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 URcoodinate values)
261+
-- Test of cube_ur_coord function (retrieves URcoordinate values)
262262
--
263263
SELECT cube_ur_coord('(-1,1),(2,-2)'::cube,1);
264264
SELECT cube_ur_coord('(-1,1),(2,-2)'::cube,2);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp