Commit3c19892

committed

Merge commit '95246e9d78d15c707f370ef93b2e94a4296071e5' into PGPRO9_6

2 parents30a0418 +95246e9 commit3c19892Copy full SHA for 3c19892

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ PG_CONFIG = pg_config`
`14`	`14`	`PGXS :=$(shell$(PG_CONFIG) --pgxs)`
`15`	`15`	`include$(PGXS)`
`16`	`16`	`else`
`17`		`-subdir = contrib/intarray`
	`17`	`+subdir = contrib/sr_plan`
`18`	`18`	`top_builddir = ../..`
`19`	`19`	`include$(top_builddir)/src/Makefile.global`
`20`	`20`	`include$(top_srcdir)/contrib/contrib-global.mk`
`@@ -23,4 +23,4 @@ endif`
`23`	`23`
`24`	`24`	`genparser:`
`25`	`25`	`#test -d sr_plan_env \|\|`
`26`		-python gen_parser.py nodes.h `pg_config --includedir-server`
	`26`	+python gen_parser.py nodes.h `pg_config --includedir-server`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ void replace_fake(void node)`
`260`	`260`	`}`
`261`	`261`
`262`	`262`	`void_PG_init(void) {`
`263`		`-elog(WARNING,"SP_Plan init");`
	`263`	`+/elog(WARNING, "SR_Plan init"); /`
`264`	`264`	`DefineCustomBoolVariable("sr_plan.write_mode",`
`265`	`265`	`"Save all plans for all query.",`
`266`	`266`	`NULL,`
`@@ -277,7 +277,7 @@ void _PG_init(void) {`
`277`	`277`	`}`
`278`	`278`
`279`	`279`	`void_PG_fini(void) {`
`280`		`-elog(WARNING,"SP_Plan finit");`
	`280`	`+/elog(WARNING, "SR_Plan finit"); /`
`281`	`281`	`planner_hook=NULL;`
`282`	`282`	`post_parse_analyze_hook=NULL;`
`283`	`283`	`}`

Comments

(0)