diff options
| author | Miks Kronkalns <miks.kronkalns@zabbix.com> | 2021-10-19 22:11:06 +0300 |
|---|---|---|
| committer | Miks Kronkalns <miks.kronkalns@zabbix.com> | 2021-10-19 22:11:06 +0300 |
| commit | 67121bb58d3aa925711794b0ee1ae02f8aae53b8 (patch) | |
| tree | 55b9a6c62a172e8d7def0bae3295d0df36e8be5b /create | |
| parent | 3b47a9e607d48eee4fc96affd2534b9c93a56f61 (diff) | |
| parent | 8b603ceeffebc2d4dd425cc4e459fe1e02ac108a (diff) | |
.......... [ZBXNEXT-6945] updated to latest from master; resolved conflicts in:
- create/src/schema.tmpl
- src/libs/zbxdbupgrade/dbupgrade_5050.c
- ui/include/defines.inc.php
Diffstat (limited to 'create')
| -rw-r--r-- | create/src/schema.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/create/src/schema.tmpl b/create/src/schema.tmpl index 448ef3052bf..3a9d9600d60 100644 --- a/create/src/schema.tmpl +++ b/create/src/schema.tmpl @@ -1895,4 +1895,4 @@ INDEX |1 |serviceid TABLE|dbversion|| FIELD |mandatory |t_integer |'0' |NOT NULL | FIELD |optional |t_integer |'0' |NOT NULL | -ROW |5050077 |5050077 +ROW |5050079 |5050079 |