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

Commit0ed3c76

Browse files
committed
Small message clarifications
1 parenta23db90 commit0ed3c76

File tree

5 files changed

+13
-12
lines changed

5 files changed

+13
-12
lines changed

‎src/backend/access/transam/xlog.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.175 2004/10/29 00:16:08 tgl Exp $
10+
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.176 2004/11/05 17:10:56 petere Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1660,7 +1660,7 @@ XLogFileCopy(uint32 log, uint32 seg,
16601660
errmsg("could not read file \"%s\": %m",path)));
16611661
else
16621662
ereport(PANIC,
1663-
(errmsg("insufficient data in file \"%s\"",path)));
1663+
(errmsg("not enough data in file \"%s\"",path)));
16641664
}
16651665
errno=0;
16661666
if ((int)write(fd,buffer,sizeof(buffer))!= (int)sizeof(buffer))
@@ -2049,7 +2049,7 @@ RestoreArchivedFile(char *path, const char *xlogfname,
20492049
* program incorrectly. We have to assume the former.
20502050
*/
20512051
ereport(DEBUG1,
2052-
(errmsg("could not restore \"%s\" from archive: return code %d",
2052+
(errmsg("could not restorefile\"%s\" from archive: return code %d",
20532053
xlogfname,rc)));
20542054

20552055
/*

‎src/backend/commands/tablespace.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
*
4646
*
4747
* IDENTIFICATION
48-
* $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.12 2004/10/17 20:47:20 tgl Exp $
48+
* $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.13 2004/11/05 17:11:05 petere Exp $
4949
*
5050
*-------------------------------------------------------------------------
5151
*/
@@ -589,7 +589,7 @@ remove_tablespace_directories(Oid tablespaceoid, bool redo)
589589
if (errno!=ENOENT)
590590
ereport(ERROR,
591591
(errcode_for_file_access(),
592-
errmsg("could notunlink file \"%s\": %m",
592+
errmsg("could notremove file \"%s\": %m",
593593
subfile)));
594594
}
595595

@@ -614,7 +614,7 @@ remove_tablespace_directories(Oid tablespaceoid, bool redo)
614614
if (unlink(location)<0)
615615
ereport(ERROR,
616616
(errcode_for_file_access(),
617-
errmsg("could notunlink symbolic link \"%s\": %m",
617+
errmsg("could notremove symbolic link \"%s\": %m",
618618
location)));
619619
}
620620

‎src/backend/main/main.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*
1414
*
1515
* IDENTIFICATION
16-
* $PostgreSQL: pgsql/src/backend/main/main.c,v 1.91 2004/10/12 21:54:38 petere Exp $
16+
* $PostgreSQL: pgsql/src/backend/main/main.c,v 1.92 2004/11/05 17:11:17 petere Exp $
1717
*
1818
*-------------------------------------------------------------------------
1919
*/
@@ -243,7 +243,8 @@ main(int argc, char *argv[])
243243
#else/* WIN32 */
244244
if (pgwin32_is_admin())
245245
{
246-
write_stderr("Execution of PostgreSQL by a user with administrative permissions is not permitted.\n"
246+
write_stderr("Execution of PostgreSQL by a user with administrative permissions is not\n"
247+
"permitted.\n"
247248
"The server must be started under an unprivileged user ID to prevent\n"
248249
"possible system security compromises. See the documentation for\n"
249250
"more information on how to properly start the server.\n");

‎src/backend/postmaster/bgwriter.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*
3838
*
3939
* IDENTIFICATION
40-
* $PostgreSQL: pgsql/src/backend/postmaster/bgwriter.c,v 1.10 2004/10/28 00:39:59 tgl Exp $
40+
* $PostgreSQL: pgsql/src/backend/postmaster/bgwriter.c,v 1.11 2004/11/05 17:11:28 petere Exp $
4141
*
4242
*-------------------------------------------------------------------------
4343
*/
@@ -553,7 +553,7 @@ RequestCheckpoint(bool waitforit)
553553
if (bgs->ckpt_failed!=old_failed)
554554
ereport(ERROR,
555555
(errmsg("checkpoint request failed"),
556-
errhint("Consult thepostmaster log for details.")));
556+
errhint("Consult theserver log for details.")));
557557
}
558558
}
559559

‎src/backend/storage/smgr/smgr.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
*
1313
* IDENTIFICATION
14-
* $PostgreSQL: pgsql/src/backend/storage/smgr/smgr.c,v 1.82 2004/09/06 17:56:16 tgl Exp $
14+
* $PostgreSQL: pgsql/src/backend/storage/smgr/smgr.c,v 1.83 2004/11/05 17:11:34 petere Exp $
1515
*
1616
*-------------------------------------------------------------------------
1717
*/
@@ -454,7 +454,7 @@ smgr_internal_unlink(RelFileNode rnode, int which, bool isTemp, bool isRedo)
454454
if (!(*(smgrsw[which].smgr_unlink)) (rnode,isRedo))
455455
ereport(WARNING,
456456
(errcode_for_file_access(),
457-
errmsg("could notunlink relation %u/%u/%u: %m",
457+
errmsg("could notremove relation %u/%u/%u: %m",
458458
rnode.spcNode,
459459
rnode.dbNode,
460460
rnode.relNode)));

0 commit comments

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