[#2909] Readd not null constraint

diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
index 53fdd0c28f4a3f0b25f84c819a60bf89c767ad11..d05ccaede082540932d1639c7609a7c805affb49 100644 (file)
--- a/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -5707,6 +5707,7 @@ ALTER TABLE ipv6_reservations MODIFY COLUMN address VARCHAR(39) DEFAULT NULL;
 UPDATE ipv6_reservations set address = NULL;
 ALTER TABLE ipv6_reservations MODIFY COLUMN address BINARY(16);
 UPDATE ipv6_reservations set address = binaddr;
+ALTER TABLE ipv6_reservations MODIFY COLUMN address BINARY(16) NOT NULL;
 ALTER TABLE ipv6_reservations DROP COLUMN binaddr;
 
 -- Convert binary lease6 address to text

diff --git a/src/share/database/scripts/mysql/upgrade_018_to_019.sh.in b/src/share/database/scripts/mysql/upgrade_018_to_019.sh.in
index 7f7557d767cdde195037837df864c51ea7825db2..c9f123676c38629483b854dbc5cf87e8226de1a6 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_018_to_019.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_018_to_019.sh.in
@@ -83,6 +83,7 @@ ALTER TABLE ipv6_reservations MODIFY COLUMN address VARCHAR(39) DEFAULT NULL;
 UPDATE ipv6_reservations set address = NULL;
 ALTER TABLE ipv6_reservations MODIFY COLUMN address BINARY(16);
 UPDATE ipv6_reservations set address = binaddr;
+ALTER TABLE ipv6_reservations MODIFY COLUMN address BINARY(16) NOT NULL;
 ALTER TABLE ipv6_reservations DROP COLUMN binaddr;
 
 -- Convert binary lease6 address to text