Merge branch 'PGPRO10' into PGPROEE10

Author: vbwagner

contrib/dump_stat/.gitignore

@@ -1,2 +1,5 @@
-/results/
-/tmp_check/
+log/
+results/
+tmp_check/
+regression*
+dump_stat--?.?.sql

contrib/dump_stat/Makefile

@@ -4,9 +4,15 @@ MODULE_big	= dump_stat
 OBJS		= anyarray_elemtype.o $(WIN32RES)
 
 EXTENSION = dump_stat
-DATA = dump_stat--1.0.sql
+EXTVERSION = 1.1
 PGFILEDESC = "dump_stat - move pg_statistic to new instance of PostgreSQL"
 
+
+DATA = dump_stat--1.0.sql dump_stat--1.0--1.1.sql
+DATA_built = dump_stat--$(EXTVERSION).sql
+
+REGRESS = dump_stat
+
 ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
@@ -18,7 +24,12 @@ include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
 
+dump_stat--$(EXTVERSION).sql: $(DATA)
+	cat $^ > $@
+
 temp-install: EXTRA_INSTALL=contrib/dump_stat
 
-check: temp-install
+check-tap: temp-install
 	$(prove_check)
+
+check: check-tap