diff options
| author | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-11-17 15:37:05 +0000 |
|---|---|---|
| committer | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-11-17 15:37:05 +0000 |
| commit | 2555bf2a1330b59e3eb0bfa18d975a4e658123f3 (patch) | |
| tree | 355903fbce31e64eed67c5aebd64601db014e494 /src | |
| parent | e7de3d8969f6853a819fb9c34965a8d1b06364c2 (diff) | |
- [ZBX-100] fixed Oracle compilation errors (Alexei)
[svn merge -r5066:5069 svn://svn.zabbix.com/branches/1.4]
git-svn-id: svn://svn.zabbix.com/trunk@5070 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/zbxdb/db.c | 4 | ||||
| -rw-r--r-- | src/zabbix_server/nodewatcher/nodesender.c | 16 |
2 files changed, 14 insertions, 6 deletions
diff --git a/src/libs/zbxdb/db.c b/src/libs/zbxdb/db.c index 84bf8594..9bf36dd8 100644 --- a/src/libs/zbxdb/db.c +++ b/src/libs/zbxdb/db.c @@ -155,7 +155,7 @@ int zbx_db_connect(char *host, char *user, char *password, char *dbname, char *d return ret; #endif #ifdef HAVE_ORACLE - char connect = NULL; + char *connect = NULL; if (SQLO_SUCCESS != sqlo_init(SQLO_OFF, 1, 100)) { @@ -793,7 +793,7 @@ zbx_uint64_t zbx_db_insert_id(int exec_result, const char *table, const char *fi zbx_snprintf(sql, sizeof(sql), "select %s_%s.currval from dual", table, field); - result=DBselect(sql); + result=DBselect("%s", sql); row = DBfetch(result); diff --git a/src/zabbix_server/nodewatcher/nodesender.c b/src/zabbix_server/nodewatcher/nodesender.c index 08834ce1..1d3bc6b6 100644 --- a/src/zabbix_server/nodewatcher/nodesender.c +++ b/src/zabbix_server/nodewatcher/nodesender.c @@ -65,17 +65,23 @@ int calculate_checksums(int nodeid, const char *tablename, const zbx_uint64_t id if (NULL != tablename && 0 != strcmp(tablename, tables[t].table)) continue; - zbx_snprintf_alloc(&sql, &sql_allocated, &sql_offset, 512, #ifdef HAVE_MYSQL + zbx_snprintf_alloc(&sql, &sql_allocated, &sql_offset, 512, "%s select %d,'%s',%s,%d,concat_ws(',',", + sql_offset > 0 ? "union all" : "insert into node_cksum (nodeid,tablename,recordid,cksumtype,cksum)", + nodeid, + tables[t].table, + tables[t].recid, + NODE_CKSUM_TYPE_NEW); #else + zbx_snprintf_alloc(&sql, &sql_allocated, &sql_offset, 512, "%s select %d,'%s',%s,%d,", -#endif sql_offset > 0 ? "union all" : "insert into node_cksum (nodeid,tablename,recordid,cksumtype,cksum)", nodeid, tables[t].table, tables[t].recid, NODE_CKSUM_TYPE_NEW); +#endif for (f = 0; tables[t].fields[f].name != 0; f ++) { if ((tables[t].fields[f].flags & ZBX_SYNC) == 0) @@ -112,13 +118,15 @@ int calculate_checksums(int nodeid, const char *tablename, const zbx_uint64_t id break; } } - zbx_snprintf_alloc(&sql, &sql_allocated, &sql_offset, 16, #ifdef HAVE_MYSQL + zbx_snprintf_alloc(&sql, &sql_allocated, &sql_offset, 16, "," + ); #else + zbx_snprintf_alloc(&sql, &sql_allocated, &sql_offset, 16, "||','||" -#endif ); +#endif } /* remove last delimiter */ |