....I..... [ZBXNEXT-826] updated database version [6.0.0]6.0.0

5 files changed, 49 insertions, 3 deletions

diff --git a/create/src/schema.tmpl b/create/src/schema.tmpl
index 27fb842f1d2..a55cb105395 100644
--- a/create/src/schema.tmpl
+++ b/create/src/schema.tmpl
@@ -1936,5 +1936,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		|5050147	|5050147
+ROW		|1		|6000000	|6000000
diff --git a/src/libs/zbxdbupgrade/Makefile.am b/src/libs/zbxdbupgrade/Makefile.am
index 4887c8d5907..5217278f74f 100644
--- a/src/libs/zbxdbupgrade/Makefile.am
+++ b/src/libs/zbxdbupgrade/Makefile.am
@@ -27,6 +27,7 @@ libzbxdbupgrade_a_SOURCES = \
 	dbupgrade_5030.c \
 	dbupgrade_5040.c \
 	dbupgrade_5050.c \
+	dbupgrade_6000.c \
 	dbupgrade_macros.c \
 	dbupgrade_macros.h \
 	dbupgrade.h
diff --git a/src/libs/zbxdbupgrade/dbupgrade.c b/src/libs/zbxdbupgrade/dbupgrade.c
index e2f96463536..f2a1e40b128 100644
--- a/src/libs/zbxdbupgrade/dbupgrade.c
+++ b/src/libs/zbxdbupgrade/dbupgrade.c
@@ -781,6 +781,7 @@ extern zbx_dbpatch_t	DBPATCH_VERSION(5020)[];
 extern zbx_dbpatch_t	DBPATCH_VERSION(5030)[];
 extern zbx_dbpatch_t	DBPATCH_VERSION(5040)[];
 extern zbx_dbpatch_t	DBPATCH_VERSION(5050)[];
+extern zbx_dbpatch_t	DBPATCH_VERSION(6000)[];
 
 static zbx_db_version_t dbversions[] = {
 	{DBPATCH_VERSION(2010), "2.2 development"},
@@ -806,6 +807,7 @@ static zbx_db_version_t dbversions[] = {
 	{DBPATCH_VERSION(5030), "5.4 development"},
 	{DBPATCH_VERSION(5040), "5.4 maintenance"},
 	{DBPATCH_VERSION(5050), "6.0 development"},
+	{DBPATCH_VERSION(6000), "6.0 maintenance"},
 	{NULL}
 };
 
diff --git a/src/libs/zbxdbupgrade/dbupgrade_6000.c b/src/libs/zbxdbupgrade/dbupgrade_6000.c
new file mode 100644
index 00000000000..02e39f9687b
--- /dev/null
+++ b/src/libs/zbxdbupgrade/dbupgrade_6000.c
@@ -0,0 +1,44 @@
+/*
+** Zabbix
+** Copyright (C) 2001-2022 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+#include "common.h"
+#include "dbupgrade.h"
+
+extern unsigned char	program_type;
+
+/*
+ * 6.0 maintenance database patches
+ */
+
+#ifndef HAVE_SQLITE3
+
+static int	DBpatch_6000000(void)
+{
+	return SUCCEED;
+}
+
+#endif
+
+DBPATCH_START(6000)
+
+/* version, duplicates flag, mandatory flag */
+
+DBPATCH_ADD(6000000, 0, 1)
+
+DBPATCH_END()
diff --git a/ui/include/defines.inc.php b/ui/include/defines.inc.php
index 5b47c622797..67348d76705 100644
--- a/ui/include/defines.inc.php
+++ b/ui/include/defines.inc.php
@@ -22,7 +22,7 @@ define('ZABBIX_VERSION',		'6.0.0');
 define('ZABBIX_API_VERSION',	'6.0.0');
 define('ZABBIX_EXPORT_VERSION',	'6.0');
 
-define('ZABBIX_DB_VERSION',		5050147);
+define('ZABBIX_DB_VERSION',		6000000);
 
 define('DB_VERSION_SUPPORTED',				0);
 define('DB_VERSION_LOWER_THAN_MINIMUM',		1);