diff options
Diffstat (limited to 'src')
5 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/cc/command_interpreter.cc b/src/lib/cc/command_interpreter.cc index 1bdd329d19..be7048e7db 100644 --- a/src/lib/cc/command_interpreter.cc +++ b/src/lib/cc/command_interpreter.cc @@ -220,7 +220,7 @@ parseCommandWithArgs(ConstElementPtr& arg, ConstElementPtr command) { // Arguments must be a map. if (arg->getType() != Element::map) { isc_throw(CtrlChannelError, - "invalid command '" << command_name << "': expected " + "invalid command '" << command_name << "': expected '" << CONTROL_ARGUMENTS << "' to be a map, got " << Element::typeToName(arg->getType()) << " instead"); } diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql index d6784e13ae..b0b60b6651 100644 --- a/src/share/database/scripts/mysql/dhcpdb_create.mysql +++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql @@ -5091,7 +5091,7 @@ UPDATE schema_version -- This line starts the schema upgrade to version 16. --- Add relay and remote id colums to DHCPv4 leases. +-- Add relay and remote id columns to DHCPv4 leases. -- -- Note: these columns are only used for indexes, in particular they are -- not exported by lease4 dump as values are also in the user context diff --git a/src/share/database/scripts/mysql/upgrade_015_to_016.sh.in b/src/share/database/scripts/mysql/upgrade_015_to_016.sh.in index 05e0396162..fe89202c76 100644 --- a/src/share/database/scripts/mysql/upgrade_015_to_016.sh.in +++ b/src/share/database/scripts/mysql/upgrade_015_to_016.sh.in @@ -54,7 +54,7 @@ fi mysql "$@" <<EOF -- This line starts the schema upgrade to version 16. --- Add relay and remote id colums to DHCPv4 leases. +-- Add relay and remote id columns to DHCPv4 leases. -- -- Note: these columns are only used for indexes, in particular they are -- not exported by lease4 dump as values are also in the user context diff --git a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql index e4d3f53155..f172b5169c 100644 --- a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql +++ b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql @@ -5651,7 +5651,7 @@ UPDATE schema_version -- This line starts the schema upgrade to version 15. --- Add relay and remote id colums to DHCPv4 leases. +-- Add relay and remote id columns to DHCPv4 leases. -- -- Note: these columns are only used for indexes, in particular they are -- not exported by lease4 dump as values are also in the user context diff --git a/src/share/database/scripts/pgsql/upgrade_014_to_015.sh.in b/src/share/database/scripts/pgsql/upgrade_014_to_015.sh.in index 2681e6c579..420e07f5b4 100644 --- a/src/share/database/scripts/pgsql/upgrade_014_to_015.sh.in +++ b/src/share/database/scripts/pgsql/upgrade_014_to_015.sh.in @@ -38,7 +38,7 @@ START TRANSACTION; -- This line starts the schema upgrade to version 15. --- Add relay and remote id colums to DHCPv4 leases. +-- Add relay and remote id columns to DHCPv4 leases. -- -- Note: these columns are only used for indexes, in particular they are -- not exported by lease4 dump as values are also in the user context |