[#1920] Apply 9 suggestion(s) to 4 file(s)

Corrected a couple of typos suggested in the review.

diff --git a/src/bin/admin/tests/mysql_tests.sh.in b/src/bin/admin/tests/mysql_tests.sh.in
index 986672e0748681eb8d21e83036a9855228cc8d0c..9910cbb70e0958c3118079d107287ef3894226b8 100644 (file)
--- a/src/bin/admin/tests/mysql_tests.sh.in
+++ b/src/bin/admin/tests/mysql_tests.sh.in
@@ -1571,7 +1571,7 @@ mysql_reservation_mode_upgrade_test() {
 mysql_client_class_test() {
     table_prefix="$1"
 
-    test_start "mysql_client_classes_test ${table_prefix}"
+    test_start "mysql_client_classes_test.${table_prefix}"
 
     # Let's wipe the whole database
     mysql_wipe
@@ -1632,7 +1632,7 @@ mysql_client_class_test() {
  COMMIT;"
     run_statement "insert client class bar" "$sql"
 
-    # Ensure that all thre classes have been added in the expected order.
+    # Ensure that all three classes have been added in the expected order.
     sql="SELECT o.order_index FROM ${table_prefix}_client_class AS c \
          INNER JOIN ${table_prefix}_client_class_order AS o \
              ON c.id = o.class_id WHERE c.name = 'foo'";

diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
index 4ecb9572094c046618f9ed938c2a9c4f8939b3d3..7402dc493c05376c04161e6def09b0c319fdc791 100644 (file)
--- a/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -3090,7 +3090,7 @@ UPDATE schema_version
 -- -----------------------------------------------------------------------
 -- Create a table holding the DHCPv4 client classes. Most table
 -- columns map directly to respective client class properties in
--- Kea configuration. The  depend_on_known_directly column is
+-- Kea configuration. The depend_on_known_directly column is
 -- explicitly set in an insert or update statement to indicate
 -- if the client class directly depends on KNOWN or UNKNOWN
 -- built-in classes. A caller should determine it by evaluating
@@ -3137,7 +3137,7 @@ CREATE TABLE IF NOT EXISTS dhcp4_client_class (
 -- If the follow_client_class specifies a name of an existing class,
 -- the generated order_index is set to an id of that class + 1, and
 -- the order_index values of the later classes are incremented by 1.
--- The depend_on_known_directly column holds a boolean value indicating
+-- The depend_on_known_indirectly column holds a boolean value indicating
 -- whether the given class depends on KNOWN/UKNOWN built-in classes
 -- via other classes, i.e. it depends on classes that directly or
 -- indirectly depend on these built-ins. This value is auto-generated
@@ -3518,7 +3518,7 @@ ALTER TABLE dhcp4_option_def
 -- -----------------------------------------------------------------------
 -- Create a table holding the DHCPv6 client classes. Most table
 -- columns map directly to respective client class properties in
--- Kea configuration. The  depend_on_known_directly column is
+-- Kea configuration. The depend_on_known_directly column is
 -- explicitly set in an insert or update statement to indicate
 -- if the client class directly depends on KNOWN or UNKNOWN
 -- built-in classes. A caller should determine it by evaluating

diff --git a/src/share/database/scripts/mysql/upgrade_9.6_to_10.0.sh.in b/src/share/database/scripts/mysql/upgrade_9.6_to_10.0.sh.in
index 030ebfc9f56af465e7e82b12c729fe6264f9c2fa..7832bd4722e0467ac5422a4cdd3077d5240371ae 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_9.6_to_10.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_9.6_to_10.0.sh.in
@@ -38,7 +38,7 @@ mysql "$@" <<EOF
 -- -----------------------------------------------------------------------
 -- Create a table holding the DHCPv4 client classes. Most table
 -- columns map directly to respective client class properties in
--- Kea configuration. The  depend_on_known_directly column is
+-- Kea configuration. The depend_on_known_directly column is
 -- explicitly set in an insert or update statement to indicate
 -- if the client class directly depends on KNOWN or UNKNOWN
 -- built-in classes. A caller should determine it by evaluating
@@ -466,7 +466,7 @@ ALTER TABLE dhcp4_option_def
 -- -----------------------------------------------------------------------
 -- Create a table holding the DHCPv6 client classes. Most table
 -- columns map directly to respective client class properties in
--- Kea configuration. The  depend_on_known_directly column is
+-- Kea configuration. The depend_on_known_directly column is
 -- explicitly set in an insert or update statement to indicate
 -- if the client class directly depends on KNOWN or UNKNOWN
 -- built-in classes. A caller should determine it by evaluating
@@ -510,7 +510,7 @@ CREATE TABLE IF NOT EXISTS dhcp6_client_class (
 -- If the follow_client_class specifies a name of an existing class,
 -- the generated order_index is set to an id of that class + 1, and
 -- the order_index values of the later classes are incremented by 1.
--- The depend_on_known_directly column holds a boolean value indicating
+-- The depend_on_known_indirectly column holds a boolean value indicating
 -- whether the given class depends on KNOWN/UKNOWN built-in classes
 -- via other classes, i.e. it depends on classes that directly or
 -- indirectly depend on these built-ins. This value is auto-generated

diff --git a/src/share/database/scripts/mysql/wipe_data.sh.in b/src/share/database/scripts/mysql/wipe_data.sh.in
index 7f8163adabe674c0fdd861f22992d7dd006bedd5..3720b01662174ad194795caf90fbdc9a942cd572 100644 (file)
--- a/src/share/database/scripts/mysql/wipe_data.sh.in
+++ b/src/share/database/scripts/mysql/wipe_data.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2019-2020 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2019-2021 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