diff options
| author | Janis Freibergs <janis.freibergs@zabbix.com> | 2021-11-25 15:33:30 +0300 |
|---|---|---|
| committer | Janis Freibergs <janis.freibergs@zabbix.com> | 2021-11-25 15:35:23 +0300 |
| commit | 8f8f663f43104a48edd4959c069885f05e0807ca (patch) | |
| tree | a325a5371ea573c0fd2f7f2ab8ebbb6f504e34e5 /create | |
| parent | 86dd93671922df992b9745aa9eeb45ecb2dffc1b (diff) | |
| parent | 0e264bc700cbead2de96ea21713f74480099f345 (diff) | |
.......... [ZBXNEXT-6999] updated to latest from origin; resolved conflicts
- 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 | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/create/src/schema.tmpl b/create/src/schema.tmpl index afb4688a90c..782f37e9fe2 100644 --- a/create/src/schema.tmpl +++ b/create/src/schema.tmpl @@ -1905,17 +1905,17 @@ UNIQUE |1 |name TABLE|sla_schedule|sla_scheduleid|ZBX_DATA FIELD |sla_scheduleid |t_id | |NOT NULL |0 FIELD |slaid |t_id | |NOT NULL |0 |1|sla|slaid -FIELD |from |t_integer |'0' |NOT NULL |0 -FIELD |to |t_integer |'0' |NOT NULL |0 +FIELD |period_from |t_integer |'0' |NOT NULL |0 +FIELD |period_to |t_integer |'0' |NOT NULL |0 INDEX |1 |slaid -TABLE|sla_downtime|sla_downtimeid|ZBX_DATA -FIELD |sla_downtimeid |t_id | |NOT NULL |0 -FIELD |slaid |t_id | |NOT NULL |0 |1|sla|slaid -FIELD |from |t_integer |'0' |NOT NULL |0 -FIELD |to |t_integer |'0' |NOT NULL |0 -FIELD |name |t_varchar(255) |'' |NOT NULL |0 -INDEX |1 |slaid +TABLE|sla_excluded_downtime|sla_excluded_downtimeid|ZBX_DATA +FIELD |sla_excluded_downtimeid|t_id | |NOT NULL |0 +FIELD |slaid |t_id | |NOT NULL |0 |1|sla|slaid +FIELD |name |t_varchar(255) |'' |NOT NULL |0 +FIELD |period_from |t_integer |'0' |NOT NULL |0 +FIELD |period_to |t_integer |'0' |NOT NULL |0 +INDEX |1 |slaid TABLE|sla_service_tag|sla_service_tagid|0 FIELD |sla_service_tagid |t_id | |NOT NULL |0 @@ -1929,6 +1929,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 |5050128 |5050128 - - +ROW |1 |5050130 |5050130 |