aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/backend/commands/async.c4
-rw-r--r--src/backend/commands/tablecmds.c13
-rw-r--r--src/backend/commands/typecmds.c6
-rw-r--r--src/backend/commands/user.c7
-rw-r--r--src/test/regress/expected/alter_table.out3
-rw-r--r--src/test/regress/expected/domain.out4
-rw-r--r--src/test/regress/expected/privileges.out1
-rw-r--r--src/test/regress/sql/alter_table.sql2
-rw-r--r--src/test/regress/sql/domain.sql2
9 files changed, 6 insertions, 36 deletions
diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index 8e7ca6cd242..8ceac36cf4a 100644
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.98 2003/08/04 02:39:58 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.99 2003/09/15 00:26:31 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -221,8 +221,6 @@ Async_Listen(char *relname, int pid)
if (alreadyListener)
{
heap_close(lRel, AccessExclusiveLock);
- ereport(WARNING,
- (errmsg("already listening on \"%s\"", relname)));
return;
}
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index ff9db4b7793..b99d68b3400 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.80 2003/08/30 14:59:34 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.81 2003/09/15 00:26:31 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -2567,14 +2567,6 @@ AlterTableAlterOids(Oid myrelid, bool recurse, bool setOid)
*/
if (tuple_class->relhasoids == setOid)
{
- if (setOid)
- ereport(NOTICE,
- (errmsg("table \"%s\" is already WITH OIDS",
- RelationGetRelationName(rel))));
- else
- ereport(NOTICE,
- (errmsg("table \"%s\" is already WITHOUT OIDS",
- RelationGetRelationName(rel))));
heap_close(class_rel, RowExclusiveLock);
heap_close(rel, NoLock); /* close rel, but keep lock! */
return;
@@ -4001,9 +3993,6 @@ AlterTableClusterOn(Oid relOid, const char *indexName)
*/
if (indexForm->indisclustered)
{
- ereport(NOTICE,
- (errmsg("table \"%s\" is already being clustered on index \"%s\"",
- NameStr(rel->rd_rel->relname), indexName)));
ReleaseSysCache(indexTuple);
heap_close(rel, NoLock);
return;
diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c
index 53dffdab101..deb24a779cd 100644
--- a/src/backend/commands/typecmds.c
+++ b/src/backend/commands/typecmds.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/typecmds.c,v 1.44 2003/09/09 23:22:19 petere Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/typecmds.c,v 1.45 2003/09/15 00:26:31 petere Exp $
*
* DESCRIPTION
* The "DefineFoo" routines take the parse tree and pick out the
@@ -1246,10 +1246,6 @@ AlterDomainNotNull(List *names, bool notNull)
/* Is the domain already set to the desired constraint? */
if (typTup->typnotnull == notNull)
{
- ereport(NOTICE,
- (errmsg("\"%s\" is already set to %s",
- TypeNameToString(typename),
- notNull ? "NOT NULL" : "NULL")));
heap_close(typrel, RowExclusiveLock);
return;
}
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index 8845c975f91..de6555e2c1d 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.124 2003/08/04 02:39:58 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.125 2003/09/15 00:26:31 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1498,11 +1498,6 @@ AlterGroup(AlterGroupStmt *stmt, const char *tag)
if (!intMember(sysid, newlist))
newlist = lappendi(newlist, sysid);
- else
- ereport(WARNING,
- (errcode(ERRCODE_DUPLICATE_OBJECT),
- errmsg("user \"%s\" is already in group \"%s\"",
- strVal(lfirst(item)), stmt->name)));
}
/* Do the update */
diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out
index c74f87576eb..58425c96517 100644
--- a/src/test/regress/expected/alter_table.out
+++ b/src/test/regress/expected/alter_table.out
@@ -1209,8 +1209,7 @@ select oid > 0, * from altinhoid;
(1 row)
alter table altwithoid set without oids;
-alter table altinhoid set without oids; -- fails
-NOTICE: table "altinhoid" is already WITHOUT OIDS
+alter table altinhoid set without oids;
select oid > 0, * from altwithoid; -- fails
ERROR: attribute "oid" not found
select oid > 0, * from altinhoid; -- fails
diff --git a/src/test/regress/expected/domain.out b/src/test/regress/expected/domain.out
index 0823bc69dfc..bc2279b92ba 100644
--- a/src/test/regress/expected/domain.out
+++ b/src/test/regress/expected/domain.out
@@ -205,13 +205,9 @@ alter domain dnotnulltest set not null; -- fails
ERROR: relation "domnotnull" attribute "col2" contains NULL values
update domnotnull set col2 = 6;
alter domain dnotnulltest set not null;
-alter domain dnotnulltest set not null; -- fails
-NOTICE: "dnotnulltest" is already set to NOT NULL
update domnotnull set col1 = null; -- fails
ERROR: domain dnotnulltest does not allow NULL values
alter domain dnotnulltest drop not null;
-alter domain dnotnulltest drop not null; -- fails
-NOTICE: "dnotnulltest" is already set to NULL
update domnotnull set col1 = null;
drop domain dnotnulltest cascade;
NOTICE: drop cascades to table domnotnull column col2
diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out
index 0a7b8e81a2c..f5a6c039d54 100644
--- a/src/test/regress/expected/privileges.out
+++ b/src/test/regress/expected/privileges.out
@@ -11,7 +11,6 @@ CREATE GROUP regressgroup1;
CREATE GROUP regressgroup2 WITH USER regressuser1, regressuser2;
ALTER GROUP regressgroup1 ADD USER regressuser4;
ALTER GROUP regressgroup2 ADD USER regressuser2; -- duplicate
-WARNING: user "regressuser2" is already in group "regressgroup2"
ALTER GROUP regressgroup2 DROP USER regressuser2;
ALTER GROUP regressgroup2 ADD USER regressuser4;
-- test owner privileges
diff --git a/src/test/regress/sql/alter_table.sql b/src/test/regress/sql/alter_table.sql
index f28b4f246c5..9bdc8cd1eaf 100644
--- a/src/test/regress/sql/alter_table.sql
+++ b/src/test/regress/sql/alter_table.sql
@@ -870,7 +870,7 @@ select oid > 0, * from altwithoid;
select oid > 0, * from altinhoid;
alter table altwithoid set without oids;
-alter table altinhoid set without oids; -- fails
+alter table altinhoid set without oids;
select oid > 0, * from altwithoid; -- fails
select oid > 0, * from altinhoid; -- fails
diff --git a/src/test/regress/sql/domain.sql b/src/test/regress/sql/domain.sql
index 32295ff1866..8e188636a5c 100644
--- a/src/test/regress/sql/domain.sql
+++ b/src/test/regress/sql/domain.sql
@@ -174,12 +174,10 @@ alter domain dnotnulltest set not null; -- fails
update domnotnull set col2 = 6;
alter domain dnotnulltest set not null;
-alter domain dnotnulltest set not null; -- fails
update domnotnull set col1 = null; -- fails
alter domain dnotnulltest drop not null;
-alter domain dnotnulltest drop not null; -- fails
update domnotnull set col1 = null;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-31 03:07:27 +0000