From c087b4cd4f03d2a018aa807f3f65695b0797a9c6 Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Sat, 7 Jun 2008 02:44:10 +0000
Subject: [PATCH]  * Revert r18067  * Add specific comments about why we're not
 setting MPI_ERROR here

This commit was SVN r18616.

The following SVN revision numbers were found above:
  r18067 --> open-mpi/ompi@58e31d767e3dfab0ae3d5d88511b0fef741140c1
---
 ompi/request/req_test.c | 11 +++++++----
 ompi/request/req_wait.c |  9 +++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ompi/request/req_test.c b/ompi/request/req_test.c
index 37e5bbf13e..29ed0e19f6 100644
--- a/ompi/request/req_test.c
+++ b/ompi/request/req_test.c
@@ -9,7 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2006-2008 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -58,7 +58,8 @@ int ompi_request_default_test( ompi_request_t ** rptr,
                 status->MPI_ERROR = old_error;
             }
         } else if (MPI_STATUS_IGNORE != status) {
-            /* See MPI-1.2, sec 3.2.5, p.22 */
+            /* Do *NOT* set a new value for status->MPI_ERROR here!
+               See MPI-1.1 doc, sec 3.2.5, p.22 */
             int old_error = status->MPI_ERROR;
             *status = request->req_status;
             status->MPI_ERROR = old_error;
@@ -125,13 +126,15 @@ int ompi_request_default_test_any(
             if (OMPI_REQUEST_GEN == request->req_type) {
                 ompi_grequest_invoke_query(request, &request->req_status);
                 if (MPI_STATUS_IGNORE != status) {
-                    /* See MPI-1.2, sec 3.2.5, p.22 */
+                    /* Do *NOT* set a new value for status->MPI_ERROR
+                       here!  See MPI-1.1 doc, sec 3.2.5, p.22 */
                     int old_error = status->MPI_ERROR;
                     *status = request->req_status;
                     status->MPI_ERROR = old_error;
                 }
             } else if (MPI_STATUS_IGNORE != status) {
-                /* See MPI-1.2, sec 3.2.5, p.22 */
+                /* Do *NOT* set a new value for status->MPI_ERROR
+                   here!  See MPI-1.1 doc, sec 3.2.5, p.22 */
                 int old_error = status->MPI_ERROR;
                 *status = request->req_status;
                 status->MPI_ERROR = old_error;
diff --git a/ompi/request/req_wait.c b/ompi/request/req_wait.c
index 09dd1d01ce..cbe8af182a 100644
--- a/ompi/request/req_wait.c
+++ b/ompi/request/req_wait.c
@@ -9,7 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2006-2008 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -47,10 +47,10 @@ int ompi_request_default_wait(
         ompi_grequest_invoke_query(req, &req->req_status);
     }
     if( MPI_STATUS_IGNORE != status ) {
-        /* See MPI-1.2, sec 3.2.5, p.22 */
+        /* Do *NOT* set status->MPI_ERROR here!  See MPI-1.1 doc, sec
+           3.2.5, p.22 */
         status->MPI_TAG    = req->req_status.MPI_TAG;
         status->MPI_SOURCE = req->req_status.MPI_SOURCE;
-        status->MPI_ERROR  = req->req_status.MPI_ERROR;
         status->_count     = req->req_status._count;
         status->_cancelled = req->req_status._cancelled;
     }
@@ -174,7 +174,8 @@ finished:
             rc = ompi_grequest_invoke_query(request, &request->req_status);
         }
         if (MPI_STATUS_IGNORE != status) {
-            /* See MPI-1.2, sec 3.2.5, p.22 */
+            /* Do *NOT* set status->MPI_ERROR here!  See MPI-1.1 doc,
+               sec 3.2.5, p.22 */
             int old_error = status->MPI_ERROR;
             *status = request->req_status;
             status->MPI_ERROR = old_error;