resolve merge conflict in RelationCreateStorage()

cae1c788 changed how backend ID is determined for temporary tables
because of parallel query (calling BackendIdForTempRelations()
instead of using MyBackendId directly)

diff --git a/src/backend/catalog/storage.c b/src/backend/catalog/storage.c
index ea52d55f8ddbbd67b94e54d3570ba263926de45c..a759e16c72df6ec6f217c12f68e0d8b9e76f1c09 100644 (file)
--- a/src/backend/catalog/storage.c
+++ b/src/backend/catalog/storage.c
@@ -86,16 +86,12 @@ RelationCreateStorage(RelFileNode rnode, char relpersistence)
        switch (relpersistence)
        {
                case RELPERSISTENCE_TEMP:
-<<<<<<< HEAD
 #ifdef XCP
                        if (OidIsValid(MyCoordId))
                                backend = MyFirstBackendId;
                        else
 #endif
-                       backend = MyBackendId;
-=======
                        backend = BackendIdForTempRelations();
->>>>>>> b5bce6c1ec6061c8a4f730d927e162db7e2ce365
                        needs_wal = false;
                        break;
                case RELPERSISTENCE_UNLOGGED: