[#89,!22] Auto increment option id.

diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
index 63c30f9c3ac28f898a8d143dedaee62d28d66d3b..a3a2d6500edf1285394826982b0be36452846494 100644 (file)
--- a/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -999,7 +999,7 @@ CREATE TABLE IF NOT EXISTS dhcp4_subnet_server (
 
 
 # Modify the primary key to BINGINT as other tables have.
-ALTER TABLE dhcp4_options MODIFY option_id BIGINT(20) UNSIGNED NOT NULL;
+ALTER TABLE dhcp4_options MODIFY option_id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT;
 
 # Add conifguration backend specific columns.
 ALTER TABLE dhcp4_options
@@ -1251,7 +1251,7 @@ CREATE TABLE IF NOT EXISTS dhcp6_pool (
 ) ENGINE=InnoDB;
 
 # Modify the primary key to BINGINT as other tables have.
-ALTER TABLE dhcp6_options MODIFY option_id BIGINT(20) UNSIGNED NOT NULL;
+ALTER TABLE dhcp6_options MODIFY option_id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT;
 
 # Add conifguration backend specific columns.
 ALTER TABLE dhcp6_options

diff --git a/src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh.in b/src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh.in
index b0d522b8e9d41c742d847e54bb21ca0d65413ab8..b482afe92d72b0b641281236490f19a3f377ad62 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh.in
@@ -327,7 +327,7 @@ CREATE TABLE IF NOT EXISTS dhcp4_subnet_server (
 
 # Modify the primary key to BINGINT as other tables have.
 #
-ALTER TABLE dhcp4_options MODIFY option_id BIGINT(20) UNSIGNED NOT NULL;
+ALTER TABLE dhcp4_options MODIFY option_id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT;
 
 # Add conifguration backend specific columns.
 ALTER TABLE dhcp4_options
@@ -562,7 +562,7 @@ CREATE TABLE IF NOT EXISTS dhcp6_pool (
 ) ENGINE=InnoDB;
 
 # Modify the primary key to BINGINT as other tables have.
-ALTER TABLE dhcp6_options MODIFY option_id BIGINT(20) UNSIGNED NOT NULL;
+ALTER TABLE dhcp6_options MODIFY option_id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT;
 
 # Add conifguration backend specific columns.
 ALTER TABLE dhcp6_options