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

Commit0963e9c

Browse files
committed
Merge branch 'PGPRO9_6' into PGPRO9_6_pathman
2 parentsb66eccf +fa4fdbd commit0963e9c

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

‎contrib/pg_query_state/pg_query_state.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ pg_query_state(PG_FUNCTION_ARGS)
477477
FuncCallContext*funcctx;
478478
MemoryContextoldcontext;
479479
pg_qs_fctx*fctx;
480-
constintN_ATTRS=5;
480+
#defineN_ATTRS 5
481481
pid_tpid=PG_GETARG_INT32(0);
482482

483483
if (SRF_IS_FIRSTCALL())

‎doc/src/sgml/pgarman.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,8 +389,7 @@ STATUS=OK
389389
<title>RESTORE OPTIONS</title>
390390
<para>
391391
The parameters whose name start are started with --recovery
392-
refer to the same parameters as the ones in recovery.confin
393-
recovery.conf.
392+
refer to the same parameters as the ones in recovery.conf.
394393
</para>
395394
<literallayout><emphasis role="strong">--recovery-target-timeline</emphasis>=<emphasis>TIMELINE</emphasis>:
396395
Specifies recovering into a particular timeline. If not specified, the current timeline is used.</literallayout>

‎doc/src/sgml/pgpathman.sgml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ set_init_callback(relation REGCLASS, callback REGPROC DEFAULT 0)
395395
</sect2>
396396
<sect2 id="views-and-tables">
397397
<title>Views and tables</title>
398-
<sect3 id="pathman_config-main-config-storage">
398+
<sect3 id="pathman-config-main-config-storage">
399399
<title><literal>pathman_config</literal> --- main config
400400
storage</title>
401401
<programlisting>
@@ -411,7 +411,7 @@ CREATE TABLE IF NOT EXISTS pathman_config (
411411
This table stores a list of partitioned tables.
412412
</para>
413413
</sect3>
414-
<sect3 id="pathman_config_params-optional-parameters">
414+
<sect3 id="pathman-config-params-optional-parameters">
415415
<title><literal>pathman_config_params</literal> --- optional
416416
parameters</title>
417417
<programlisting>
@@ -426,7 +426,7 @@ CREATE TABLE IF NOT EXISTS pathman_config_params (
426426
behavior.
427427
</para>
428428
</sect3>
429-
<sect3 id="pathman_concurrent_part_tasks-currently-running-partitioning-workers">
429+
<sect3 id="pathman-concurrent-part-tasks-currently-running-partitioning-workers">
430430
<title><literal>pathman_concurrent_part_tasks</literal> ---
431431
currently running partitioning workers</title>
432432
<programlisting>
@@ -450,7 +450,7 @@ AS SELECT * FROM show_concurrent_part_tasks();
450450
tasks.
451451
</para>
452452
</sect3>
453-
<sect3 id="pathman_partition_list-list-of-all-existing-partitions">
453+
<sect3 id="pathman-partition-list-list-of-all-existing-partitions">
454454
<title><literal>pathman_partition_list</literal> --- list of all
455455
existing partitions</title>
456456
<programlisting>
@@ -903,7 +903,7 @@ WHERE id = any (SELECT * FROM some_table limit 4);
903903
(3 rows)
904904
</programlisting>
905905
</sect3>
906-
<sect3 id="disabling-pg_pathman">
906+
<sect3 id="disabling-pg-pathman">
907907
<title>Disabling <literal>pg_pathman</literal></title>
908908
<para>
909909
There are several user-accessible

‎doc/src/sgml/release-pro-9.6.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<title>Postgres Pro 9.6.0.1</title>
55
<note>
66
<title>Release Date</title>
7-
<simpara>2016-10-10</simpara>
7+
<simpara>2016-10-12</simpara>
88
</note>
99
<sect2>
1010
<title>Overview</title>
1111
<para>This release is based on <productname>PostgreSQL</productname>
1212
9.6.0</para>
13-
<para>Major enhancements over <productname>PostgresSQL</productname>
13+
<para>Major enhancements over <productname>PostgreSQL</productname>
1414
9.6.0 include:</para>
1515
<para>Core patches from Postgres Pro 9.5 has been applied:</para>
1616
<itemizedlist>

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp