Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Gpdb
提交
7ce9b368
G
Gpdb
项目概览
Greenplum
/
Gpdb
通知
7
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
Gpdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7ce9b368
编写于
5月 31, 2007
作者:
P
Peter Eisentraut
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make some messages more consistent
上级
54af8765
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
26 addition
and
26 deletion
+26
-26
contrib/pg_standby/pg_standby.c
contrib/pg_standby/pg_standby.c
+2
-2
src/backend/access/transam/xlog.c
src/backend/access/transam/xlog.c
+2
-2
src/backend/commands/tablespace.c
src/backend/commands/tablespace.c
+2
-2
src/bin/initdb/initdb.c
src/bin/initdb/initdb.c
+3
-3
src/bin/pg_config/pg_config.c
src/bin/pg_config/pg_config.c
+2
-2
src/bin/pg_ctl/pg_ctl.c
src/bin/pg_ctl/pg_ctl.c
+3
-3
src/interfaces/ecpg/ecpglib/error.c
src/interfaces/ecpg/ecpglib/error.c
+2
-2
src/pl/plpython/plpython.c
src/pl/plpython/plpython.c
+3
-3
src/test/regress/pg_regress.c
src/test/regress/pg_regress.c
+5
-5
src/timezone/pgtz.c
src/timezone/pgtz.c
+2
-2
未找到文件。
contrib/pg_standby/pg_standby.c
浏览文件 @
7ce9b368
...
...
@@ -270,7 +270,7 @@ CustomizableCleanupPriorWALFiles(void)
rc
=
unlink
(
WALFilePath
);
if
(
rc
!=
0
)
fprintf
(
stderr
,
"
\n
pg_standby: ERROR failed to remove
\"
%s
\"
because
%s
\n
"
,
WALFilePath
,
strerror
(
errno
));
fprintf
(
stderr
,
"
\n
pg_standby: ERROR failed to remove
\"
%s
\"
:
%s
\n
"
,
WALFilePath
,
strerror
(
errno
));
}
...
...
@@ -320,7 +320,7 @@ CheckForExternalTrigger(void)
rc
=
unlink
(
triggerPath
);
if
(
rc
!=
0
)
{
fprintf
(
stderr
,
"
\n
ERROR:
unable to remove
\"
%s
\"
, because
%s"
,
triggerPath
,
strerror
(
errno
));
fprintf
(
stderr
,
"
\n
ERROR:
could not remove
\"
%s
\"
:
%s"
,
triggerPath
,
strerror
(
errno
));
fflush
(
stderr
);
exit
(
rc
);
}
...
...
src/backend/access/transam/xlog.c
浏览文件 @
7ce9b368
...
...
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.27
1 2007/05/31 07:36:12
petere Exp $
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.27
2 2007/05/31 15:13:01
petere Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -2933,7 +2933,7 @@ ReadRecord(XLogRecPtr *RecPtr, int emode)
{
ereport
(
emode
,
(
errcode_for_file_access
(),
errmsg
(
"could not read from log file %u, segment %u
at
offset %u: %m"
,
errmsg
(
"could not read from log file %u, segment %u
,
offset %u: %m"
,
readId
,
readSeg
,
readOff
)));
goto
next_record_is_invalid
;
}
...
...
src/backend/commands/tablespace.c
浏览文件 @
7ce9b368
...
...
@@ -37,7 +37,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.4
5 2007/03/22 19:51:44 tgl
Exp $
* $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.4
6 2007/05/31 15:13:02 petere
Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -570,7 +570,7 @@ remove_tablespace_directories(Oid tablespaceoid, bool redo)
if
(
rmdir
(
subfile
)
<
0
)
ereport
(
ERROR
,
(
errcode_for_file_access
(),
errmsg
(
"could not
delet
e directory
\"
%s
\"
: %m"
,
errmsg
(
"could not
remov
e directory
\"
%s
\"
: %m"
,
subfile
)));
pfree
(
subfile
);
...
...
src/bin/initdb/initdb.c
浏览文件 @
7ce9b368
...
...
@@ -42,7 +42,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
* Portions taken from FreeBSD.
*
* $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.13
6 2007/03/29 22:46:42 momjian
Exp $
* $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.13
7 2007/05/31 15:13:03 petere
Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -2328,7 +2328,7 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION * processInfo)
if
(
_CreateRestrictedToken
==
NULL
)
{
fprintf
(
stderr
,
"WARNING:
Unable to
create restricted tokens on this platform
\n
"
);
fprintf
(
stderr
,
"WARNING:
cannot
create restricted tokens on this platform
\n
"
);
if
(
Advapi32Handle
!=
NULL
)
FreeLibrary
(
Advapi32Handle
);
return
0
;
...
...
@@ -3005,7 +3005,7 @@ main(int argc, char *argv[])
exit_nicely
();
}
#else
fprintf
(
stderr
,
_
(
"%s: symlinks are not supported on this plat
a
form"
));
fprintf
(
stderr
,
_
(
"%s: symlinks are not supported on this platform"
));
exit_nicely
();
#endif
}
...
...
src/bin/pg_config/pg_config.c
浏览文件 @
7ce9b368
...
...
@@ -17,7 +17,7 @@
*
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
*
* $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.2
4 2007/02/07 00:28:5
4 petere Exp $
* $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.2
5 2007/05/31 15:13:0
4 petere Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -469,7 +469,7 @@ main(int argc, char **argv)
if
(
ret
)
{
fprintf
(
stderr
,
_
(
"%s: could not find own executable
\n
"
),
progname
);
fprintf
(
stderr
,
_
(
"%s: could not find own
program
executable
\n
"
),
progname
);
exit
(
1
);
}
...
...
src/bin/pg_ctl/pg_ctl.c
浏览文件 @
7ce9b368
...
...
@@ -4,7 +4,7 @@
*
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
*
* $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.
79 2007/03/18 16:50:44 neilc
Exp $
* $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.
80 2007/05/31 15:13:04 petere
Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -1257,7 +1257,7 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION * processInfo)
* NT4 doesn't have CreateRestrictedToken, so just call ordinary
* CreateProcess
*/
write_stderr
(
"WARNING:
Unable to
create restricted tokens on this platform
\n
"
);
write_stderr
(
"WARNING:
cannot
create restricted tokens on this platform
\n
"
);
if
(
Advapi32Handle
!=
NULL
)
FreeLibrary
(
Advapi32Handle
);
return
CreateProcess
(
NULL
,
cmd
,
NULL
,
NULL
,
FALSE
,
0
,
NULL
,
NULL
,
&
si
,
processInfo
);
...
...
@@ -1332,7 +1332,7 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION * processInfo)
* Log error if we can't get version, or if we're on WinXP/2003 or
* newer
*/
write_stderr
(
"WARNING:
Unable to locate all job object functions in system API!
\n
"
);
write_stderr
(
"WARNING:
could not locate all job object functions in system API
\n
"
);
}
else
{
...
...
src/interfaces/ecpg/ecpglib/error.c
浏览文件 @
7ce9b368
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/error.c,v 1.1
5 2006/10/04 00:30:11 momjian
Exp $ */
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/error.c,v 1.1
6 2007/05/31 15:13:05 petere
Exp $ */
#define POSTGRES_ECPG_INTERNAL
#include "postgres_fe.h"
...
...
@@ -62,7 +62,7 @@ ECPGraise(int line, int code, const char *sqlstate, const char *str)
case
ECPG_CONVERT_BOOL
:
snprintf
(
sqlca
->
sqlerrm
.
sqlerrmc
,
sizeof
(
sqlca
->
sqlerrm
.
sqlerrmc
),
"
Unable to
convert %s to bool on line %d."
,
str
,
line
);
"
Could not
convert %s to bool on line %d."
,
str
,
line
);
break
;
case
ECPG_EMPTY
:
...
...
src/pl/plpython/plpython.c
浏览文件 @
7ce9b368
/**********************************************************************
* plpython.c - python as a procedural language for PostgreSQL
*
* $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.10
0 2007/04/04 17:28:11 momjian
Exp $
* $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.10
1 2007/05/31 15:13:05 petere
Exp $
*
*********************************************************************
*/
...
...
@@ -484,7 +484,7 @@ PLy_modify_tuple(PLyProcedure * proc, PyObject * pltd, TriggerData *tdata,
PG_TRY
();
{
if
((
plntup
=
PyDict_GetItemString
(
pltd
,
"new"
))
==
NULL
)
elog
(
ERROR
,
"TD[
\"
new
\"
] deleted,
unable to
modify tuple"
);
elog
(
ERROR
,
"TD[
\"
new
\"
] deleted,
cannot
modify tuple"
);
if
(
!
PyDict_Check
(
plntup
))
elog
(
ERROR
,
"TD[
\"
new
\"
] is not a dictionary object"
);
Py_INCREF
(
plntup
);
...
...
@@ -2822,7 +2822,7 @@ PLy_output(volatile int level, PyObject * self, PyObject * args)
if
(
so
==
NULL
||
((
sv
=
PyString_AsString
(
so
))
==
NULL
))
{
level
=
ERROR
;
sv
=
"
Unable to
parse error message in `plpy.elog'"
;
sv
=
"
could not
parse error message in `plpy.elog'"
;
}
oldcontext
=
CurrentMemoryContext
;
...
...
src/test/regress/pg_regress.c
浏览文件 @
7ce9b368
...
...
@@ -11,7 +11,7 @@
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.3
1 2007/02/08 19:48:28 tgl
Exp $
* $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.3
2 2007/05/31 15:13:06 petere
Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -886,14 +886,14 @@ spawn_process(const char *cmdline)
{
if
(
Advapi32Handle
!=
NULL
)
FreeLibrary
(
Advapi32Handle
);
fprintf
(
stderr
,
"ERROR:
Unable to
create restricted tokens on this platform
\n
"
);
fprintf
(
stderr
,
"ERROR:
cannot
create restricted tokens on this platform
\n
"
);
exit_nicely
(
2
);
}
/* Open the current token to use as base for the restricted one */
if
(
!
OpenProcessToken
(
GetCurrentProcess
(),
TOKEN_ALL_ACCESS
,
&
origToken
))
{
fprintf
(
stderr
,
"
Failed to
open process token: %lu
\n
"
,
GetLastError
());
fprintf
(
stderr
,
"
could not
open process token: %lu
\n
"
,
GetLastError
());
exit_nicely
(
2
);
}
...
...
@@ -904,7 +904,7 @@ spawn_process(const char *cmdline)
!
AllocateAndInitializeSid
(
&
NtAuthority
,
2
,
SECURITY_BUILTIN_DOMAIN_RID
,
DOMAIN_ALIAS_RID_POWER_USERS
,
0
,
0
,
0
,
0
,
0
,
0
,
&
dropSids
[
1
].
Sid
))
{
fprintf
(
stderr
,
"
Failed to
allocate SIDs: %lu
\n
"
,
GetLastError
());
fprintf
(
stderr
,
"
could not
allocate SIDs: %lu
\n
"
,
GetLastError
());
exit_nicely
(
2
);
}
...
...
@@ -923,7 +923,7 @@ spawn_process(const char *cmdline)
if
(
!
b
)
{
fprintf
(
stderr
,
"
Failed to
create restricted token: %lu
\n
"
,
GetLastError
());
fprintf
(
stderr
,
"
could not
create restricted token: %lu
\n
"
,
GetLastError
());
exit_nicely
(
2
);
}
...
...
src/timezone/pgtz.c
浏览文件 @
7ce9b368
...
...
@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.5
0 2007/02/10 14:58:55
petere Exp $
* $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.5
1 2007/05/31 15:13:06
petere Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -455,7 +455,7 @@ identify_system_timezone(void)
if
(
std_zone_name
[
0
]
==
'\0'
)
{
ereport
(
LOG
,
(
errmsg
(
"
unable to determine system time
zone, defaulting to
\"
%s
\"
"
,
"GMT"
),
(
errmsg
(
"
could not determine system time
zone, defaulting to
\"
%s
\"
"
,
"GMT"
),
errhint
(
"You can specify the correct timezone in postgresql.conf."
)));
return
NULL
;
/* go to GMT */
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录