← Back to branch summary

~ubuntu-branches/ubuntu/lucid/zabbix/lucid

« back to all changes in this revision

Viewing changes to src/libs/zbxdbhigh/host.c

  • Committer: Bazaar Package Importer
  • Author(s): Emanuele Gentili
  • Date: 2008-08-10 18:37:11 UTC
  • mfrom: (1.1.7 upstream) (8.1.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20080810183711-h4n52nkqqf3iuqhn
Tags: 1:1.4.6-1ubuntu1
* Merge from debian unstable, remaining changes:
 + fixing missing pid directory in /var/run
 + Added the same patch to debian/zabbix-server-{mysql,pgsql}.zabbix-server.init

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/libs/zbxdbhigh/host.c
830
830
                if( use_housekeeper )
831
831
                {
832
832
                        DBexecute("insert into housekeeper (housekeeperid,tablename,field,value)"
 
833
                                        " values (" ZBX_FS_UI64 ",'history_text','itemid'," ZBX_FS_UI64 ")", 
 
834
                                                DBget_maxid("housekeeper","housekeeperid"), itemid);
 
835
                        DBexecute("insert into housekeeper (housekeeperid,tablename,field,value)"
833
836
                                        " values (" ZBX_FS_UI64 ",'history_log','itemid'," ZBX_FS_UI64 ")", 
834
837
                                                DBget_maxid("housekeeper","housekeeperid"), itemid);
835
838
                        DBexecute("insert into housekeeper (housekeeperid,tablename,field,value)"
836
 
                                                        " values (" ZBX_FS_UI64 ",'history_uint','itemid'," ZBX_FS_UI64 ")", 
837
 
                                                                DBget_maxid("housekeeper","housekeeperid"), itemid);
838
 
                        DBexecute("insert into housekeeper (housekeeperid,tablename,field,value)"
839
 
                                                        " values (" ZBX_FS_UI64 ",'history_str','itemid'," ZBX_FS_UI64 ")", 
840
 
                                                                DBget_maxid("housekeeper","housekeeperid"), itemid);
841
 
                        DBexecute("insert into housekeeper (housekeeperid,tablename,field,value)"
842
 
                                                                " values (" ZBX_FS_UI64 ",'history','itemid'," ZBX_FS_UI64 ")", 
843
 
                                                                        DBget_maxid("housekeeper","housekeeperid"), itemid);
 
839
                                        " values (" ZBX_FS_UI64 ",'history_uint','itemid'," ZBX_FS_UI64 ")", 
 
840
                                                DBget_maxid("housekeeper","housekeeperid"), itemid);
 
841
                        DBexecute("insert into housekeeper (housekeeperid,tablename,field,value)"
 
842
                                        " values (" ZBX_FS_UI64 ",'history_str','itemid'," ZBX_FS_UI64 ")", 
 
843
                                                DBget_maxid("housekeeper","housekeeperid"), itemid);
 
844
                        DBexecute("insert into housekeeper (housekeeperid,tablename,field,value)"
 
845
                                        " values (" ZBX_FS_UI64 ",'history','itemid'," ZBX_FS_UI64 ")", 
 
846
                                                DBget_maxid("housekeeper","housekeeperid"), itemid);
844
847
                }
845
848
                else
846
849
                {
 
850
                        DBexecute("delete from history_text where itemid=" ZBX_FS_UI64, itemid);
847
851
                        DBexecute("delete from history_log where itemid=" ZBX_FS_UI64, itemid);
848
852
                        DBexecute("delete from history_uint where itemid=" ZBX_FS_UI64, itemid);
849
853
                        DBexecute("delete from history_str where itemid=" ZBX_FS_UI64, itemid);
1180
1184
                "yaxistype=%i,yaxismin=%i,yaxismax=%i,templateid=" ZBX_FS_UI64 ","
1181
1185
                "show_work_period=%i,show_triggers=%i,graphtype=%i"
1182
1186
                " where graphid=" ZBX_FS_UI64,
1183
 
                name,width,height,yaxistype,yaxismin,yaxismax,templateid,show_work_period,show_triggers,graphtype,
 
1187
                name_esc,width,height,yaxistype,yaxismin,yaxismax,templateid,show_work_period,show_triggers,graphtype,
1184
1188
                graphid);
1185
1189
 
1186
1190
        zbx_free(name_esc);