[#1405] updated schema scripts

diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
index 2f723c78e1c2efff77fd8a6f896854fb4820539c..a9f076613944ad6cc7a9cdc876aa98b94bc7eaaa 100644 (file)
--- a/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -3028,17 +3028,6 @@ SET version = '9', minor = '4';
 # This line concludes database upgrade to version 9.4.
 
 # Update reservation_mode value after separating flags.
-CREATE TABLE reservation_mode_type (
-    reservation_mode TINYINT PRIMARY KEY NOT NULL,    # Reservation mode code.
-    name VARCHAR(32)                                  # Reservation mode name.
-    ) ENGINE = INNODB;
-
-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, '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;
@@ -3048,6 +3037,10 @@ UPDATE dhcp4_shared_network SET reservation_mode = 4 WHERE reservation_mode = 2;
 UPDATE dhcp4_subnet SET reservation_mode = 2 WHERE reservation_mode = 3;
 UPDATE dhcp4_shared_network SET reservation_mode = 2 WHERE reservation_mode = 3;
 
+# update out-of-pool all to new value
+UPDATE dhcp4_subnet SET reservation_mode = 3 WHERE reservation_mode = 1;
+UPDATE dhcp4_shared_network SET reservation_mode = 3 WHERE reservation_mode = 1;
+
 # 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;
@@ -3056,6 +3049,10 @@ UPDATE dhcp6_shared_network SET reservation_mode = 4 WHERE reservation_mode = 2;
 UPDATE dhcp6_subnet SET reservation_mode = 2 WHERE reservation_mode = 3;
 UPDATE dhcp6_shared_network SET reservation_mode = 2 WHERE reservation_mode = 3;
 
+# update out-of-pool all to new value
+UPDATE dhcp6_subnet SET reservation_mode = 3 WHERE reservation_mode = 1;
+UPDATE dhcp6_shared_network SET reservation_mode = 3 WHERE reservation_mode = 1;
+
 # 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 1d4c81b783973fcb5b9b67b9f92b46469c808140..46a280e849d7c8117d56c6de9ba030ee5f9d88c3 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
@@ -19,17 +19,6 @@ fi
 mysql "$@" <<EOF
 
 # Update reservation_mode value after separating flags.
-CREATE TABLE reservation_mode_type (
-    reservation_mode TINYINT PRIMARY KEY NOT NULL,    # Reservation mode code.
-    name VARCHAR(32)                                  # Reservation mode name.
-    ) ENGINE = INNODB;
-
-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, '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;
@@ -39,6 +28,10 @@ UPDATE dhcp4_shared_network SET reservation_mode = 4 WHERE reservation_mode = 2;
 UPDATE dhcp4_subnet SET reservation_mode = 2 WHERE reservation_mode = 3;
 UPDATE dhcp4_shared_network SET reservation_mode = 2 WHERE reservation_mode = 3;
 
+# update out-of-pool all to new value
+UPDATE dhcp4_subnet SET reservation_mode = 3 WHERE reservation_mode = 1;
+UPDATE dhcp4_shared_network SET reservation_mode = 3 WHERE reservation_mode = 1;
+
 # 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;
@@ -47,6 +40,10 @@ UPDATE dhcp6_shared_network SET reservation_mode = 4 WHERE reservation_mode = 2;
 UPDATE dhcp6_subnet SET reservation_mode = 2 WHERE reservation_mode = 3;
 UPDATE dhcp6_shared_network SET reservation_mode = 2 WHERE reservation_mode = 3;
 
+# update out-of-pool all to new value
+UPDATE dhcp6_subnet SET reservation_mode = 3 WHERE reservation_mode = 1;
+UPDATE dhcp6_shared_network SET reservation_mode = 3 WHERE reservation_mode = 1;
+
 # Update the schema version number
 UPDATE schema_version
 SET version = '9', minor = '5';