diff options
author | Sergey Simonenko <sergey.simonenko@zabbix.com> | 2021-11-12 14:59:14 +0300 |
---|---|---|
committer | Sergey Simonenko <sergey.simonenko@zabbix.com> | 2021-11-12 14:59:14 +0300 |
commit | d4385c6cf97dfc6e590b728c732eba8991a8fb8c (patch) | |
tree | bd7370420cab128aa3d29cd9d22897611c6ed967 /create | |
parent | be42579d6d442d5be1a88d4b878981054c075f1a (diff) |
........S. [ZBX-20177] resolved conflict
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 276770b9f40..901adab5f02 100644 --- a/create/src/schema.tmpl +++ b/create/src/schema.tmpl @@ -990,6 +990,7 @@ INDEX |4 |status INDEX |5 |mediatypeid INDEX |6 |userid INDEX |7 |p_eventid +INDEX |8 |acknowledgeid TABLE|history|itemid,clock,ns|0 FIELD |itemid |t_id | |NOT NULL |0 |-|items @@ -1904,4 +1905,4 @@ TABLE|dbversion|dbversionid| FIELD |dbversionid |t_id | |NOT NULL |0 FIELD |mandatory |t_integer |'0' |NOT NULL | FIELD |optional |t_integer |'0' |NOT NULL | -ROW |1 |5050110 |5050110 +ROW |1 |5050111 |5050111 |