Skip to content

Commit 52797cb

Browse files
committed
[#3587] Fixed sql scripts and fuzzing
Changes to be committed: modified: ../../../fuzz/fuzz.h modified: ../../lib/dhcpsrv/ip_range_permutation.h modified: ../../lib/util/bigints.h modified: ../../share/database/scripts/mysql/dhcpdb_create.mysql modified: ../../share/database/scripts/mysql/upgrade_025_to_026.sh.in modified: ../../share/database/scripts/pgsql/dhcpdb_create.pgsql modified: ../../share/database/scripts/pgsql/upgrade_025_to_026.sh.in
1 parent 00ecd98 commit 52797cb

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

fuzz/fuzz.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ writeToFile(std::string const& file, std::string const& content);
3232
bool
3333
byteStreamToPacketData(uint8_t const* data, size_t size, std::vector<uint8_t>& byte_stream);
3434

35-
} // extern "C"
35+
} // extern "C"

src/lib/dhcpsrv/ip_range_permutation.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace dhcp {
2323
///
2424
/// This class is used to shuffle IP addresses or delegated prefixes within
2525
/// the specified range. It is following the Fisher-Yates shuffle algorithm
26-
/// described in https://en.wikipedia.org/wiki/FisherYates_shuffle.
26+
/// described in https://en.wikipedia.org/wiki/Fisher-Yates_shuffle.
2727
///
2828
/// The original algorithm is modified to keep the minimal information about
2929
/// the current state of the permutation and relies on the caller to collect

src/lib/util/bigints.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ using uint128_t = boost::multiprecision::checked_uint128_t;
2323
} // namespace util
2424
} // namespace isc
2525

26-
#endif // UTIL_BIGINTS_H
26+
#endif // UTIL_BIGINTS_H

src/share/database/scripts/mysql/dhcpdb_create.mysql

+1-1
Original file line numberDiff line numberDiff line change
@@ -6032,7 +6032,7 @@ ALTER TABLE dhcp4_options
60326032
ALTER TABLE dhcp6_options
60336033
ADD COLUMN client_classes LONGTEXT DEFAULT NULL;
60346034

6035-
UPDATE option_def_data_type SET name='int8' where id = 3;
6035+
UPDATE option_def_data_type SET name='int8' WHERE id = 3;
60366036

60376037
-- Rename require_client_classes and only_if_required.
60386038
ALTER TABLE dhcp4_shared_network

src/share/database/scripts/mysql/upgrade_025_to_026.sh.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ ALTER TABLE dhcp4_options
6363
ALTER TABLE dhcp6_options
6464
ADD COLUMN client_classes LONGTEXT DEFAULT NULL;
6565
66-
UPDATE option_def_data_type SET name='int8' where id = 3;
66+
UPDATE option_def_data_type SET name='int8' WHERE id = 3;
6767
6868
-- Rename require_client_classes and only_if_required.
6969
ALTER TABLE dhcp4_shared_network

src/share/database/scripts/pgsql/dhcpdb_create.pgsql

+1-1
Original file line numberDiff line numberDiff line change
@@ -6493,7 +6493,7 @@ ALTER TABLE dhcp4_options
64936493
ALTER TABLE dhcp6_options
64946494
ADD COLUMN client_classes TEXT DEFAULT NULL;
64956495

6496-
UPDATE option_def_data_type SET name='int8' where id = 3;
6496+
UPDATE option_def_data_type SET name='int8' WHERE id = 3;
64976497

64986498
-- Rename require_client_classes and only_if_required.
64996499
ALTER TABLE dhcp4_shared_network

src/share/database/scripts/pgsql/upgrade_025_to_026.sh.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ ALTER TABLE dhcp4_options
4646
ALTER TABLE dhcp6_options
4747
ADD COLUMN client_classes TEXT DEFAULT NULL;
4848
49-
UPDATE option_def_data_type SET name='int8' where id = 3;
49+
UPDATE option_def_data_type SET name='int8' WHERE id = 3;
5050
5151
-- Rename require_client_classes and only_if_required.
5252
ALTER TABLE dhcp4_shared_network

0 commit comments

Comments
 (0)