[354-compilation-with-mysql-fails-on-fedora-29] Updated schema & upgrade

diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
index 3672f53c7f232c5de9e0cedd4d6f2e73eb09314b..5fb00b5021ca0799bb8356ef9fa0fa988e87e49b 100644 (file)
--- a/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -1374,7 +1374,8 @@ ALTER TABLE dhcp4_subnet_server
     MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp4_options
-    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL
+    DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE dhcp4_options_server
     MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
@@ -1413,7 +1414,8 @@ ALTER TABLE dhcp6_subnet_server
     MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp6_options
-    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL
+    DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE dhcp6_options_server
     MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;

diff --git a/src/share/database/scripts/mysql/upgrade_7.0_to_8.0.sh.in b/src/share/database/scripts/mysql/upgrade_7.0_to_8.0.sh.in
index 3bf915266f5f066e197d704646e6bb3c7d4bedf0..d43cc5fab972bd6c9660d5a053a8a3aad68d4163 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_7.0_to_8.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_7.0_to_8.0.sh.in
@@ -57,7 +57,8 @@ ALTER TABLE dhcp4_subnet_server
     MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp4_options
-    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL
+    DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE dhcp4_options_server
     MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
@@ -96,7 +97,8 @@ ALTER TABLE dhcp6_subnet_server
     MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp6_options
-    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL
+    DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE dhcp6_options_server
     MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;