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

Commitb21424b

Browse files
committed
Merge branch 'PGPROEE9_6' into PGPROEE9_6_RDMA
2 parents1dc7b7f +7179eb4 commitb21424b

File tree

516 files changed

+46767
-26015
lines changed

Some content is hidden

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

516 files changed

+46767
-26015
lines changed

‎configure

Lines changed: 259 additions & 45 deletions
Large diffs are not rendered by default.

‎configure.in

Lines changed: 77 additions & 69 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.2], [bugs@postgrespro.ru],[postgrespro])
20+
AC_INIT([PostgreSQL], [9.6.3], [bugs@postgrespro.ru],[postgrespro])
2121
PACKAGE_TARNAME=postgrespro
2222

2323
m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
@@ -1173,75 +1173,83 @@ if test "$with_openssl" = yes ; then
11731173
fi
11741174

11751175
if test "$with_icu" = yes ; then
1176-
AC_SEARCH_LIBS(ucol_open, [icui18n icuin], [], [
1177-
AC_SEARCH_LIBS(ucol_open_57, [icui18n icuin], [], [
1178-
AC_SEARCH_LIBS(ucol_open_56, [icui18n icuin], [], [
1179-
AC_SEARCH_LIBS(ucol_open_55, [icui18n icuin], [], [
1180-
AC_SEARCH_LIBS(ucol_open_54, [icui18n icuin], [], [
1181-
AC_SEARCH_LIBS(ucol_open_53, [icui18n icuin], [], [
1182-
AC_SEARCH_LIBS(ucol_open_52, [icui18n icuin], [], [
1183-
AC_SEARCH_LIBS(ucol_open_50, [icui18n icuin], [], [
1184-
AC_SEARCH_LIBS(ucol_open_48, [icui18n icuin], [], [
1185-
AC_SEARCH_LIBS(ucol_open_46, [icui18n icuin], [], [
1186-
AC_SEARCH_LIBS(ucol_open_44, [icui18n icuin], [], [
1187-
AC_SEARCH_LIBS(ucol_open_43, [icui18n icuin], [], [
1188-
AC_SEARCH_LIBS(ucol_open_4_2, [icui18n icuin], [], [
1189-
AC_SEARCH_LIBS(ucol_open_4_1, [icui18n icuin], [], [
1190-
AC_SEARCH_LIBS(ucol_open_4_0, [icui18n icuin], [], [
1191-
AC_SEARCH_LIBS(ucol_open_3_8, [icui18n icuin], [], [
1192-
AC_SEARCH_LIBS(ucol_open_3_6, [icui18n icuin], [], [
1193-
AC_SEARCH_LIBS(ucol_open_3_4, [icui18n icuin], [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
1194-
])
1195-
])
1196-
])
1197-
])
1198-
])
1199-
])
1200-
])
1201-
])
1202-
])
1203-
])
1204-
])
1205-
])
1206-
])
1207-
])
1208-
])
1209-
])
1176+
AC_SEARCH_LIBS(ucol_open, [icui18n icuin], [], [
1177+
AC_SEARCH_LIBS(ucol_open_58, [icui18n icuin], [], [
1178+
AC_SEARCH_LIBS(ucol_open_57, [icui18n icuin], [], [
1179+
AC_SEARCH_LIBS(ucol_open_56, [icui18n icuin], [], [
1180+
AC_SEARCH_LIBS(ucol_open_55, [icui18n icuin], [], [
1181+
AC_SEARCH_LIBS(ucol_open_54, [icui18n icuin], [], [
1182+
AC_SEARCH_LIBS(ucol_open_53, [icui18n icuin], [], [
1183+
AC_SEARCH_LIBS(ucol_open_52, [icui18n icuin], [], [
1184+
AC_SEARCH_LIBS(ucol_open_52_1, [icui18n icuin], [], [
1185+
AC_SEARCH_LIBS(ucol_open_50, [icui18n icuin], [], [
1186+
AC_SEARCH_LIBS(ucol_open_48, [icui18n icuin], [], [
1187+
AC_SEARCH_LIBS(ucol_open_46, [icui18n icuin], [], [
1188+
AC_SEARCH_LIBS(ucol_open_44, [icui18n icuin], [], [
1189+
AC_SEARCH_LIBS(ucol_open_43, [icui18n icuin], [], [
1190+
AC_SEARCH_LIBS(ucol_open_4_2, [icui18n icuin], [], [
1191+
AC_SEARCH_LIBS(ucol_open_4_1, [icui18n icuin], [], [
1192+
AC_SEARCH_LIBS(ucol_open_4_0, [icui18n icuin], [], [
1193+
AC_SEARCH_LIBS(ucol_open_3_8, [icui18n icuin], [], [
1194+
AC_SEARCH_LIBS(ucol_open_3_6, [icui18n icuin], [], [
1195+
AC_SEARCH_LIBS(ucol_open_3_4, [icui18n icuin], [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
1196+
])
1197+
])
1198+
])
1199+
])
1200+
])
1201+
])
1202+
])
1203+
])
1204+
])
1205+
])
1206+
])
1207+
])
1208+
])
1209+
])
1210+
])
1211+
])
1212+
])
1213+
])
1214+
])
1215+
AC_CHECK_LIB(icuuc, ucnv_fromUChars, [], [
1216+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_58, [], [
1217+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_57, [], [
1218+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_56, [], [
1219+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_55, [], [
1220+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_54, [], [
1221+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_53, [], [
1222+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_52, [], [
1223+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_52_1, [], [
1224+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_50, [], [
1225+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_48, [], [
1226+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_46, [], [
1227+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [
1228+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
1229+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_4_2, [], [
1230+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_4_1, [], [
1231+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_4_0, [], [
1232+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
1233+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
1234+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
1235+
])
1236+
])
1237+
])
1238+
])
1239+
])
1240+
])
1241+
])
1242+
])
1243+
])
1244+
])
1245+
])
1246+
])
1247+
])
1248+
])
1249+
])
1250+
])
1251+
])
12101252
])
1211-
AC_CHECK_LIB(icuuc, ucnv_fromUChars, [], [
1212-
AC_CHECK_LIB(icuuc, ucnv_fromUChars_57, [], [
1213-
AC_CHECK_LIB(icuuc, ucnv_fromUChars_56, [], [
1214-
AC_CHECK_LIB(icuuc, ucnv_fromUChars_55, [], [
1215-
AC_CHECK_LIB(icuuc, ucnv_fromUChars_54, [], [
1216-
AC_CHECK_LIB(icuuc, ucnv_fromUChars_53, [], [
1217-
AC_CHECK_LIB(icuuc, ucnv_fromUChars_52, [], [
1218-
AC_CHECK_LIB(icuuc, ucnv_fromUChars_50, [], [
1219-
AC_CHECK_LIB(icuuc, ucnv_fromUChars_48, [], [
1220-
AC_CHECK_LIB(icuuc, ucnv_fromUChars_46, [], [
1221-
AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [
1222-
AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
1223-
AC_CHECK_LIB(icuuc, ucnv_fromUChars_4_2, [], [
1224-
AC_CHECK_LIB(icuuc, ucnv_fromUChars_4_1, [], [
1225-
AC_CHECK_LIB(icuuc, ucnv_fromUChars_4_0, [], [
1226-
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
1227-
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
1228-
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
1229-
])
1230-
])
1231-
])
1232-
])
1233-
])
1234-
])
1235-
])
1236-
])
1237-
])
1238-
])
1239-
])
1240-
])
1241-
])
1242-
])
1243-
])
1244-
])
12451253
])
12461254
fi
12471255

‎contrib/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ SUBDIRS = \
4040
pg_stat_statements\
4141
pg_transfer\
4242
pg_trgm\
43+
pg_tsparser\
4344
pgcrypto\
4445
pgrowlocks\
4546
pgstattuple\

‎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/citext/expected/citext.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2274,8 +2274,8 @@ SELECT *
22742274
WHERE t.id IS NULL OR m.id IS NULL;
22752275
id | name | id | name
22762276
----+------+----+------
2277-
| | 2 | Two
22782277
2 | two | |
2278+
| | 2 | Two
22792279
(2 rows)
22802280

22812281
REFRESH MATERIALIZED VIEW CONCURRENTLY citext_matview;

‎contrib/citext/expected/citext_1.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2274,8 +2274,8 @@ SELECT *
22742274
WHERE t.id IS NULL OR m.id IS NULL;
22752275
id | name | id | name
22762276
----+------+----+------
2277-
| | 2 | Two
22782277
2 | two | |
2278+
| | 2 | Two
22792279
(2 rows)
22802280

22812281
REFRESH MATERIALIZED VIEW CONCURRENTLY citext_matview;

‎contrib/dblink/dblink.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,11 @@ dblink_connect(PG_FUNCTION_ARGS)
301301
createNewConnection(connname,rconn);
302302
}
303303
else
304+
{
305+
if (pconn->conn)
306+
PQfinish(pconn->conn);
304307
pconn->conn=conn;
308+
}
305309

306310
PG_RETURN_TEXT_P(cstring_to_text("OK"));
307311
}

‎contrib/fasttrun/fasttrun.control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
comment = 'Functions to truncates the temporary table and does not grow pg_class size'
33
default_version = '1.0'
44
module_pathname = '$libdir/fasttrun'
5-
relocatable = true
5+
relocatable = true

‎contrib/fulleq/fulleq.control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
comment = 'Introduce operator == which returns true when operands are equal or both are nulls.'
33
default_version = '1.0'
44
module_pathname = '$libdir/fulleq'
5-
relocatable = true
5+
relocatable = true

‎contrib/ltree/ltxtquery_io.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ gettoken_query(QPRS_STATE *state, int32 *val, int32 *lenval, char **strval, uint
9696
if (*flag)
9797
ereport(ERROR,
9898
(errcode(ERRCODE_SYNTAX_ERROR),
99-
errmsg("modificators syntax error")));
99+
errmsg("modifiers syntax error")));
100100
*lenval+=charlen;
101101
}
102102
elseif (charlen==1&&t_iseq(state->buf,'%'))

0 commit comments

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