diff options
| author | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-10-30 15:22:44 +0000 |
|---|---|---|
| committer | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-10-30 15:22:44 +0000 |
| commit | 5e4063517c2aba730d1aa2273754a85891375282 (patch) | |
| tree | b51454a45765f1d0e249e1f8943f22b2d2e7ca7b /src/libs/zbxdbhigh/db.c | |
| parent | 28372be4dd75b7c4ffe459ec2dd82af252112fac (diff) | |
| download | zabbix-5e4063517c2aba730d1aa2273754a85891375282.tar.gz zabbix-5e4063517c2aba730d1aa2273754a85891375282.tar.xz zabbix-5e4063517c2aba730d1aa2273754a85891375282.zip | |
- [NTT-29] zabbix_server process on master node terminated unexpectedly
[svn merge -r4947:4948 svn://svn.zabbix.com/branches/1.4.j]
git-svn-id: svn://svn.zabbix.com/trunk@4949 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/libs/zbxdbhigh/db.c')
| -rw-r--r-- | src/libs/zbxdbhigh/db.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/zbxdbhigh/db.c b/src/libs/zbxdbhigh/db.c index 4864368c..5f60359a 100644 --- a/src/libs/zbxdbhigh/db.c +++ b/src/libs/zbxdbhigh/db.c @@ -1155,7 +1155,7 @@ int DBadd_history_text(zbx_uint64_t itemid, char *value, int clock) goto lbl_exit; } - id = DBget_maxid("history_log", "id"); + id = DBget_maxid("history_text", "id"); zbx_snprintf(sql, sizeof(sql), "insert into history_text (id,clock,itemid,value)" " values (" ZBX_FS_UI64 ",%d," ZBX_FS_UI64 ", EMPTY_CLOB()) returning value into :1", id, @@ -1786,12 +1786,12 @@ zbx_uint64_t DBget_maxid(char *table, char *field) if(sync == 1) { min = (zbx_uint64_t)__UINT64_C(100000000000000)*(zbx_uint64_t)CONFIG_NODEID+(zbx_uint64_t)__UINT64_C(100000000000)*(zbx_uint64_t)CONFIG_NODEID; - max = (zbx_uint64_t)__UINT64_C(100000000000000)*(zbx_uint64_t)CONFIG_NODEID+(zbx_uint64_t)__UINT64_C(100000000000)*(zbx_uint64_t)CONFIG_NODEID+(zbx_uint64_t)99999999999; + max = (zbx_uint64_t)__UINT64_C(100000000000000)*(zbx_uint64_t)CONFIG_NODEID+(zbx_uint64_t)__UINT64_C(100000000000)*(zbx_uint64_t)CONFIG_NODEID+(zbx_uint64_t)__UINT64_C(99999999999); } else { min = (zbx_uint64_t)__UINT64_C(100000000000000)*(zbx_uint64_t)CONFIG_NODEID; - max = (zbx_uint64_t)__UINT64_C(100000000000000)*(zbx_uint64_t)CONFIG_NODEID+(zbx_uint64_t)99999999999999; + max = (zbx_uint64_t)__UINT64_C(100000000000000)*(zbx_uint64_t)CONFIG_NODEID+(zbx_uint64_t)__UINT64_C(99999999999999); } do |