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

diff --git a/src/lib/mysql/mysql_constants.h b/src/lib/mysql/mysql_constants.h
index 71d3a2fe9a4709728e9db42c267ac436af57e28d..ee1a8937e66ce2049026cc3791a136d044b09597 100644 (file)
--- a/src/lib/mysql/mysql_constants.h
+++ b/src/lib/mysql/mysql_constants.h
@@ -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
 // 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.
 //@{
-const uint32_t MYSQL_SCHEMA_VERSION_MAJOR = 7;
+const uint32_t MYSQL_SCHEMA_VERSION_MAJOR = 8;
 const uint32_t MYSQL_SCHEMA_VERSION_MINOR = 0;
 
 //@}

diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
index fa1f5d40b583e8d105443d324db7ed74b21fb9e7..d5110a42f31d9606a1b2b46a63c6c56c32e66cfb 100644 (file)
--- a/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -1607,6 +1607,8 @@ BEGIN
     # set to 'dhcp4_options' is when the global option is added.
     # Global options do not have the owner.
     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 a global option is added or modified, create audit
             # entry for the 'dhcp4_options' table.
@@ -1616,11 +1618,6 @@ BEGIN
             # audit entry for the entire subnet, which indicates that
             # it should be treated as the subnet 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
             # If shared network specific option is added or modified,
             # create audit entry for the shared network which