diff options
| author | Miks Kronkalns <miks.kronkalns@zabbix.com> | 2021-10-27 00:03:35 +0300 |
|---|---|---|
| committer | Miks Kronkalns <miks.kronkalns@zabbix.com> | 2021-10-27 00:03:35 +0300 |
| commit | c1a305fee9f6836c44fb8accebb936c5e6cb4295 (patch) | |
| tree | 96c9a80eaef8967188f5c0c71987737ab899b4aa /include/dbschema.h | |
| parent | 64d51491df0e73657b7225b6c2f24e3065999765 (diff) | |
| parent | 3c6581c2367bf4a36f4239bbe9d74d4bf1a1cabb (diff) | |
A.F.I..... [ZBXNEXT-6945] updated to latest from master; Resolved conflicts in:
- create/src/schema.tmpl
- include/dbschema.h
- src/libs/zbxdbupgrade/dbupgrade_5050.c
- ui/include/classes/api/services/CSettings.php
- ui/include/classes/helpers/CSettingsHelper.php
- ui/include/defines.inc.php
- ui/include/schema.inc.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 5f85ccd479d..dfa25a3b5d7 100644 --- a/include/dbschema.h +++ b/include/dbschema.h @@ -39,7 +39,7 @@ #define ZBX_TYPE_LONGTEXT 8 #define ZBX_TYPE_CUID 9 -#define ZBX_MAX_FIELDS 115 /* maximum number of fields in a table plus one for null terminator in dbschema.c */ +#define ZBX_MAX_FIELDS 116 /* 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 |