Merge branch 'master' into master_detach_hotfix

funbringer · funbringer · commit 0e85fe814995 · 2017-01-10T12:37:30.000+03:00
diff --git a/src/relation_info.c b/src/relation_info.c
@@ -303,7 +303,7 @@ get_pathman_relation_info(Oid relid)
 		 (prel ? "live" : "NULL"), relid, MyProcPid);
 
 	/* Make sure that 'prel' is valid */
-	Assert(PrelIsValid(prel));
+	Assert(!prel || PrelIsValid(prel));
 
 	return prel;
 }

Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@ get_pathman_relation_info(Oid relid)`
`303`	`303`	`(prel ? "live" : "NULL"), relid, MyProcPid);`
`304`	`304`
`305`	`305`	`/* Make sure that 'prel' is valid */`
`306`		`- Assert(PrelIsValid(prel));`
	`306`	`+ Assert(!prel \|\| PrelIsValid(prel));`
`307`	`307`
`308`	`308`	`return prel;`
`309`	`309`	`}`