Skip to content

Commit 2eb1e02

Browse files
dmpgprodmpgpro
committed
Merge branch 'REL9_6_STABLE' into PGPRO9_6
Conflicts: configure configure.in
2 parents 95a797f + f0631bd commit 2eb1e02

File tree

62 files changed

+19683
-16747
lines changed

Some content is hidden

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

62 files changed

+19683
-16747
lines changed

‎configure

Lines changed: 9 additions & 9 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.6rc1.
3+
# Generated by GNU Autoconf 2.69 for PostgreSQL 9.6.0.
44
#
55
# Report bugs to <bugs@postgrespro.ru>.
66
#
@@ -583,8 +583,8 @@ MAKEFLAGS=
583583
# Identity of this package.
584584
PACKAGE_NAME='PostgreSQL'
585585
PACKAGE_TARNAME='postgrespro'
586-
PACKAGE_VERSION='9.6rc1'
587-
PACKAGE_STRING='PostgreSQL 9.6rc1'
586+
PACKAGE_VERSION='9.6.0'
587+
PACKAGE_STRING='PostgreSQL 9.6.0'
588588
PACKAGE_BUGREPORT='bugs@postgrespro.ru'
589589
PACKAGE_URL=''
590590

@@ -1403,7 +1403,7 @@ if test "$ac_init_help" = "long"; then
14031403
# Omit some internal or obsolete options to make the list less imposing.
14041404
# This message is too long to be a string in the A/UX 3.1 sh.
14051405
cat <<_ACEOF
1406-
\`configure' configures PostgreSQL 9.6rc1 to adapt to many kinds of systems.
1406+
\`configure' configures PostgreSQL 9.6.0 to adapt to many kinds of systems.
14071407

14081408
Usage: $0 [OPTION]... [VAR=VALUE]...
14091409

@@ -1468,7 +1468,7 @@ fi
14681468

14691469
if test -n "$ac_init_help"; then
14701470
case $ac_init_help in
1471-
short | recursive ) echo "Configuration of PostgreSQL 9.6rc1:";;
1471+
short | recursive ) echo "Configuration of PostgreSQL 9.6.0:";;
14721472
esac
14731473
cat <<\_ACEOF
14741474

@@ -1621,7 +1621,7 @@ fi
16211621
test -n "$ac_init_help" && exit $ac_status
16221622
if $ac_init_version; then
16231623
cat <<\_ACEOF
1624-
PostgreSQL configure 9.6rc1
1624+
PostgreSQL configure 9.6.0
16251625
generated by GNU Autoconf 2.69
16261626

16271627
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2333,7 +2333,7 @@ cat >config.log <<_ACEOF
23332333
This file contains any messages produced by compilers while
23342334
running configure, to aid debugging if configure makes a mistake.
23352335

2336-
It was created by PostgreSQL $as_me 9.6rc1, which was
2336+
It was created by PostgreSQL $as_me 9.6.0, which was
23372337
generated by GNU Autoconf 2.69. Invocation command line was
23382338

23392339
$ $0 $@
@@ -18358,7 +18358,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1835818358
# report actual input values of CONFIG_FILES etc. instead of their
1835918359
# values after options handling.
1836018360
ac_log="
18361-
This file was extended by PostgreSQL $as_me 9.6rc1, which was
18361+
This file was extended by PostgreSQL $as_me 9.6.0, which was
1836218362
generated by GNU Autoconf 2.69. Invocation command line was
1836318363

1836418364
CONFIG_FILES = $CONFIG_FILES
@@ -18428,7 +18428,7 @@ _ACEOF
1842818428
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1842918429
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1843018430
ac_cs_version="\\
18431-
PostgreSQL config.status 9.6rc1
18431+
PostgreSQL config.status 9.6.0
1843218432
configured by $0, generated by GNU Autoconf 2.69,
1843318433
with options \\"\$ac_cs_config\\"
1843418434

‎configure.in

Lines changed: 1 addition & 1 deletion
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.6rc1], [bugs@postgrespro.ru],[postgrespro])
20+
AC_INIT([PostgreSQL], [9.6.0], [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.

‎doc/bug.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ System Configuration:
2727

2828
Operating System (example: Linux 2.4.18) :
2929

30-
PostgreSQL version (example: PostgreSQL 9.6rc1): PostgreSQL 9.6rc1
30+
PostgreSQL version (example: PostgreSQL 9.6.0): PostgreSQL 9.6.0
3131

3232
Compiler used (example: gcc 3.3.5) :
3333

‎doc/src/sgml/func.sgml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15845,6 +15845,21 @@ SET search_path TO <replaceable>schema</> <optional>, <replaceable>schema</>, ..
1584515845
<entry><type>boolean</type></entry>
1584615846
<entry>does current user have privilege for tablespace</entry>
1584715847
</row>
15848+
<row>
15849+
<entry><literal><function>has_type_privilege</function>(<parameter>user</parameter>,
15850+
<parameter>type</parameter>,
15851+
<parameter>privilege</parameter>)</literal>
15852+
</entry>
15853+
<entry><type>boolean</type></entry>
15854+
<entry>does user have privilege for type</entry>
15855+
</row>
15856+
<row>
15857+
<entry><literal><function>has_type_privilege</function>(<parameter>type</parameter>,
15858+
<parameter>privilege</parameter>)</literal>
15859+
</entry>
15860+
<entry><type>boolean</type></entry>
15861+
<entry>does current user have privilege for type</entry>
15862+
</row>
1584815863
<row>
1584915864
<entry><literal><function>pg_has_role</function>(<parameter>user</parameter>,
1585015865
<parameter>role</parameter>,
@@ -15903,6 +15918,9 @@ SET search_path TO <replaceable>schema</> <optional>, <replaceable>schema</>, ..
1590315918
<indexterm>
1590415919
<primary>has_tablespace_privilege</primary>
1590515920
</indexterm>
15921+
<indexterm>
15922+
<primary>has_type_privilege</primary>
15923+
</indexterm>
1590615924
<indexterm>
1590715925
<primary>pg_has_role</primary>
1590815926
</indexterm>
@@ -16057,6 +16075,18 @@ SELECT has_function_privilege('joeuser', 'myfunc(int, text)', 'execute');
1605716075
<literal>CREATE</literal>.
1605816076
</para>
1605916077

16078+
<para>
16079+
<function>has_type_privilege</function> checks whether a user
16080+
can access a type in a particular way.
16081+
Its argument possibilities
16082+
are analogous to <function>has_table_privilege</function>.
16083+
When specifying a type by a text string rather than by OID,
16084+
the allowed input is the same as for the <type>regtype</> data type
16085+
(see <xref linkend="datatype-oid">).
16086+
The desired access privilege type must evaluate to
16087+
<literal>USAGE</literal>.
16088+
</para>
16089+
1606016090
<para>
1606116091
<function>pg_has_role</function> checks whether a user
1606216092
can access a role in a particular way.

‎src/backend/libpq/auth.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
#include <netinet/in.h>
2121
#include <arpa/inet.h>
2222
#include <unistd.h>
23+
#ifdef HAVE_SYS_SELECT_H
24+
#include <sys/select.h>
25+
#endif
2326

2427
#include "libpq/auth.h"
2528
#include "libpq/crypt.h"

0 commit comments

Comments
 (0)