[#1405] fix update script

diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
index 4871ba07e4364f9488431b773d591cb9c492dfe7..2f723c78e1c2efff77fd8a6f896854fb4820539c 100644 (file)
--- a/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -3036,16 +3036,26 @@ CREATE TABLE reservation_mode_type (
 START TRANSACTION;
 INSERT INTO reservation_mode_type VALUES (0, 'disabled');      # disabled
 INSERT INTO reservation_mode_type VALUES (1, 'out-of-pool');   # out-of-pool
-INSERT INTO reservation_mode_type VALUES (2, 'in-subnet');     # in-subnet
-INSERT INTO reservation_mode_type VALUES (3, 'all');           # all (in-subnet + out-of-pool)
+INSERT INTO reservation_mode_type VALUES (2, 'all');           # in-subnet
 INSERT INTO reservation_mode_type VALUES (4, 'global');        # global
 COMMIT;
 
+# update old global to new value
 UPDATE dhcp4_subnet SET reservation_mode = 4 WHERE reservation_mode = 2;
 UPDATE dhcp4_shared_network SET reservation_mode = 4 WHERE reservation_mode = 2;
+
+# update old all to new value
+UPDATE dhcp4_subnet SET reservation_mode = 2 WHERE reservation_mode = 3;
+UPDATE dhcp4_shared_network SET reservation_mode = 2 WHERE reservation_mode = 3;
+
+# update old global to new value
 UPDATE dhcp6_subnet SET reservation_mode = 4 WHERE reservation_mode = 2;
 UPDATE dhcp6_shared_network SET reservation_mode = 4 WHERE reservation_mode = 2;
 
+# update old all to new value
+UPDATE dhcp6_subnet SET reservation_mode = 2 WHERE reservation_mode = 3;
+UPDATE dhcp6_shared_network SET reservation_mode = 2 WHERE reservation_mode = 3;
+
 # Update the schema version number
 UPDATE schema_version
 SET version = '9', minor = '5';

diff --git a/src/share/database/scripts/mysql/upgrade_9.4_to_9.5.sh.in b/src/share/database/scripts/mysql/upgrade_9.4_to_9.5.sh.in
index b2f3f4a43b00923ac5bfbb3bcbb79f028f6f75c2..1d4c81b783973fcb5b9b67b9f92b46469c808140 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_9.4_to_9.5.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_9.4_to_9.5.sh.in
@@ -27,16 +27,26 @@ CREATE TABLE reservation_mode_type (
 START TRANSACTION;
 INSERT INTO reservation_mode_type VALUES (0, 'disabled');      # disabled
 INSERT INTO reservation_mode_type VALUES (1, 'out-of-pool');   # out-of-pool
-INSERT INTO reservation_mode_type VALUES (2, 'in-subnet');     # in-subnet
-INSERT INTO reservation_mode_type VALUES (3, 'all');           # all (in-subnet + out-of-pool)
+INSERT INTO reservation_mode_type VALUES (2, 'all');           # in-subnet
 INSERT INTO reservation_mode_type VALUES (4, 'global');        # global
 COMMIT;
 
+# update old global to new value
 UPDATE dhcp4_subnet SET reservation_mode = 4 WHERE reservation_mode = 2;
 UPDATE dhcp4_shared_network SET reservation_mode = 4 WHERE reservation_mode = 2;
+
+# update old all to new value
+UPDATE dhcp4_subnet SET reservation_mode = 2 WHERE reservation_mode = 3;
+UPDATE dhcp4_shared_network SET reservation_mode = 2 WHERE reservation_mode = 3;
+
+# update old global to new value
 UPDATE dhcp6_subnet SET reservation_mode = 4 WHERE reservation_mode = 2;
 UPDATE dhcp6_shared_network SET reservation_mode = 4 WHERE reservation_mode = 2;
 
+# update old all to new value
+UPDATE dhcp6_subnet SET reservation_mode = 2 WHERE reservation_mode = 3;
+UPDATE dhcp6_shared_network SET reservation_mode = 2 WHERE reservation_mode = 3;
+
 # Update the schema version number
 UPDATE schema_version
 SET version = '9', minor = '5';