[642-update-mysql-cb-with-calls-to-set-delete-and-retrieve-servers] Changed new schema to 8.1 (vs 9.0) and addressed trivial comments

src/share/database/scripts/mysql/upgrade_8.0_to_8.1.sh.in

@@ -38,6 +38,60 @@ ALTER TABLE dhcp6_subnet
     ADD COLUMN min_valid_lifetime INT(10) DEFAULT NULL,
     ADD COLUMN max_valid_lifetime INT(10) DEFAULT NULL;
 
+# Create dhcp4_server insert trigger
+DELIMITER $$
+CREATE TRIGGER dhcp4_server_AINS AFTER INSERT ON dhcp4_server
+    FOR EACH ROW
+    BEGIN
+        CALL createAuditEntryDHCP4('dhcp4_server', NEW.id, "create");
+    END $$
+DELIMITER ;
+
+# Create dhcp4_server update trigger
+DELIMITER $$
+CREATE TRIGGER dhcp4_server_AUPD AFTER UPDATE ON dhcp4_server
+    FOR EACH ROW
+    BEGIN
+        CALL createAuditEntryDHCP4('dhcp4_server', NEW.id, "update");
+    END $$
+DELIMITER ;
+
+# Create dhcp4_server delete trigger
+DELIMITER $$
+CREATE TRIGGER dhcp4_server_ADEL AFTER DELETE ON dhcp4_server
+    FOR EACH ROW
+    BEGIN
+        CALL createAuditEntryDHCP4('dhcp4_server', OLD.id, "delete");
+    END $$
+DELIMITER ;
+
+# Create dhcp6_server insert trigger
+DELIMITER $$
+CREATE TRIGGER dhcp6_server_AINS AFTER INSERT ON dhcp6_server
+    FOR EACH ROW
+    BEGIN
+        CALL createAuditEntryDHCP6('dhcp6_server', NEW.id, "create");
+    END $$
+DELIMITER ;
+
+# Create dhcp6_server update trigger
+DELIMITER $$
+CREATE TRIGGER dhcp6_server_AUPD AFTER UPDATE ON dhcp6_server
+    FOR EACH ROW
+    BEGIN
+        CALL createAuditEntryDHCP6('dhcp6_server', NEW.id, "update");
+    END $$
+DELIMITER ;
+
+# Create dhcp6_server delete trigger
+DELIMITER $$
+CREATE TRIGGER dhcp6_server_ADEL AFTER DELETE ON dhcp6_server
+    FOR EACH ROW
+    BEGIN
+        CALL createAuditEntryDHCP6('dhcp6_server', OLD.id, "delete");
+    END $$
+DELIMITER ;
+
 # Update the schema version number
 UPDATE schema_version
 SET version = '8', minor = '1';

src/share/database/scripts/mysql/upgrade_8.0_to_9.0.sh.in

@@ -1,84 +0,0 @@
-#!/bin/sh
-
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
-    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
-else
-    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
-fi
-
-VERSION=`mysql_version "$@"`
-
-if [ "$VERSION" != "8.0" ]; then
-    printf "This script upgrades 8.0 to 9.0. Reported version is $VERSION. Skipping upgrade.\n"
-    exit 0
-fi
-
-mysql "$@" <<EOF
-
-# Create dhcp4_server insert trigger
-DELIMITER $$
-CREATE TRIGGER dhcp4_server_AINS AFTER INSERT ON dhcp4_server
-    FOR EACH ROW
-    BEGIN
-        CALL createAuditEntryDHCP4('dhcp4_server', NEW.id, "create");
-    END $$
-DELIMITER ;
-
-# Create dhcp4_server update trigger
-DELIMITER $$
-CREATE TRIGGER dhcp4_server_AUPD AFTER UPDATE ON dhcp4_server
-    FOR EACH ROW
-    BEGIN
-        CALL createAuditEntryDHCP4('dhcp4_server', NEW.id, "update");
-    END $$
-DELIMITER ;
-
-# Create dhcp4_server delete trigger
-DELIMITER $$
-CREATE TRIGGER dhcp4_server_ADEL AFTER DELETE ON dhcp4_server
-    FOR EACH ROW
-    BEGIN
-        CALL createAuditEntryDHCP4('dhcp4_server', OLD.id, "delete");
-    END $$
-DELIMITER ;
-
-# Create dhcp6_server insert trigger
-DELIMITER $$
-CREATE TRIGGER dhcp6_server_AINS AFTER INSERT ON dhcp6_server
-    FOR EACH ROW
-    BEGIN
-        CALL createAuditEntryDHCP6('dhcp6_server', NEW.id, "create");
-    END $$
-DELIMITER ;
-
-# Create dhcp6_server update trigger
-DELIMITER $$
-CREATE TRIGGER dhcp6_server_AUPD AFTER UPDATE ON dhcp6_server
-    FOR EACH ROW
-    BEGIN
-        CALL createAuditEntryDHCP6('dhcp6_server', NEW.id, "update");
-    END $$
-DELIMITER ;
-
-# Create dhcp6_server delete trigger
-DELIMITER $$
-CREATE TRIGGER dhcp6_server_ADEL AFTER DELETE ON dhcp6_server
-    FOR EACH ROW
-    BEGIN
-        CALL createAuditEntryDHCP6('dhcp6_server', OLD.id, "delete");
-    END $$
-DELIMITER ;
-
-# Update the schema version number
-UPDATE schema_version
-SET version = '9', minor = '0';
-
-# This line concludes database upgrade to version 9.0.
-
-EOF
-
-RESULT=$?
-
-exit $?