[#1928] Fix class ordering procedure

The comparison of follow_class_name values during the class update must
take into account the case when both values are NULL.

diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
index 5d95fc39ad8187f0091bc0d312fe5bbd16028652..e862e9aa9eea0215be9581ac6f84fa49b8ae16f9 100644 (file)
--- a/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -3185,7 +3185,11 @@ proc_label:BEGIN
     );
 
     -- Bail if the class is updated without re-positioning.
-    IF (@depend_on_known_indirectly IS NOT NULL AND follow_class_name = old_follow_class_name) THEN
+    IF(
+        @depend_on_known_indirectly IS NOT NULL AND
+        ((follow_class_name IS NULL AND old_follow_class_name IS NULL) OR
+         (follow_class_name = old_follow_class_name))
+    ) THEN
         -- The depend_on_known_indirectly is set to 0 because this procedure is invoked
         -- whenever the dhcp4_client_class record is updated. Such update may include
         -- test expression changes impacting the dependency on KNOWN/UNKNOWN classes.
@@ -3641,7 +3645,11 @@ proc_label:BEGIN
     );
 
     -- Bail if the class is updated without re-positioning.
-    IF (@depend_on_known_indirectly IS NOT NULL AND follow_class_name = old_follow_class_name) THEN
+    IF(
+        @depend_on_known_indirectly IS NOT NULL AND
+        ((follow_class_name IS NULL AND old_follow_class_name IS NULL) OR
+         (follow_class_name = old_follow_class_name))
+    ) THEN
         -- The depend_on_known_indirectly is set to 0 because this procedure is invoked
         -- whenever the dhcp6_client_class record is updated. Such update may include
         -- test expression changes impacting the dependency on KNOWN/UNKNOWN classes.

diff --git a/src/share/database/scripts/mysql/upgrade_9.6_to_10.0.sh.in b/src/share/database/scripts/mysql/upgrade_9.6_to_10.0.sh.in
index ae3dcbed6b531a51053b39e08e418814571d972e..3b0be33b0e2940ce0e25c6c86e3b7104117a5c54 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_9.6_to_10.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_9.6_to_10.0.sh.in
@@ -133,7 +133,11 @@ proc_label:BEGIN
     );
 
     -- Bail if the class is updated without re-positioning.
-    IF (@depend_on_known_indirectly IS NOT NULL AND follow_class_name = old_follow_class_name) THEN
+    IF(
+        @depend_on_known_indirectly IS NOT NULL AND
+        ((follow_class_name IS NULL AND old_follow_class_name IS NULL) OR
+         (follow_class_name = old_follow_class_name))
+    ) THEN
         -- The depend_on_known_indirectly is set to 0 because this procedure is invoked
         -- whenever the dhcp4_client_class record is updated. Such update may include
         -- test expression changes impacting the dependency on KNOWN/UNKNOWN classes.
@@ -589,7 +593,11 @@ proc_label:BEGIN
     );
 
     -- Bail if the class is updated without re-positioning.
-    IF (@depend_on_known_indirectly IS NOT NULL AND follow_class_name = old_follow_class_name) THEN
+    IF(
+        @depend_on_known_indirectly IS NOT NULL AND
+        ((follow_class_name IS NULL AND old_follow_class_name IS NULL) OR
+         (follow_class_name = old_follow_class_name))
+    ) THEN
         -- The depend_on_known_indirectly is set to 0 because this procedure is invoked
         -- whenever the dhcp6_client_class record is updated. Such update may include
         -- test expression changes impacting the dependency on KNOWN/UNKNOWN classes.