catch unexpected ingres errors in a more sensible manner

diff --git a/server/qrtn.qc b/server/qrtn.qc
index a709f57a02bc81085169a4264e48acd92daab7d5..013903f6d87cf63333f6c4b51a69d66eaea0faee 100644 (file)
--- a/server/qrtn.qc
+++ b/server/qrtn.qc
@@ -317,6 +317,12 @@ sms_process_query(cl, name, argc, argv_ro, action, actarg)
     }
 
 out:
+    if (status == SMS_SUCCESS && ingres_errno != 0) {
+       com_err(whoami, SMS_INTERNAL, "Server didn't notice INGRES ERROR %d",
+                      ingres_errno);
+       status = sms_errcode;
+    }
+
     if (q->type != RETRIEVE) {
         if (status == SMS_SUCCESS) {
 ##          end transaction    /* commit to this */
@@ -348,12 +354,6 @@ out:
 ##      set lockmode session where readlock = system
     }
 
-    if (status == SMS_SUCCESS && ingres_errno != 0) {
-       critical_alert("SMS", "Server didn't notice INGRES ERROR %d",
-                      ingres_errno);
-       status = SMS_INTERNAL;
-    }
-
     if (status != SMS_SUCCESS && log_flags & LOG_RES)
        com_err(whoami, status, " (Query failed)");
     return(status);