diff options
| author | Valdis Murzins <valdis.murzins@zabbix.com> | 2021-10-01 14:28:56 +0300 |
|---|---|---|
| committer | Valdis Murzins <valdis.murzins@zabbix.com> | 2021-10-01 14:28:56 +0300 |
| commit | cb7186bfeef6e3415faee95631c82e68abc7783c (patch) | |
| tree | 52213d993aecee3fa889aad06e7f3d7979be1297 /create | |
| parent | 8206fe632ed668628ad1864fca17c84788dbc70e (diff) | |
| parent | fd3ff280e0c06b55696df89ad8e3a802962111f8 (diff) | |
..F.I..... [ZBXNEXT-6757] updated to latest from master; resolved conflicts in:
- ui/include/views/configuration.host.edit.php
- src/libs/zbxdbupgrade/dbupgrade_5050.c
- create/src/schema.tmpl
- ui/include/defines.inc.php
Diffstat (limited to 'create')
| -rw-r--r-- | create/src/schema.tmpl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/create/src/schema.tmpl b/create/src/schema.tmpl index 9f1cd44ee73..9b86ef307c2 100644 --- a/create/src/schema.tmpl +++ b/create/src/schema.tmpl @@ -332,7 +332,7 @@ FIELD |mediatypeid |t_id | |NOT NULL |0 |1|media_type FIELD |eventsource |t_integer | |NOT NULL |0 FIELD |recovery |t_integer | |NOT NULL |0 FIELD |subject |t_varchar(255) |'' |NOT NULL |0 -FIELD |message |t_shorttext |'' |NOT NULL |0 +FIELD |message |t_text |'' |NOT NULL |0 UNIQUE |1 |mediatypeid,eventsource,recovery TABLE|usrgrp|usrgrpid|ZBX_DATA @@ -593,7 +593,7 @@ INDEX |2 |discovery_groupid TABLE|triggers|triggerid|ZBX_TEMPLATE FIELD |triggerid |t_id | |NOT NULL |0 FIELD |expression |t_varchar(2048)|'' |NOT NULL |0 -FIELD |description |t_varchar(255) |'' |NOT NULL |0 +FIELD |description |t_shorttext |'' |NOT NULL |0 FIELD |url |t_varchar(255) |'' |NOT NULL |0 FIELD |status |t_integer |'0' |NOT NULL |0 FIELD |value |t_integer |'0' |NOT NULL |ZBX_NODATA @@ -1471,7 +1471,7 @@ FIELD |item_preprocid |t_id | |NOT NULL |0 FIELD |itemid |t_id | |NOT NULL |ZBX_PROXY |1|items FIELD |step |t_integer |'0' |NOT NULL |ZBX_PROXY FIELD |type |t_integer |'0' |NOT NULL |ZBX_PROXY -FIELD |params |t_shorttext |'' |NOT NULL |ZBX_PROXY +FIELD |params |t_text |'' |NOT NULL |ZBX_PROXY FIELD |error_handler |t_integer |'0' |NOT NULL |ZBX_PROXY FIELD |error_handler_params|t_varchar(255)|'' |NOT NULL |ZBX_PROXY INDEX |1 |itemid,step @@ -1891,4 +1891,4 @@ INDEX |1 |serviceid TABLE|dbversion|| FIELD |mandatory |t_integer |'0' |NOT NULL | FIELD |optional |t_integer |'0' |NOT NULL | -ROW |5050072 |5050072 +ROW |5050075 |5050075 |