diff options
| author | Vladimirs Maksimovs <vladimirs.maksimovs@zabbix.com> | 2020-08-03 16:49:39 +0300 |
|---|---|---|
| committer | Vladimirs Maksimovs <vladimirs.maksimovs@zabbix.com> | 2020-08-03 16:49:39 +0300 |
| commit | 9a9b8760084d1f8f9e3dde58c60115e2b97ea534 (patch) | |
| tree | eab1398272ae94f47d68dc7c45eab1d3ea5dd8d2 /include/dbschema.h | |
| parent | 7b8c6a86d69a42c9198363d6861b5f8858862506 (diff) | |
| parent | 63a1bb9dacad4305cfa2ef632cf05e059db75bbf (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/applications.php
# ui/include/defines.inc.php
# ui/include/profiles.inc.php
# ui/include/schema.inc.php
# ui/templates.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 a36737cbf4e..bb8b27a9997 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 104 /* maximum number of fields in a table plus one for null terminator in dbschema.c */ +#define ZBX_MAX_FIELDS 105 /* 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 |