Commit4090d17

committed

SET_ARGS cleanup

1 parentf1b7823 commit4090d17Copy full SHA for 4090d17

File tree

+10

-14

lines changed

+10

-14

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.20 1998/09/01 04:29:03 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.21 1999/02/02 23:53:25 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -422,11 +422,11 @@ _equalMergePath(MergePath a, MergePath b)`
`422`	`422`
`423`	`423`	`if (!_equalJoinPath((JoinPath)a, (JoinPath)b))`
`424`	`424`	`return false;`
`425`		`-if (!equal((a->path_mergeclauses), (b->path_mergeclauses)))`
	`425`	`+if (!equal(a->path_mergeclauses,b->path_mergeclauses))`
`426`	`426`	`return false;`
`427`		`-if (!equal((a->outersortkeys), (b->outersortkeys)))`
	`427`	`+if (!equal(a->outersortkeys,b->outersortkeys))`
`428`	`428`	`return false;`
`429`		`-if (!equal((a->innersortkeys), (b->innersortkeys)))`
	`429`	`+if (!equal(a->innersortkeys,b->innersortkeys))`
`430`	`430`	`return false;`
`431`	`431`	`return true;`
`432`	`432`	`}`

Lines changed: 4 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.13 1998/09/21 15:41:28 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.14 1999/02/02 23:53:25 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -157,18 +157,13 @@ better_path(Path new_path, List unique_paths, bool *noOther)`
`157`	`157`	`List*temp=NIL;`
`158`	`158`	`Path*retval=NULL;`
`159`	`159`
`160`		`-/*`
`161`		`- * XXX - added the following two lines which weren't int the lisp`
`162`		`- * planner, but otherwise, doesn't seem to work for the case where`
`163`		`- * new_path is 'nil`
`164`		`- */`
`165`	`160`	`foreach(temp,unique_paths)`
`166`	`161`	`{`
`167`	`162`	`path= (Path*)lfirst(temp);`
`168`	`163`
`169`		`-if ((equal_path_path_ordering(&new_path->p_ordering,`
`170`		`-&path->p_ordering)&&`
`171`		`-samekeys(new_path->keys,path->keys)))`
	`164`	`+if (samekeys(path->keys,new_path->keys)&&`
	`165`	`+equal_path_path_ordering(&path->p_ordering,`
	`166`	`+&new_path->p_ordering))`
`172`	`167`	`{`
`173`	`168`	`old_path=path;`
`174`	`169`	`break;`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ char *ps_status_buffer = NULL;`
`31`	`31`	`ps_status_buffer = (argv)[0]; \`
`32`	`32`	`sprintf(ps_status_buffer, "%s %s %s %s ", execname, username, hostname, dbname); \`
`33`	`33`	`ps_status_buffer += strlen(ps_status_buffer); \`
	`34`	`+ps_status_buffer[0] = '\0'; \`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`#definePS_CLEAR_STATUS() \`
`@@ -41,7 +42,7 @@ char *ps_status_buffer = NULL;`
`41`	`42`	`if (ps_status_buffer) \`
`42`	`43`	`{ \`
`43`	`44`	`PS_CLEAR_STATUS(); \`
`44`		`-strcat(ps_status_buffer, status); \`
	`45`	`+strcpy(ps_status_buffer, status); \`
`45`	`46`	`} \`
`46`	`47`	`}`
`47`	`48`

Comments

(0)