diff options
| author | Andris Zeila <andris.zeila@zabbix.com> | 2022-11-09 11:42:02 +0300 |
|---|---|---|
| committer | Andris Zeila <andris.zeila@zabbix.com> | 2022-11-09 11:43:58 +0300 |
| commit | 651b2dde2f96b14b78079b84ad24ab452c8a90e9 (patch) | |
| tree | 0017116ec0129c3b6778bd4b9118363e909a6e1f | |
| parent | 6b5f96bb0051ebc0bbf56170815053d2d81036f4 (diff) | |
.......... [ZBX-21869] fixed database upgrade from 5.0 on setups requiring primary keys for tables
Merge in ZBX/zabbix from feature/ZBX-21869-6.0 to release/6.0
* commit '94ed6d554f2faea1576437cea95b18e94e7b9976':
.D........ [ZBX-21869] added changelog entry
.......... [ZBX-21869] added primary key to the initial trigger_queue table creation patch
(cherry picked from commit fc92ce1021f3f3760b8e651ab423bf070a1f5057)
| -rw-r--r-- | ChangeLog.d/bugfix/ZBX-21869 | 1 | ||||
| -rw-r--r-- | src/libs/zbxdbupgrade/dbupgrade_5010.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog.d/bugfix/ZBX-21869 b/ChangeLog.d/bugfix/ZBX-21869 new file mode 100644 index 00000000000..3591d2cbc09 --- /dev/null +++ b/ChangeLog.d/bugfix/ZBX-21869 @@ -0,0 +1 @@ +.......... [ZBX-21869] fixed database upgrade from 5.0 on setups requiring primary keys for tables (wiper) diff --git a/src/libs/zbxdbupgrade/dbupgrade_5010.c b/src/libs/zbxdbupgrade/dbupgrade_5010.c index 7c982585efc..4c5a690be0e 100644 --- a/src/libs/zbxdbupgrade/dbupgrade_5010.c +++ b/src/libs/zbxdbupgrade/dbupgrade_5010.c @@ -329,8 +329,9 @@ static int DBpatch_5010036(void) static int DBpatch_5010037(void) { const ZBX_TABLE table = - {"trigger_queue", "", 0, + {"trigger_queue", "trigger_queueid", 0, { + {"trigger_queueid", NULL, NULL, NULL, 0, ZBX_TYPE_ID, ZBX_NOTNULL, 0}, {"objectid", NULL, NULL, NULL, 0, ZBX_TYPE_ID, ZBX_NOTNULL, 0}, {"type", "0", NULL, NULL, 0, ZBX_TYPE_INT, ZBX_NOTNULL, 0}, {"clock", "0", NULL, NULL, 0, ZBX_TYPE_INT, ZBX_NOTNULL, 0}, |