diff --git a/mozilla/webtools/bugzilla/editcomponents.cgi b/mozilla/webtools/bugzilla/editcomponents.cgi
index dcca05bbacb..30f9dd4ead5 100755
--- a/mozilla/webtools/bugzilla/editcomponents.cgi
+++ b/mozilla/webtools/bugzilla/editcomponents.cgi
@@ -608,15 +608,11 @@ if ($action eq 'delete') {
         while (MoreSQLData()) {
             my $bugid = FetchOneColumn();
 
-            my $query =
-                $::db->query("DELETE FROM attachments WHERE bug_id=$bugid")
-                or die "$::db_errstr";
-            $query =
-                $::db->query("DELETE FROM bugs_activity WHERE bug_id=$bugid")
-                or die "$::db_errstr";
-            $query =
-                $::db->query("DELETE FROM dependencies WHERE blocked=$bugid")
-                or die "$::db_errstr";
+            PushGlobalSQLState();
+            SendSQL("DELETE FROM attachments WHERE bug_id=$bugid");
+            SendSQL("DELETE FROM bugs_activity WHERE bug_id=$bugid");
+            SendSQL("DELETE FROM dependencies WHERE blocked=$bugid");
+            PopGlobalSQLState();
         }
         print "Attachments, bug activity and dependencies deleted.<BR>\n";
 
diff --git a/mozilla/webtools/bugzilla/editmilestones.cgi b/mozilla/webtools/bugzilla/editmilestones.cgi
index 57fe78830d5..4ceda927a76 100755
--- a/mozilla/webtools/bugzilla/editmilestones.cgi
+++ b/mozilla/webtools/bugzilla/editmilestones.cgi
@@ -425,15 +425,11 @@ if ($action eq 'delete') {
         while (MoreSQLData()) {
             my $bugid = FetchOneColumn();
 
-            my $query =
-                $::db->query("DELETE FROM attachments WHERE bug_id=$bugid")
-                or die "$::db_errstr";
-            $query =
-                $::db->query("DELETE FROM bugs_activity WHERE bug_id=$bugid")
-                or die "$::db_errstr";
-            $query =
-                $::db->query("DELETE FROM dependencies WHERE blocked=$bugid")
-                or die "$::db_errstr";
+            PushGlobalSQLState();
+            SendSQL("DELETE FROM attachments WHERE bug_id=$bugid");
+            SendSQL("DELETE FROM bugs_activity WHERE bug_id=$bugid");
+            SendSQL("DELETE FROM dependencies WHERE blocked=$bugid");
+            PopGlobalSQLState();
         }
         print "Attachments, bug activity and dependencies deleted.<BR>\n";
 
diff --git a/mozilla/webtools/bugzilla/editproducts.cgi b/mozilla/webtools/bugzilla/editproducts.cgi
index f5486f37b3d..73fdbf48747 100755
--- a/mozilla/webtools/bugzilla/editproducts.cgi
+++ b/mozilla/webtools/bugzilla/editproducts.cgi
@@ -599,15 +599,11 @@ if ($action eq 'delete') {
         while (MoreSQLData()) {
             my $bugid = FetchOneColumn();
 
-            my $query =
-                $::db->do("DELETE FROM attachments WHERE bug_id=$bugid")
-                or die "$::db_errstr";
-            $query =
-                $::db->do("DELETE FROM bugs_activity WHERE bug_id=$bugid")
-                or die "$::db_errstr";
-            $query =
-                $::db->do("DELETE FROM dependencies WHERE blocked=$bugid")
-                or die "$::db_errstr";
+            PushGlobalSQLState();
+            SendSQL("DELETE FROM attachments WHERE bug_id=$bugid");
+            SendSQL("DELETE FROM bugs_activity WHERE bug_id=$bugid");
+            SendSQL("DELETE FROM dependencies WHERE blocked=$bugid");
+            PopGlobalSQLState();
         }
         print "Attachments, bug activity and dependencies deleted.<BR>\n";
 
diff --git a/mozilla/webtools/bugzilla/editversions.cgi b/mozilla/webtools/bugzilla/editversions.cgi
index 0efbc070b86..381d28ed9fb 100755
--- a/mozilla/webtools/bugzilla/editversions.cgi
+++ b/mozilla/webtools/bugzilla/editversions.cgi
@@ -436,15 +436,11 @@ if ($action eq 'delete') {
         while (MoreSQLData()) {
             my $bugid = FetchOneColumn();
 
-            my $query =
-                $::db->query("DELETE FROM attachments WHERE bug_id=$bugid")
-                or die "$::db_errstr";
-            $query =
-                $::db->query("DELETE FROM bugs_activity WHERE bug_id=$bugid")
-                or die "$::db_errstr";
-            $query =
-                $::db->query("DELETE FROM dependencies WHERE blocked=$bugid")
-                or die "$::db_errstr";
+            PushGlobalSQLState();
+            SendSQL("DELETE FROM attachments WHERE bug_id=$bugid");
+            SendSQL("DELETE FROM bugs_activity WHERE bug_id=$bugid");
+            SendSQL("DELETE FROM dependencies WHERE blocked=$bugid");
+            PushGlobalSQLState();
         }
         print "Attachments, bug activity and dependencies deleted.<BR>\n";