mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-02 23:15:20 +00:00
Code Issues Releases Wiki Activity

[#396,!205] Fix issues in the core tests related to schema changes.

Browse Source
This commit is contained in:
Marcin Siodelski
2019-01-25 12:18:29 +01:00
parent c709b42fd0
commit c926fa96f4
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/mysql/mysql_constants.h
View File

@@ -1,4 +1,4 @@
// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2018-2019 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -32,7 +32,7 @@ const int MLM_MYSQL_FETCH_FAILURE = 0;
/// @name Current database schema version values. /// @name Current database schema version values.
//@{ //@{
const uint32_t MYSQL_SCHEMA_VERSION_MAJOR = 7; const uint32_t MYSQL_SCHEMA_VERSION_MAJOR = 8;
const uint32_t MYSQL_SCHEMA_VERSION_MINOR = 0; const uint32_t MYSQL_SCHEMA_VERSION_MINOR = 0;
//@} //@}

7
src/share/database/scripts/mysql/dhcpdb_create.mysql
View File

@@ -1607,6 +1607,8 @@ BEGIN
# set to 'dhcp4_options' is when the global option is added. # set to 'dhcp4_options' is when the global option is added.
# Global options do not have the owner. # Global options do not have the owner.
IF @cascade_transaction IS NULL OR @cascade_transaction = 0 THEN IF @cascade_transaction IS NULL OR @cascade_transaction = 0 THEN
# todo: host manager hasn't been updated to use audit
# mechanisms so ignore host specific options for now.
IF scope_id = 0 THEN IF scope_id = 0 THEN
# If a global option is added or modified, create audit # If a global option is added or modified, create audit
# entry for the 'dhcp4_options' table. # entry for the 'dhcp4_options' table.
@@ -1616,11 +1618,6 @@ BEGIN
# audit entry for the entire subnet, which indicates that # audit entry for the entire subnet, which indicates that
# it should be treated as the subnet update. # it should be treated as the subnet update.
CALL createAuditEntryDHCP4('dhcp4_subnet', subnet_id, "update"); CALL createAuditEntryDHCP4('dhcp4_subnet', subnet_id, "update");
ELSEIF scope_id = 3 THEN
# If host specific option is added or modified, create
# audit entry for the host, which indicates that it
# should be treated as the host update.
CALL createAuditEntryDHCP4('hosts', host_id, "update");
ELSEIF scope_id = 4 THEN ELSEIF scope_id = 4 THEN
# If shared network specific option is added or modified, # If shared network specific option is added or modified,
# create audit entry for the shared network which # create audit entry for the shared network which