summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2006-12-02 12:16:14 +0000
committeralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2006-12-02 12:16:14 +0000
commit99c5d384a550dee2830bfa38bc7fa3b7e5fa1103 (patch)
treeeb725ef4270e9a9c29049b8ea91c808210a422a5 /src
parent5b3dc12f43e807f9a8946243a462d78bb45e0d14 (diff)
Minor changes.
git-svn-id: svn://svn.zabbix.com/trunk@3558 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
-rw-r--r--src/zabbix_server/nodewatcher/history.c4
-rw-r--r--src/zabbix_server/server.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/zabbix_server/nodewatcher/history.c b/src/zabbix_server/nodewatcher/history.c
index 316bf538..563c49d0 100644
--- a/src/zabbix_server/nodewatcher/history.c
+++ b/src/zabbix_server/nodewatcher/history.c
@@ -172,7 +172,7 @@ static int process_node_history_uint(int nodeid, int master_nodeid)
zbx_snprintf(sql,sizeof(sql),"select id,itemid,clock,value from history_uint_sync where nodeid=%d order by id", nodeid);
- result = DBselectN(sql, 100000);
+ result = DBselectN(sql, 10000);
while((row=DBfetch(result)))
{
ZBX_STR2UINT64(id,row[0])
@@ -251,7 +251,7 @@ static int process_node_history(int nodeid, int master_nodeid)
zbx_snprintf(sql,sizeof(sql),"select id,itemid,clock,value from history_sync where nodeid=%d order by id", nodeid);
- result = DBselectN(sql, 100000);
+ result = DBselectN(sql, 10000);
while((row=DBfetch(result)))
{
ZBX_STR2UINT64(id,row[0])
diff --git a/src/zabbix_server/server.c b/src/zabbix_server/server.c
index d7a9cb19..968161cb 100644
--- a/src/zabbix_server/server.c
+++ b/src/zabbix_server/server.c
@@ -74,7 +74,7 @@ char *help_message[] = {
"Options:",
" -c <file> Specify configuration file",
" -h give this help",
- " -n <nodeid> covert database data to new nodeid",
+ " -n <nodeid> convert database data to new nodeid",
" -v display version number",
0 /* end of text */
};
@@ -83,7 +83,7 @@ char *help_message[] = {
"Options:",
" -c --config <file> Specify configuration file",
" -h --help give this help",
- " -n --new-nodeid <nodeid> covert database data to new nodeid",
+ " -n --new-nodeid <nodeid> convert database data to new nodeid",
" -v --version display version number",
0 /* end of text */
};