From c8f9a95bc34fcb0b07c38088ae3ee5ae8459b9fe Mon Sep 17 00:00:00 2001 From: Razvan Becheriu Date: Tue, 13 Oct 2020 17:40:53 +0300 Subject: [PATCH] [#1405] fixed unittests --- src/bin/admin/tests/mysql_tests.sh.in | 6 +++--- src/lib/mysql/mysql_constants.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/admin/tests/mysql_tests.sh.in b/src/bin/admin/tests/mysql_tests.sh.in index eefde56512..8ff6c1e2ea 100644 --- a/src/bin/admin/tests/mysql_tests.sh.in +++ b/src/bin/admin/tests/mysql_tests.sh.in @@ -264,7 +264,7 @@ mysql_upgrade_test() { assert_str_eq "1.0" ${version} "Expected kea-admin to return %s, returned value was %s" - # Ok, we have a 1.0 database. Let's upgrade it to 9.4 + # Ok, we have a 1.0 database. Let's upgrade it to 9.5 ${keaadmin} db-upgrade mysql -u $db_user -p $db_password -n $db_name -d $db_scripts_dir ERRCODE=$? @@ -766,9 +766,9 @@ insert into hosts(dhcp_identifier, dhcp_identifier_type, dhcp4_subnet_id, ipv4_a ERRCODE=$? assert_eq 0 $ERRCODE "insert into hosts failed, expected exit code %d, actual %d" - # Verify upgraded schema reports version 9.4 + # Verify upgraded schema reports version 9.5 version=$(${keaadmin} db-version mysql -u $db_user -p $db_password -n $db_name -d $db_scripts_dir) - assert_str_eq "9.4" ${version} "Expected kea-admin to return %s, returned value was %s" + assert_str_eq "9.5" ${version} "Expected kea-admin to return %s, returned value was %s" # Let's wipe the whole database mysql_wipe diff --git a/src/lib/mysql/mysql_constants.h b/src/lib/mysql/mysql_constants.h index 534fedf9f8..5f33e768b8 100644 --- a/src/lib/mysql/mysql_constants.h +++ b/src/lib/mysql/mysql_constants.h @@ -53,7 +53,7 @@ const int MLM_MYSQL_FETCH_FAILURE = 0; /// @name Current database schema version values. //@{ const uint32_t MYSQL_SCHEMA_VERSION_MAJOR = 9; -const uint32_t MYSQL_SCHEMA_VERSION_MINOR = 4; +const uint32_t MYSQL_SCHEMA_VERSION_MINOR = 5; //@}