backed out a couple of changes (to 1.21) and then put back in

exlusive read locks

diff --git a/server/qrtn.qc b/server/qrtn.qc
index 12bbfa1d7013bbae91597a5b369ee4a23f53d653..e822853e48af0fb6f8d4b45a027cd8e3b0fa004c 100644 (file)
--- a/server/qrtn.qc
+++ b/server/qrtn.qc
@@ -16,7 +16,7 @@ static char *rcsid_qrtn_qc = "$Header$";
 
 char *Argv[16];
 
-int ingres_errno = 0;
+static int ingres_errno = 0;
 extern char *whoami;
 extern FILE *journal;
 
@@ -137,7 +137,6 @@ sms_process_query(cl, name, argc, argv_ro, action, actarg)
     if (q == (struct query *)0) return(SMS_NO_HANDLE);
     v = q->validate;
 
-    ingres_errno = 0;
     if (q->type != RETRIEVE)
 ##      begin transaction
 
@@ -309,9 +308,7 @@ out:
                fflush(journal);
            }
        } else {
-           if (status != SMS_DEADLOCK) {
-##             abort           /* it never happened */
-           }
+##          abort              /* it never happened */
        }
     }
 
@@ -781,7 +778,6 @@ set_next_object_id(object, table)
     if (LOG_RES)
         com_err(whoami, 0, "setting ID %s to %d", name, value);
 ##  repeat replace v (#value = @value) where v.#name = @name
-    if (ingres_errno != 0) return(ingres_errno);
     return(SMS_SUCCESS);
 ##}