diff options
| author | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2021-05-07 18:39:56 +0300 |
|---|---|---|
| committer | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2021-05-07 18:39:56 +0300 |
| commit | d3d1b6340db4bd59900ef61db90f5cc927dcd59b (patch) | |
| tree | 2710aea0bb61e17af0b994b86a1656a04dc77ba0 /create | |
| parent | 27d4e37650a3cd785ffc481dcb5c831c7b58f9e1 (diff) | |
| parent | 6ef36762644b5d57dc2c96b4aa8392bc7af561f5 (diff) | |
.......... [ZBXNEXT-6451,ZBXNEXT-6455] updated to the latest master; fixed conflicts in:
- create/src/schema.tmpl
- include/db.h
- include/zbxhistory.h
- src/libs/zbxdbupgrade/dbupgrade_5030.c
- src/libs/zbxhistory/history.c
- ui/include/defines.inc.php
Diffstat (limited to 'create')
| -rw-r--r-- | create/src/schema.tmpl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/create/src/schema.tmpl b/create/src/schema.tmpl index 889c35916f3..31d76a54827 100644 --- a/create/src/schema.tmpl +++ b/create/src/schema.tmpl @@ -577,6 +577,7 @@ FIELD |item_test_timeout |t_varchar(32) |'60s' |NOT NULL |ZBX_NODATA FIELD |session_key |t_varchar(32)|'' |NOT NULL |ZBX_NODATA FIELD |url |t_varchar(255) |'' |NOT NULL |ZBX_NODATA FIELD |report_test_timeout|t_varchar(32)|'60s'|NOT NULL |ZBX_NODATA +FIELD |dbversion_status |t_varchar(1024)|'' |NOT NULL |ZBX_NODATA INDEX |1 |alert_usrgrpid INDEX |2 |discovery_groupid @@ -1846,4 +1847,4 @@ INDEX |1 |reportid TABLE|dbversion|| FIELD |mandatory |t_integer |'0' |NOT NULL | FIELD |optional |t_integer |'0' |NOT NULL | -ROW |5030169 |5030169 +ROW |5030170 |5030170 |