diff options
| author | Vladimirs Maksimovs <vladimirs.maksimovs@zabbix.com> | 2020-07-14 12:55:46 +0300 |
|---|---|---|
| committer | Vladimirs Maksimovs <vladimirs.maksimovs@zabbix.com> | 2020-07-14 12:55:46 +0300 |
| commit | 626012dfd0ef9c91b459cdf0c42fb0196766c172 (patch) | |
| tree | 0d2c230ff66e7e51b3ad2e0bd8b788b86309ab81 /include/dbschema.h | |
| parent | 3e9d119379faf82da3b2ea3e635f3617466be62d (diff) | |
| parent | 2867e92da37080a50246d2d8bdf31ade01cdd41f (diff) | |
.......... [ZBXNEXT-82] updated to latest from /master; resolved conflicts in:
# create/src/schema.tmpl
# include/dbschema.h
# src/libs/zbxdbupgrade/dbupgrade_5010.c
# ui/app/controllers/CControllerGuiEdit.php
# ui/app/controllers/CControllerGuiUpdate.php
# ui/app/controllers/CControllerLatest.php
# ui/app/partials/monitoring.latest.view.html.php
# ui/include/defines.inc.php
# ui/include/profiles.inc.php
# ui/include/schema.inc.php
# ui/index_sso.php
Diffstat (limited to 'include/dbschema.h')
| -rw-r--r-- | include/dbschema.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/dbschema.h b/include/dbschema.h index e09aca974d5..fd6a888b56e 100644 --- a/include/dbschema.h +++ b/include/dbschema.h @@ -38,7 +38,7 @@ #define ZBX_TYPE_SHORTTEXT 7 #define ZBX_TYPE_LONGTEXT 8 -#define ZBX_MAX_FIELDS 100 /* maximum number of fields in a table plus one for null terminator in dbschema.c */ +#define ZBX_MAX_FIELDS 101 /* maximum number of fields in a table plus one for null terminator in dbschema.c */ #define ZBX_TABLENAME_LEN 26 #define ZBX_TABLENAME_LEN_MAX (ZBX_TABLENAME_LEN + 1) #define ZBX_FIELDNAME_LEN 28 |