diff options
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/regress/expected/stats.out | 4 | ||||
-rw-r--r-- | src/test/regress/input/create_function_1.source | 5 | ||||
-rw-r--r-- | src/test/regress/output/create_function_1.source | 4 | ||||
-rw-r--r-- | src/test/regress/regress.c | 18 | ||||
-rw-r--r-- | src/test/regress/sql/stats.sql | 2 |
5 files changed, 4 insertions, 29 deletions
diff --git a/src/test/regress/expected/stats.out b/src/test/regress/expected/stats.out index bd2e1328f8f..d3495ffb481 100644 --- a/src/test/regress/expected/stats.out +++ b/src/test/regress/expected/stats.out @@ -36,8 +36,8 @@ SELECT count(*) FROM tenk2 WHERE unique1 = 1; (1 row) -- let stats collector catch up -SELECT do_sleep(2); - do_sleep +SELECT pg_sleep(2.0); + pg_sleep ---------- (1 row) diff --git a/src/test/regress/input/create_function_1.source b/src/test/regress/input/create_function_1.source index 14b90ca1a1b..faa73156dc2 100644 --- a/src/test/regress/input/create_function_1.source +++ b/src/test/regress/input/create_function_1.source @@ -52,11 +52,6 @@ CREATE FUNCTION set_ttdummy (int4) AS '@abs_builddir@/regress@DLSUFFIX@' LANGUAGE 'C' STRICT; -CREATE FUNCTION do_sleep (int4) - RETURNS void - AS '@abs_builddir@/regress@DLSUFFIX@' - LANGUAGE 'C' STRICT; - -- Things that shouldn't work: CREATE FUNCTION test1 (int) RETURNS int LANGUAGE sql diff --git a/src/test/regress/output/create_function_1.source b/src/test/regress/output/create_function_1.source index 7511c3f8d67..ed275b1f482 100644 --- a/src/test/regress/output/create_function_1.source +++ b/src/test/regress/output/create_function_1.source @@ -47,10 +47,6 @@ CREATE FUNCTION set_ttdummy (int4) RETURNS int4 AS '@abs_builddir@/regress@DLSUFFIX@' LANGUAGE 'C' STRICT; -CREATE FUNCTION do_sleep (int4) - RETURNS void - AS '@abs_builddir@/regress@DLSUFFIX@' - LANGUAGE 'C' STRICT; -- Things that shouldn't work: CREATE FUNCTION test1 (int) RETURNS int LANGUAGE sql AS 'SELECT ''not an integer'';'; diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c index 97fe608602a..7c58f950cbb 100644 --- a/src/test/regress/regress.c +++ b/src/test/regress/regress.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/test/regress/regress.c,v 1.64 2005/10/15 02:49:51 momjian Exp $ + * $PostgreSQL: pgsql/src/test/regress/regress.c,v 1.65 2006/01/11 20:12:43 tgl Exp $ */ #include "postgres.h" @@ -26,7 +26,6 @@ extern char *reverse_name(char *string); extern int oldstyle_length(int n, text *t); extern Datum int44in(PG_FUNCTION_ARGS); extern Datum int44out(PG_FUNCTION_ARGS); -extern Datum do_sleep(PG_FUNCTION_ARGS); /* @@ -735,18 +734,3 @@ int44out(PG_FUNCTION_ARGS) *--walk = '\0'; PG_RETURN_CSTRING(result); } - -/* - * do_sleep - delay for N seconds - */ -PG_FUNCTION_INFO_V1(do_sleep); - -Datum -do_sleep(PG_FUNCTION_ARGS) -{ - int32 secs = PG_GETARG_INT32(0); - - pg_usleep(secs * 1000000L); - - PG_RETURN_VOID(); -} diff --git a/src/test/regress/sql/stats.sql b/src/test/regress/sql/stats.sql index 3589a0cf5dd..75acee647d5 100644 --- a/src/test/regress/sql/stats.sql +++ b/src/test/regress/sql/stats.sql @@ -26,7 +26,7 @@ SELECT count(*) FROM tenk2; SELECT count(*) FROM tenk2 WHERE unique1 = 1; -- let stats collector catch up -SELECT do_sleep(2); +SELECT pg_sleep(2.0); -- check effects SELECT st.seq_scan >= pr.seq_scan + 1, |