diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-07-30 12:47:04 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-07-30 12:47:04 +0000 |
| commit | 8a4c4454a144c2eab9534e558604e9e11c4da585 (patch) | |
| tree | 1ed7092995639d7492422c3bd7b09cf88ee0eb52 /frontends | |
| parent | 527da18d12fc32d48858acd51e934ef57ab294fb (diff) | |
| download | zabbix-8a4c4454a144c2eab9534e558604e9e11c4da585.tar.gz zabbix-8a4c4454a144c2eab9534e558604e9e11c4da585.tar.xz zabbix-8a4c4454a144c2eab9534e558604e9e11c4da585.zip | |
- [DEV-137] fix for oracle (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5854 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends')
| -rw-r--r-- | frontends/php/include/db.inc.php | 2 | ||||
| -rw-r--r-- | frontends/php/queue.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/frontends/php/include/db.inc.php b/frontends/php/include/db.inc.php index 92456cc6..2dcec73f 100644 --- a/frontends/php/include/db.inc.php +++ b/frontends/php/include/db.inc.php @@ -737,7 +737,7 @@ else { switch($DB['TYPE']) { case 'MYSQL': case 'ORACLE': - $items = array_chunk($array, 999); + $items = array_chunk($array, 950); foreach($items as $id => $value){ if($notin) $condition.=!empty($condition)?')'.$concat.$fieldname.$in.'(':''; diff --git a/frontends/php/queue.php b/frontends/php/queue.php index 0684a2fc..10721bda 100644 --- a/frontends/php/queue.php +++ b/frontends/php/queue.php @@ -80,7 +80,7 @@ include_once "include/page_header.php"; ' or (h.status='.HOST_STATUS_MONITORED.' AND h.available='.HOST_AVAILABLE_FALSE.' AND h.disable_until<='.$now.')) '. ' AND i.hostid=h.hostid '. ' AND i.nextcheck<'.$now. - ' AND i.key_ not in ("status","icmpping","icmppingsec","zabbix[log]") '. + ' AND i.key_ NOT IN ('.zbx_dbstr('status').','.zbx_dbstr('icmpping').','.zbx_dbstr('icmppingsec').','.zbx_dbstr('zabbix[log]').') '. ' AND i.value_type not in ('.ITEM_VALUE_TYPE_LOG.') '. ' AND '.DBcondition('h.hostid',$available_hosts). ' AND '.DBin_node('h.hostid', get_current_nodeid()). |