提交 9114f298 编写于 作者: D Daniel Gustafsson

Merge uptop '76c7d2af' from PostgreSQL 8.3

All the commits in this set were either doc commits or had already been cherry
picked into GPDB so barring a small pg_sleep() diff in the tests, another merge
without side effects.

 Conflicts:
	configure
	doc/src/sgml/Makefile
	doc/src/sgml/docguide.sgml
	src/backend/access/nbtree/nbtinsert.c
	src/backend/postmaster/postmaster.c
	src/backend/utils/adt/selfuncs.c
	src/port/exec.c
dnl Process this file with autoconf to produce a configure script.
dnl $PostgreSQL: pgsql/configure.in,v 1.497 2007/01/18 14:07:31 petere Exp $
dnl $PostgreSQL: pgsql/configure.in,v 1.499 2007/01/28 03:50:33 momjian Exp $
dnl
dnl Developers, please strive to achieve this order:
dnl
......
......@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.146.2.2 2007/12/31 04:52:20 tgl Exp $
* $PostgreSQL: pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.148 2007/01/27 20:53:30 tgl Exp $
*
*-------------------------------------------------------------------------
*/
......
......@@ -38,7 +38,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.512 2007/01/23 03:28:49 momjian Exp $
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.515 2007/01/28 06:32:03 tgl Exp $
*
* NOTES
*
......
......@@ -16,7 +16,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.221 2007/01/22 20:00:40 tgl Exp $
* $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.223 2007/01/28 02:53:34 tgl Exp $
*
*-------------------------------------------------------------------------
*/
......
......@@ -11,6 +11,14 @@ SHOW stats_start_collector; -- must be on
on
(1 row)
-- wait to let any prior tests finish dumping out stats;
-- else our messages might get lost due to contention
SELECT pg_sleep(2.0);
pg_sleep
----------
(1 row)
-- save counters
CREATE TEMP TABLE prevstats AS
SELECT t.seq_scan, t.seq_tup_read, t.idx_scan, t.idx_tup_fetch,
......
......@@ -8,6 +8,10 @@
-- conditio sine qua non
SHOW stats_start_collector; -- must be on
-- wait to let any prior tests finish dumping out stats;
-- else our messages might get lost due to contention
SELECT pg_sleep(2.0);
-- save counters
CREATE TEMP TABLE prevstats AS
SELECT t.seq_scan, t.seq_tup_read, t.idx_scan, t.idx_tup_fetch,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册