Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 6d27cfd

Browse files
committed
Make pg_resetxlog options parsing more standard and prepare messages for
translation.
1 parent 41a8562 commit 6d27cfd

File tree

4 files changed

+247
-202
lines changed

4 files changed

+247
-202
lines changed

contrib/pg_upgrade/pg_upgrade

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# pg_upgrade: update a database without needing a full dump/reload cycle.
44
# CAUTION: Read the manual page before trying to use this!
55

6-
# $Header: /cvsroot/pgsql/contrib/pg_upgrade/Attic/pg_upgrade,v 1.14 2002/07/03 14:38:19 momjian Exp $
6+
# $Header: /cvsroot/pgsql/contrib/pg_upgrade/Attic/pg_upgrade,v 1.15 2002/08/29 22:19:03 petere Exp $
77
#
88
# To migrate this to newer versions of PostgreSQL:
99
# 1) Update the version numbers at the top of the file
@@ -461,7 +461,7 @@ fi
461461

462462
# Set checkpoint location of new database
463463

464-
pg_resetxlog -l "$LOG_ID" "$SEG_ID" "$PGDATA"
464+
pg_resetxlog -l "$LOG_ID","$SEG_ID" "$PGDATA"
465465
if [ "$?" -ne 0 ]
466466
then echo "Unable to set new log file/segment id. Exiting." 1>&2
467467
exit 1

doc/src/sgml/ref/pg_resetxlog.sgml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_resetxlog.sgml,v 1.4 2002/08/17 20:24:51 tgl Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_resetxlog.sgml,v 1.5 2002/08/29 22:19:03 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -21,7 +21,7 @@ PostgreSQL documentation
2121
<arg> -f </arg>
2222
<arg> -n </arg>
2323
<arg> -x <replaceable class="parameter">xid</replaceable> </arg>
24-
<arg> -l <replaceable class="parameter">fileid</replaceable> <replaceable class="parameter">seg</replaceable> </arg>
24+
<arg> -l <replaceable class="parameter">fileid</replaceable>,<replaceable class="parameter">seg</replaceable> </arg>
2525
<arg choice="plain"><replaceable>datadir</replaceable></arg>
2626
</cmdsynopsis>
2727
</refsynopsisdiv>

src/bin/pg_resetxlog/nls.mk

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# $Header: /cvsroot/pgsql/src/bin/pg_resetxlog/nls.mk,v 1.1 2002/08/29 22:19:03 petere Exp $
2+
CATALOG_NAME := pg_resetxlog
3+
AVAIL_LANGUAGES :=
4+
GETTEXT_FILES := pg_resetxlog.c
5+
GETTEXT_TRIGGERS:= _

0 commit comments

Comments
 (0)