diff --git a/doc/TODO.detail/nulls b/doc/TODO.detail/nulls deleted file mode 100644 index 7ac282c972..0000000000 --- a/doc/TODO.detail/nulls +++ /dev/null @@ -1,119 +0,0 @@ -From owner-pgsql-general@hub.org Fri Oct 9 18:22:09 1998 -Received: from hub.org (majordom@hub.org [209.47.148.200]) - by candle.pha.pa.us (8.9.0/8.9.0) with ESMTP id SAA04220 - for ; Fri, 9 Oct 1998 18:22:08 -0400 (EDT) -Received: from localhost (majordom@localhost) - by hub.org (8.8.8/8.8.8) with SMTP id SAA26960; - Fri, 9 Oct 1998 18:18:29 -0400 (EDT) - (envelope-from owner-pgsql-general@hub.org) -Received: by hub.org (TLB v0.10a (1.23 tibbs 1997/01/09 00:29:32)); Fri, 09 Oct 1998 18:18:07 +0000 (EDT) -Received: (from majordom@localhost) - by hub.org (8.8.8/8.8.8) id SAA26917 - for pgsql-general-outgoing; Fri, 9 Oct 1998 18:18:04 -0400 (EDT) - (envelope-from owner-pgsql-general@postgreSQL.org) -X-Authentication-Warning: hub.org: majordom set sender to owner-pgsql-general@postgreSQL.org using -f -Received: from gecko.statsol.com (gecko.statsol.com [198.11.51.133]) - by hub.org (8.8.8/8.8.8) with ESMTP id SAA26904 - for ; Fri, 9 Oct 1998 18:17:46 -0400 (EDT) - (envelope-from statsol@statsol.com) -Received: from gecko (gecko [198.11.51.133]) - by gecko.statsol.com (8.9.0/8.9.0) with SMTP id SAA00557 - for ; Fri, 9 Oct 1998 18:18:00 -0400 (EDT) -Date: Fri, 9 Oct 1998 18:18:00 -0400 (EDT) -From: Steve Doliov -X-Sender: statsol@gecko -To: pgsql-general@postgreSQL.org -Subject: Re: [GENERAL] Making NULLs visible. -Message-ID: -MIME-Version: 1.0 -Content-Type: TEXT/PLAIN; charset=US-ASCII -Sender: owner-pgsql-general@postgreSQL.org -Precedence: bulk -Status: RO - -On Fri, 9 Oct 1998, Bruce Momjian wrote: - -> [Charset iso-8859-1 unsupported, filtering to ASCII...] -> > > Yes, \ always outputs as \\, excepts someone changed it last week, and I -> > > am requesting a reversal. Do you like the \N if it is unique? -> > -> > Well, it's certainly clear, but could be confused with \n (newline). Can we -> > have \0 instead? -> -> Yes, but it is uppercase. \0 looks like an octal number to me, and I -> think we even output octals sometimes, don't we? -> - -my first suggestion may have been hare-brained, but why not just make the -specifics of the output user-configurable. So if the user chooses \0, so -be it, if the user chooses \N so be it, if the user likes NULL so be it. -but the option would only have one value per database at any given point -in time. so database x could use \N on tuesday and NULL on wednesday, but -database x could never have two references to the characters(s) used to -represent a null value. - -steve - - - - -From owner-pgsql-general@hub.org Sun Oct 11 17:31:08 1998 -Received: from renoir.op.net (root@renoir.op.net [209.152.193.4]) - by candle.pha.pa.us (8.9.0/8.9.0) with ESMTP id RAA20043 - for ; Sun, 11 Oct 1998 17:31:02 -0400 (EDT) -Received: from hub.org (majordom@hub.org [209.47.148.200]) by renoir.op.net (o1/$ Revision: 1.18 $) with ESMTP id RAA03069 for ; Sun, 11 Oct 1998 17:10:34 -0400 (EDT) -Received: from localhost (majordom@localhost) - by hub.org (8.8.8/8.8.8) with SMTP id QAA10856; - Sun, 11 Oct 1998 16:57:34 -0400 (EDT) - (envelope-from owner-pgsql-general@hub.org) -Received: by hub.org (TLB v0.10a (1.23 tibbs 1997/01/09 00:29:32)); Sun, 11 Oct 1998 16:53:35 +0000 (EDT) -Received: (from majordom@localhost) - by hub.org (8.8.8/8.8.8) id QAA10393 - for pgsql-general-outgoing; Sun, 11 Oct 1998 16:53:34 -0400 (EDT) - (envelope-from owner-pgsql-general@postgreSQL.org) -X-Authentication-Warning: hub.org: majordom set sender to owner-pgsql-general@postgreSQL.org using -f -Received: from mail1.panix.com (mail1.panix.com [166.84.0.212]) - by hub.org (8.8.8/8.8.8) with ESMTP id QAA10378 - for ; Sun, 11 Oct 1998 16:53:28 -0400 (EDT) - (envelope-from tomg@admin.nrnet.org) -Received: from mailhost.nrnet.org (root@mailhost.nrnet.org [166.84.192.39]) - by mail1.panix.com (8.8.8/8.8.8/PanixM1.3) with ESMTP id QAA16311 - for ; Sun, 11 Oct 1998 16:53:24 -0400 (EDT) -Received: from admin.nrnet.org (uucp@localhost) - by mailhost.nrnet.org (8.8.7/8.8.4) with UUCP - id QAA16345 for pgsql-general@postgreSQL.org; Sun, 11 Oct 1998 16:28:47 -0400 -Received: from localhost (tomg@localhost) - by admin.nrnet.org (8.8.7/8.8.7) with SMTP id QAA11569 - for ; Sun, 11 Oct 1998 16:28:41 -0400 -Date: Sun, 11 Oct 1998 16:28:41 -0400 (EDT) -From: Thomas Good -To: pgsql-general@postgreSQL.org -Subject: Re: [GENERAL] Making NULLs visible. -In-Reply-To: -Message-ID: -MIME-Version: 1.0 -Content-Type: TEXT/PLAIN; charset=US-ASCII -Sender: owner-pgsql-general@postgreSQL.org -Precedence: bulk -Status: RO - -Watching all this go by...as a guy who has to move alot of data -from legacy dbs to postgres, I've gotten used to \N being a null. - -My vote, if I were allowed to cast one, would be to have one null -and that would be the COPY command null. I have no difficulty -distinguishing a null from a newline... - -At the pgsql command prompt I would find seeing \N rather reassuring. -I've seen alot of these little guys. - - ---------- Sisters of Charity Medical Center ---------- - Department of Psychiatry - ---- - Thomas Good - Coordinator, North Richmond C.M.H.C. Information Systems - 75 Vanderbilt Ave, Quarters 8 Phone: 718-354-5528 - Staten Island, NY 10304 Fax: 718-354-5056 - - - diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index 18d9567ab8..c20a63fc6d 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -7,7 +7,7 @@ * Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.67 1999/09/18 19:06:27 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.68 1999/09/27 20:26:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -134,7 +134,6 @@ static char *relname; /* current relation name */ Form_pg_attribute attrtypes[MAXATTR]; /* points to attribute info */ static char *values[MAXATTR]; /* cooresponding attribute values */ int numattr; /* number of attributes for cur. rel */ -extern bool disableFsync; /* do not fsync the database */ int DebugMode; static GlobalMemory nogc = (GlobalMemory) NULL; /* special no-gc mem diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c index d34b97c90d..ffbe98b97f 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.25 1999/07/17 20:16:54 momjian Exp $ + * $Id: variable.c,v 1.26 1999/09/27 20:27:03 momjian Exp $ * */ @@ -11,11 +11,13 @@ #include "postgres.h" #include "access/xact.h" +#include "catalog/pg_shadow.h" #include "commands/variable.h" #include "miscadmin.h" #include "optimizer/internal.h" #include "utils/builtins.h" #include "utils/tqual.h" +#include "utils/trace.h" #ifdef MULTIBYTE #include "mb/pg_wchar.h" @@ -528,6 +530,36 @@ reset_timezone() return TRUE; } /* reset_timezone() */ +/* + * Pg_options + */ +static bool +parse_pg_options(const char *value) +{ + if (!superuser()) { + elog(ERROR, "Only users with superuser privilege can set pg_options"); + } + parse_options((char *) value, TRUE); + return (TRUE); +} + +static bool +show_pg_options(void) +{ + show_options(); + return (TRUE); +} + +static bool +reset_pg_options(void) +{ + if (!superuser()) { + elog(ERROR, "Only users with superuser privilege can set pg_options"); + } + read_pg_options(0); + return (TRUE); +} + /*-----------------------------------------------------------------------*/ struct VariableParsers @@ -568,6 +600,9 @@ struct VariableParsers { "XactIsoLevel", parse_XactIsoLevel, show_XactIsoLevel, reset_XactIsoLevel }, + { + "pg_options", parse_pg_options, show_pg_options, reset_pg_options + }, { NULL, NULL, NULL, NULL } diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c index 1cde72e6b2..281db5a541 100644 --- a/src/backend/utils/init/globals.c +++ b/src/backend/utils/init/globals.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.36 1999/07/17 20:18:08 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.37 1999/09/27 20:27:09 momjian Exp $ * * NOTES * Globals used all over the place should be declared here and not @@ -76,7 +76,6 @@ char DateFormat[20] = "%d-%m-%Y"; /* mjl: sizes! or better * malloc? XXX */ char FloatFormat[20] = "%f"; -bool disableFsync = false; bool allowSystemTableMods = false; int SortMem = 512; diff --git a/src/backend/utils/misc/trace.c b/src/backend/utils/misc/trace.c index 3d9cbe607d..2a1fe5ab8d 100644 --- a/src/backend/utils/misc/trace.c +++ b/src/backend/utils/misc/trace.c @@ -73,6 +73,7 @@ static char *opt_names[] = { "lock_debug_relid", "lock_read_priority", /* lock priority, see lock.c */ "deadlock_timeout", /* deadlock timeout, see proc.c */ + "nofsync", /* turn fsync off */ "syslog", /* use syslog for error messages */ "hostlookup", /* enable hostname lookup in ps_status */ "showportnumber", /* show port number in ps_status */ @@ -405,6 +406,16 @@ read_pg_options(SIGNAL_ARGS) close(fd); } +void +show_options(void) +{ + int i; + + for (i=0; i