diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-08-02 12:23:31 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-08-02 12:23:31 +0000 |
| commit | 78134fbc73c8f2f947722093fb1d625268a60552 (patch) | |
| tree | b84e3301b46e0a6054e8c2f55d34044050fa14b9 /src/libs/zbxdbhigh/host.c | |
| parent | 3e5c8f13f71b5297f5c6621b7156e381606f06ac (diff) | |
| download | zabbix-78134fbc73c8f2f947722093fb1d625268a60552.tar.gz zabbix-78134fbc73c8f2f947722093fb1d625268a60552.tar.xz zabbix-78134fbc73c8f2f947722093fb1d625268a60552.zip | |
- merged rev. 4501:4502 of branches/1.4.2 (Eugene)
[ - added undefined element message 'No **** defined' instead 'Premission deny' (Eugene)
- fixed items,graphs,hostgroups deletion (Eugene)
- fixed permisions for maps (Eugene) ]
git-svn-id: svn://svn.zabbix.com/trunk@4505 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/libs/zbxdbhigh/host.c')
| -rw-r--r-- | src/libs/zbxdbhigh/host.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/libs/zbxdbhigh/host.c b/src/libs/zbxdbhigh/host.c index 8dac06d1..6152329d 100644 --- a/src/libs/zbxdbhigh/host.c +++ b/src/libs/zbxdbhigh/host.c @@ -1056,6 +1056,8 @@ static int DBdelete_graph( if( SUCCEED == result ) { /* delete graph */ + DBexecute("delete from screens_items where resourceid=" ZBX_FS_UI64 " and resourcetype=%i", graphid, SCREEN_RESOURCE_GRAPH); + DBexecute("delete from graphs_items where graphid=" ZBX_FS_UI64, graphid); DBexecute("delete from graphs where graphid=" ZBX_FS_UI64, graphid); @@ -1560,6 +1562,9 @@ static int DBdelete_item( if( SUCCEED == (result = DBdelete_triggers_by_itemid(itemid)) ) if( SUCCEED == (result = DBdelete_history_by_itemid(itemid, 1 /* use housekeeper */)) ) { + DBexecute("delete from screens_items where resourceid=" ZBX_FS_UI64 " and resourcetype in (%i,%i)", + itemid, SCREEN_RESOURCE_PLAIN_TEXT, SCREEN_RESOURCE_SIMPLE_GRAPH); + DBexecute("delete from graphs_items where itemid=" ZBX_FS_UI64, itemid); DBexecute("delete from items_applications where itemid=" ZBX_FS_UI64, itemid); DBexecute("delete from items where itemid=" ZBX_FS_UI64, itemid); |