Commit 23bd7791 authored by Bruce Momjian's avatar Bruce Momjian

Change ET_WARN to ET_NOTICE to match internal codes, leave message as

WARNING.  Fix German FAQ mention about warning.
parent 7d6af50f
...@@ -515,7 +515,7 @@ ...@@ -515,7 +515,7 @@
* überprüfe, daß keine Binaries vorheriger Versionen in Deinem Pfad * überprüfe, daß keine Binaries vorheriger Versionen in Deinem Pfad
(PATH-Variable) sind. (Wenn Du die Meldung siehst: (PATH-Variable) sind. (Wenn Du die Meldung siehst:
WARN:heap_modifytuple: repl is \ 9, ist das das Problem.) NOTICE:heap_modifytuple: repl is \ 9, ist das das Problem.)
* überprüfe, daß der Pfad richtig gesetzt ist * überprüfe, daß der Pfad richtig gesetzt ist
* überprüfe, ob der User postgres der Eigentümer der entsprechenden * überprüfe, ob der User postgres der Eigentümer der entsprechenden
Dateien ist Dateien ist
......
...@@ -540,7 +540,7 @@ Wir haben: ...@@ -540,7 +540,7 @@ Wir haben:
<LI> <LI>
&uuml;berpr&uuml;fe, da&szlig; keine Binaries vorheriger Versionen in Deinem Pfad &uuml;berpr&uuml;fe, da&szlig; keine Binaries vorheriger Versionen in Deinem Pfad
(PATH-Variable) sind. (PATH-Variable) sind.
(Wenn Du die Meldung siehst: <CODE>WARN:heap_modifytuple: repl is \ 9</CODE>, ist das das Problem.) (Wenn Du die Meldung siehst: <CODE>NOTICE:heap_modifytuple: repl is \ 9</CODE>, ist das das Problem.)
<Li> &uuml;berpr&uuml;fe, da&szlig; der Pfad richtig gesetzt ist <Li> &uuml;berpr&uuml;fe, da&szlig; der Pfad richtig gesetzt ist
<LI> &uuml;berpr&uuml;fe, ob der User <I>postgres</I> der Eigent&uuml;mer der entsprechenden Dateien ist <LI> &uuml;berpr&uuml;fe, ob der User <I>postgres</I> der Eigent&uuml;mer der entsprechenden Dateien ist
</UL><P> </UL><P>
......
...@@ -18,7 +18,7 @@ CREATE DATABASE name \[ WITH LOCATION = 'dbpath' \] ...@@ -18,7 +18,7 @@ CREATE DATABASE name \[ WITH LOCATION = 'dbpath' \]
" {} "CREATEDB" {italic} " " {} "CREATEDB" {italic} "
Message returned if the command completes successfully. Message returned if the command completes successfully.
" {} "WARN: createdb: database \"name\" already exists." {italic} " " {} "NOTICE: createdb: database \"name\" already exists." {italic} "
This occurs if database specified already exists. This occurs if database specified already exists.
" {} "ERROR: Unable to create database directory directory" {italic} " " {} "ERROR: Unable to create database directory directory" {italic} "
......
...@@ -109,7 +109,7 @@ drop_descriptor(char *name, char *connection) ...@@ -109,7 +109,7 @@ drop_descriptor(char *name, char *connection)
} }
} }
snprintf(errortext, sizeof errortext, "unknown descriptor %s", name); snprintf(errortext, sizeof errortext, "unknown descriptor %s", name);
mmerror(ET_WARN, errortext); mmerror(ET_NOTICE, errortext);
} }
struct descriptor struct descriptor
...@@ -128,7 +128,7 @@ struct descriptor ...@@ -128,7 +128,7 @@ struct descriptor
} }
} }
snprintf(errortext, sizeof errortext, "unknown descriptor %s", name); snprintf(errortext, sizeof errortext, "unknown descriptor %s", name);
mmerror(ET_WARN, errortext); mmerror(ET_NOTICE, errortext);
return NULL; return NULL;
} }
...@@ -145,7 +145,7 @@ output_get_descr_header(char *desc_name) ...@@ -145,7 +145,7 @@ output_get_descr_header(char *desc_name)
else else
{ {
snprintf(errortext, sizeof errortext, "unknown descriptor header item '%d'", results->value); snprintf(errortext, sizeof errortext, "unknown descriptor header item '%d'", results->value);
mmerror(ET_WARN, errortext); mmerror(ET_NOTICE, errortext);
} }
} }
...@@ -167,10 +167,10 @@ output_get_descr(char *desc_name, char *index) ...@@ -167,10 +167,10 @@ output_get_descr(char *desc_name, char *index)
switch (results->value) switch (results->value)
{ {
case ECPGd_nullable: case ECPGd_nullable:
mmerror(ET_WARN, "nullable is always 1"); mmerror(ET_NOTICE, "nullable is always 1");
break; break;
case ECPGd_key_member: case ECPGd_key_member:
mmerror(ET_WARN, "key_member is always 0"); mmerror(ET_NOTICE, "key_member is always 0");
break; break;
default: default:
break; break;
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.69 2000/12/03 20:45:38 tgl Exp $ * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.70 2000/12/15 20:01:55 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -392,7 +392,7 @@ cppline {space}*#(.*\\{line_end})*.* ...@@ -392,7 +392,7 @@ cppline {space}*#(.*\\{line_end})*.*
literalbuf, NAMEDATALEN-1, literalbuf); literalbuf, NAMEDATALEN-1, literalbuf);
literalbuf[NAMEDATALEN-1] = '\0'; literalbuf[NAMEDATALEN-1] = '\0';
#endif #endif
mmerror(ET_WARN, errortext); mmerror(ET_NOTICE, errortext);
} }
yylval.str = mm_strdup(literalbuf); yylval.str = mm_strdup(literalbuf);
...@@ -554,7 +554,7 @@ cppline {space}*#(.*\\{line_end})*.* ...@@ -554,7 +554,7 @@ cppline {space}*#(.*\\{line_end})*.*
lower_text, NAMEDATALEN-1, lower_text); lower_text, NAMEDATALEN-1, lower_text);
lower_text[NAMEDATALEN-1] = '\0'; lower_text[NAMEDATALEN-1] = '\0';
#endif #endif
mmerror(ET_WARN, errortext); mmerror(ET_NOTICE, errortext);
yytext[NAMEDATALEN-1] = '\0'; yytext[NAMEDATALEN-1] = '\0';
} }
......
...@@ -42,7 +42,7 @@ mmerror(enum errortype type, char * error) ...@@ -42,7 +42,7 @@ mmerror(enum errortype type, char * error)
{ {
switch(type) switch(type)
{ {
case ET_WARN: case ET_NOTICE:
fprintf(stderr, "%s:%d: WARNING: %s\n", input_filename, yylineno, error); fprintf(stderr, "%s:%d: WARNING: %s\n", input_filename, yylineno, error);
break; break;
case ET_ERROR: case ET_ERROR:
...@@ -1124,7 +1124,7 @@ columnDef: ColId Typename ColQualList opt_collate ...@@ -1124,7 +1124,7 @@ columnDef: ColId Typename ColQualList opt_collate
if (strlen($4) > 0) if (strlen($4) > 0)
{ {
sprintf(errortext, "CREATE TABLE/COLLATE %s not yet implemented; clause ignored", $4); sprintf(errortext, "CREATE TABLE/COLLATE %s not yet implemented; clause ignored", $4);
mmerror(ET_WARN, errortext); mmerror(ET_NOTICE, errortext);
} }
$$ = cat_str(4, $1, $2, $3, $4); $$ = cat_str(4, $1, $2, $3, $4);
} }
...@@ -1133,7 +1133,7 @@ columnDef: ColId Typename ColQualList opt_collate ...@@ -1133,7 +1133,7 @@ columnDef: ColId Typename ColQualList opt_collate
if (strlen($4) > 0) if (strlen($4) > 0)
{ {
sprintf(errortext, "CREATE TABLE/COLLATE %s not yet implemented; clause ignored", $4); sprintf(errortext, "CREATE TABLE/COLLATE %s not yet implemented; clause ignored", $4);
mmerror(ET_WARN, errortext); mmerror(ET_NOTICE, errortext);
} }
$$ = cat_str(4, $1, make_str(" serial "), $3, $4); $$ = cat_str(4, $1, make_str(" serial "), $3, $4);
} }
...@@ -1248,7 +1248,7 @@ key_match: MATCH FULL ...@@ -1248,7 +1248,7 @@ key_match: MATCH FULL
} }
| MATCH PARTIAL | MATCH PARTIAL
{ {
mmerror(ET_WARN, "FOREIGN KEY/MATCH PARTIAL not yet implemented"); mmerror(ET_NOTICE, "FOREIGN KEY/MATCH PARTIAL not yet implemented");
$$ = make_str("match partial"); $$ = make_str("match partial");
} }
| /*EMPTY*/ | /*EMPTY*/
...@@ -1651,7 +1651,7 @@ direction: FORWARD { $$ = make_str("forward"); } ...@@ -1651,7 +1651,7 @@ direction: FORWARD { $$ = make_str("forward"); }
| BACKWARD { $$ = make_str("backward"); } | BACKWARD { $$ = make_str("backward"); }
| RELATIVE { $$ = make_str("relative"); } | RELATIVE { $$ = make_str("relative"); }
| ABSOLUTE { | ABSOLUTE {
mmerror(ET_WARN, "FETCH/ABSOLUTE not supported, backend will use RELATIVE"); mmerror(ET_NOTICE, "FETCH/ABSOLUTE not supported, backend will use RELATIVE");
$$ = make_str("absolute"); $$ = make_str("absolute");
} }
; ;
...@@ -3512,7 +3512,7 @@ c_expr: attr ...@@ -3512,7 +3512,7 @@ c_expr: attr
if (atol($3) != 0) if (atol($3) != 0)
{ {
sprintf(errortext, "CURRENT_TIME(%s) precision not implemented; backend will use zero instead", $3); sprintf(errortext, "CURRENT_TIME(%s) precision not implemented; backend will use zero instead", $3);
mmerror(ET_WARN, errortext); mmerror(ET_NOTICE, errortext);
} }
$$ = make_str("current_time"); $$ = make_str("current_time");
...@@ -3524,7 +3524,7 @@ c_expr: attr ...@@ -3524,7 +3524,7 @@ c_expr: attr
if (atol($3) != 0) if (atol($3) != 0)
{ {
sprintf(errortext, "CURRENT_TIMESTAMP(%s) precision not implemented; backend will use zero instead", $3); sprintf(errortext, "CURRENT_TIMESTAMP(%s) precision not implemented; backend will use zero instead", $3);
mmerror(ET_WARN, errortext); mmerror(ET_NOTICE, errortext);
} }
$$ = make_str("current_timestamp"); $$ = make_str("current_timestamp");
...@@ -3664,7 +3664,7 @@ case_expr: CASE case_arg when_clause_list case_default END_TRANS ...@@ -3664,7 +3664,7 @@ case_expr: CASE case_arg when_clause_list case_default END_TRANS
{ {
$$ = cat_str(5, make_str("nullif("), $3, make_str(","), $5, make_str(")")); $$ = cat_str(5, make_str("nullif("), $3, make_str(","), $5, make_str(")"));
mmerror(ET_WARN, "NULLIF() not yet fully implemented"); mmerror(ET_NOTICE, "NULLIF() not yet fully implemented");
} }
| COALESCE '(' expr_list ')' | COALESCE '(' expr_list ')'
{ {
......
...@@ -155,7 +155,7 @@ struct assignment ...@@ -155,7 +155,7 @@ struct assignment
enum errortype enum errortype
{ {
ET_WARN, ET_ERROR, ET_FATAL ET_NOTICE, ET_ERROR, ET_FATAL
}; };
struct fetch_desc struct fetch_desc
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment