[master] Merge branch 'trac5208a' (preparations for host_cmds hook)

diff --cc src/share/database/scripts/mysql/dhcpdb_create.mysql
index d167e3aeff38729d08e0d530bf7126a3653e9f93,ba946f7b9b42ef8c254f557751f5bb98cb86572a..1ebbcee3486d70898d1d0859646d57a585aa74a5
--- 1/src/share/database/scripts/mysql/dhcpdb_create.mysql
--- 2/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@@ -480,10 -480,24 +480,25 @@@ UPDATE schema_versio
  SET version = '5', minor = '0';
  # This line concludes database upgrade to version 5.0.
  
 -# Add missing 'client-id' host identifier type.
 +# Add missing 'client-id' and new 'flex-id' host identifier types.
  INSERT INTO host_identifier_type VALUES (3, 'client-id');
 +INSERT INTO host_identifier_type VALUES (4, 'flex-id');
  
+ # Recreate the trigger removing dependent host entries.
+ DROP TRIGGER host_BDEL;
+ 
+ DELIMITER $$
+ CREATE TRIGGER host_BDEL BEFORE DELETE ON hosts FOR EACH ROW
+ -- Edit trigger body code below this line. Do not edit lines above this one
+ BEGIN
+ DELETE FROM ipv6_reservations WHERE ipv6_reservations.host_id = OLD.host_id;
+ DELETE FROM dhcp4_options WHERE dhcp4_options.host_id = OLD.host_id;
+ DELETE FROM dhcp6_options WHERE dhcp6_options.host_id = OLD.host_id;
+ END
+ $$
+ DELIMITER ;
+ 
+ 
  # Update the schema version number
  UPDATE schema_version
  SET version = '5', minor = '1';

diff --cc src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in
index 99bccebb5bfe4cb6d81a074cb77975340903e865,f8440b3a1222d9f0f8da553a485fb8631366d42a..14d0ef013910731994cb03cd477c089841e09566
--- 1/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in
--- 2/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in
@@@ -17,10 -17,23 +17,24 @@@ f
  
  mysql "$@" <<EOF
  
 -# Add missing 'client-id' host identifier type.
 +# Add missing 'client-id' and new 'flex-id' host identifier types.
  INSERT INTO host_identifier_type VALUES (3, 'client-id');
 +INSERT INTO host_identifier_type VALUES (4, 'flex-id');
  
+ # Recreate the trigger removing dependent host entries.
+ DROP TRIGGER host_BDEL;
+ 
+ DELIMITER $$
+ CREATE TRIGGER host_BDEL BEFORE DELETE ON hosts FOR EACH ROW
+ -- Edit trigger body code below this line. Do not edit lines above this one
+ BEGIN
+ DELETE FROM ipv6_reservations WHERE ipv6_reservations.host_id = OLD.host_id;
+ DELETE FROM dhcp4_options WHERE dhcp4_options.host_id = OLD.host_id;
+ DELETE FROM dhcp6_options WHERE dhcp6_options.host_id = OLD.host_id;
+ END
+ $$
+ DELIMITER ;
+ 
  # Update the schema version number
  UPDATE schema_version
  SET version = '5', minor = '1';