diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/commands/variable.c | 66 | ||||
| -rw-r--r-- | src/backend/executor/execMain.c | 22 |
2 files changed, 3 insertions, 85 deletions
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c index f146242307..5b91404656 100644 --- a/src/backend/commands/variable.c +++ b/src/backend/commands/variable.c @@ -2,7 +2,7 @@ * Routines for handling of 'SET var TO', * 'SHOW var' and 'RESET var' statements. * - * $Id: variable.c,v 1.20 1999/05/25 16:08:28 momjian Exp $ + * $Id: variable.c,v 1.21 1999/06/17 15:15:48 momjian Exp $ * */ @@ -16,14 +16,10 @@ #include "utils/builtins.h" #include "optimizer/internal.h" #include "access/xact.h" +#include "utils/tqual.h" #ifdef MULTIBYTE #include "mb/pg_wchar.h" #endif -#ifdef QUERY_LIMIT -#include "executor/executor.h" -#include "executor/execdefs.h" -#endif - static bool show_date(void); static bool reset_date(void); static bool parse_date(const char *); @@ -46,13 +42,6 @@ static bool show_XactIsoLevel(void); static bool reset_XactIsoLevel(void); static bool parse_XactIsoLevel(const char *); -#ifdef QUERY_LIMIT -static bool show_query_limit(void); -static bool reset_query_limit(void); -static bool parse_query_limit(const char *); - -#endif - extern Cost _cpu_page_wight_; extern Cost _cpu_index_page_wight_; extern bool _use_geqo_; @@ -538,52 +527,6 @@ reset_timezone() return TRUE; } /* reset_timezone() */ -/* - * - * Query_limit - * - */ -#ifdef QUERY_LIMIT -static bool -parse_query_limit(const char *value) -{ - int32 limit; - - if (value == NULL) - { - reset_query_limit(); - return (TRUE); - } - /* why is pg_atoi's arg not declared "const char *" ? */ - limit = pg_atoi((char *) value, sizeof(int32), '\0'); - if (limit <= -1) - elog(ERROR, "Bad value for # of query limit (%s)", value); - ExecutorLimit(limit); - return (TRUE); -} - -static bool -show_query_limit(void) -{ - int limit; - - limit = ExecutorGetLimit(); - if (limit == ALL_TUPLES) - elog(NOTICE, "No query limit is set"); - else - elog(NOTICE, "query limit is %d", limit); - return (TRUE); -} - -static bool -reset_query_limit(void) -{ - ExecutorLimit(ALL_TUPLES); - return (TRUE); -} - -#endif - /*-----------------------------------------------------------------------*/ struct VariableParsers @@ -624,11 +567,6 @@ struct VariableParsers { "XactIsoLevel", parse_XactIsoLevel, show_XactIsoLevel, reset_XactIsoLevel }, -#ifdef QUERY_LIMIT - { - "query_limit", parse_query_limit, show_query_limit, reset_query_limit - }, -#endif { NULL, NULL, NULL, NULL } diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index 766a692aae..a3026fd30a 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -26,7 +26,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.87 1999/06/09 12:23:42 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.88 1999/06/17 15:15:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -88,26 +88,6 @@ static TupleTableSlot *EvalPlanQualNext(EState *estate); /* end of local decls */ -#ifdef QUERY_LIMIT -static int queryLimit = ALL_TUPLES; - -#undef ALL_TUPLES -#define ALL_TUPLES queryLimit - -int -ExecutorLimit(int limit) -{ - return queryLimit = limit; -} - -int -ExecutorGetLimit() -{ - return queryLimit; -} - -#endif - /* ---------------------------------------------------------------- * ExecutorStart * |