diff options
| author | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-12-04 10:30:26 +0000 |
|---|---|---|
| committer | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-12-04 10:30:26 +0000 |
| commit | a2e469d2d01a38bcd69c68bce4e1786699c840e2 (patch) | |
| tree | de33f418330b0522ba20f37412fd5ea3eedfb3b9 /src | |
| parent | 11579a31fd513f9956a5e9ee477d313b6247421c (diff) | |
| download | zabbix-a2e469d2d01a38bcd69c68bce4e1786699c840e2.tar.gz zabbix-a2e469d2d01a38bcd69c68bce4e1786699c840e2.tar.xz zabbix-a2e469d2d01a38bcd69c68bce4e1786699c840e2.zip | |
Minor changes.
git-svn-id: svn://svn.zabbix.com/trunk@3565 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/zbxsysinfo/common/common.c | 2 | ||||
| -rw-r--r-- | src/zabbix_server/utils/nodechange.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/libs/zbxsysinfo/common/common.c b/src/libs/zbxsysinfo/common/common.c index 94b554e0..a88c6310 100644 --- a/src/libs/zbxsysinfo/common/common.c +++ b/src/libs/zbxsysinfo/common/common.c @@ -1578,7 +1578,7 @@ static int tcp_expect(const char *hostname, short port, const char *request, con if(SOCKET_ERROR == connect(s,(struct sockaddr *)&servaddr_in,sizeof(ZBX_SOCKADDR))) { - zabbix_log( LOG_LEVEL_WARNING, "Error in connect() [%s:%u] [%s]",hostname, port, strerror_from_system(errno)); + zabbix_log( LOG_LEVEL_DEBUG, "Error in connect() [%s:%u] [%s]",hostname, port, strerror_from_system(errno)); zbx_sock_close(s); return SYSINFO_RET_OK; } diff --git a/src/zabbix_server/utils/nodechange.c b/src/zabbix_server/utils/nodechange.c index f04104fa..8c8aa6fd 100644 --- a/src/zabbix_server/utils/nodechange.c +++ b/src/zabbix_server/utils/nodechange.c @@ -154,9 +154,10 @@ int change_nodeid(int old_id, int new_id) { if(tables[i].fields[j].type == ZBX_TYPE_ID) { - DBexecute("update %s set %s=%s+" ZBX_FS_UI64 "\n", + DBexecute("update %s set %s=%s+" ZBX_FS_UI64 " where %s>0\n", tables[i].table, tables[i].fields[j].name, tables[i].fields[j].name, - (zbx_uint64_t)__UINT64_C(100000000000000)*(zbx_uint64_t)new_id); + (zbx_uint64_t)__UINT64_C(100000000000000)*(zbx_uint64_t)new_id, + tables[i].fields[j].name); } j++; } |