Skip to content

[pull] master from postgres:master #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 2, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions contrib/basebackup_to_shell/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ tests += {
'tests': [
't/001_basic.pl',
],
'env': {'GZIP_PROGRAM': gzip.found() ? gzip.path() : '',
'TAR': tar.found() ? tar.path() : '' },
'env': {'GZIP_PROGRAM': gzip.found() ? gzip.full_path() : '',
'TAR': tar.found() ? tar.full_path() : '' },
},
}
2 changes: 1 addition & 1 deletion contrib/dblink/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ tests += {
'sql': [
'dblink',
],
'regress_args': ['--dlpath', meson.build_root() / 'src/test/regress'],
'regress_args': ['--dlpath', meson.project_build_root() / 'src/test/regress'],
},
'tap': {
'tests': [
Expand Down
2 changes: 1 addition & 1 deletion contrib/postgres_fdw/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ tests += {
'postgres_fdw',
'query_cancel',
],
'regress_args': ['--dlpath', meson.build_root() / 'src/test/regress'],
'regress_args': ['--dlpath', meson.project_build_root() / 'src/test/regress'],
},
'tap': {
'tests': [
Expand Down
2 changes: 1 addition & 1 deletion doc/src/sgml/installation.sgml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
</para>

<para>
The minimum required version of <application>Meson</application> is 0.54.
The minimum required version of <application>Meson</application> is 0.57.2.
</para>
</listitem>

Expand Down
6 changes: 3 additions & 3 deletions doc/src/sgml/pgbuffercache.sgml
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@

<para>
This module provides the <function>pg_buffercache_pages()</function>
function (wrapped in the <structname>pg_buffercache</structname> view),
function (wrapped in the <structname>pg_buffercache</structname> view), the
<function>pg_buffercache_numa_pages()</function> function (wrapped in the
<structname>pg_buffercache_numa</structname> view), the
<function>pg_buffercache_summary()</function> function, the
<function>pg_buffercache_usage_counts()</function> function, the
<function>pg_buffercache_evict()</function>, the
<function>pg_buffercache_evict()</function> function, the
<function>pg_buffercache_evict_relation()</function> function and the
<function>pg_buffercache_evict_all()</function> function.
</para>
Expand All @@ -55,7 +55,7 @@
</para>

<para>
The <function>pg_buffercache_numa_pages()</function> provides
The <function>pg_buffercache_numa_pages()</function> function provides
<acronym>NUMA</acronym> node mappings for shared buffer entries. This
information is not part of <function>pg_buffercache_pages()</function>
itself, as it is much slower to retrieve.
Expand Down
Loading