diff options
| author | Miks Kronkalns <miks.kronkalns@zabbix.com> | 2021-10-22 11:07:50 +0300 |
|---|---|---|
| committer | Miks Kronkalns <miks.kronkalns@zabbix.com> | 2021-10-22 11:07:50 +0300 |
| commit | 64d51491df0e73657b7225b6c2f24e3065999765 (patch) | |
| tree | 6dbca3e5d831aa4e79a7bda40817f5935dfa5788 /create | |
| parent | 3d8198a6d5acedb159eac3a53072918337e1484a (diff) | |
| parent | 81eecea2076b535412c16baa0e75ca939c6fa462 (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 3a9d9600d60..88bdaf2da0c 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 |5050079 |5050079 +ROW |5050082 |5050082 |