Reverse out last scan.l patch for minus handling.\

8 files changed, 9 insertions, 9 deletions

diff --git a/doc/src/sgml/ref/pg_upgrade.sgml b/doc/src/sgml/ref/pg_upgrade.sgml
index 0ee6e96e8f..73b6be2c95 100644
--- a/doc/src/sgml/ref/pg_upgrade.sgml
+++ b/doc/src/sgml/ref/pg_upgrade.sgml
@@ -40,7 +40,7 @@ pg_upgrade [ -f <replaceable class="parameter">filename</replaceable> ] <replace
    is a utility for upgrading from a previous
    PostgreSQL release without reloading all the data.
    Not all <productname>Postgres</productname> release transitions can be
-   handled this way; check the release notes for details on your installation.
+   handled this way.  Check the release notes for details on your installation.
   </para>
 
   <procedure>
@@ -55,7 +55,7 @@ pg_upgrade [ -f <replaceable class="parameter">filename</replaceable> ] <replace
 
    <step performance="required">
     <para>
-     Do
+     Then do:
      <programlisting>
 % pg_dumpall -s >db.out
      </programlisting>
diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c
index 7ce87f7a60..ce7f3871b2 100644
--- a/src/backend/parser/parse_func.c
+++ b/src/backend/parser/parse_func.c
@@ -275,7 +275,7 @@ ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs,
 			if (rte == NULL)
 			{
 				rte = addRangeTableEntry(pstate, refname, refname,FALSE, FALSE);
-				elog(NOTICE,"Auto-creating query reference to table %s", refname);
+				elog(NOTICE,"Adding missing FROM-clause entry for table %s", refname);
 			}
 
 			relname = rte->relname;
@@ -434,7 +434,7 @@ ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs,
 			if (rte == NULL)
 			{
 				rte = addRangeTableEntry(pstate, refname, refname,FALSE, FALSE);
-				elog(NOTICE,"Auto-creating query reference to table %s", refname);
+				elog(NOTICE,"Adding missing FROM-clause entry for table %s", refname);
 			}
 										 
 			relname = rte->relname;
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 5394608dd9..beb77f5ecb 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -241,7 +241,7 @@ expandAll(ParseState *pstate, char *relname, char *refname, int *this_resno)
 	if (rte == NULL)
 	{
 		rte = addRangeTableEntry(pstate, relname, refname, FALSE, FALSE);
-		elog(NOTICE,"Auto-creating query reference to table %s", refname);
+		elog(NOTICE,"Adding missing FROM-clause entry for table %s", refname);
 	}
 
 	rel = heap_open(rte->relid, AccessShareLock);
diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l
index a0f5f173fd..a51269cf48 100644
--- a/src/backend/parser/scan.l
+++ b/src/backend/parser/scan.l
@@ -151,7 +151,7 @@ typecast		"::"
 
 self			[,()\[\].;$\:\+\-\*\/\%\^\<\>\=\|]
 op_and_self		[\~\!\@\#\^\&\|\`\?\$\:\+\-\*\/\%\<\>\=]
-operator	{op_and_self}|({op_and_self}+[\~\!\@\#\^\&\|\`\?\$\:\+\*\/\%\<\>\=])
+operator		{op_and_self}+
 
 /* we do not allow unary minus in numbers. 
  * instead we pass it verbatim to parser. there it gets
diff --git a/src/tools/backend/flow.fig b/src/tools/backend/flow.fig
index 8840cedbbe..457a2caf01 100644
--- a/src/tools/backend/flow.fig
+++ b/src/tools/backend/flow.fig
@@ -1,9 +1,9 @@
 #FIG 3.2
-Landscape
+Portrait
 Center
 Inches
 Letter  
-100.00
+88.90
 Single
 -2
 1200 2
diff --git a/src/tools/backend/flow.gif b/src/tools/backend/flow.gif
new file mode 100644
index 0000000000..4feb153795
--- /dev/null
+++ b/src/tools/backend/flow.gif
diff --git a/src/tools/backend/flow.jpg b/src/tools/backend/flow.jpg
deleted file mode 100644
index 1152edfdf6..0000000000
--- a/src/tools/backend/flow.jpg
+++ /dev/null
diff --git a/src/tools/backend/index.html b/src/tools/backend/index.html
index 8c318ae8bb..e21efb71c1 100644
--- a/src/tools/backend/index.html
+++ b/src/tools/backend/index.html
@@ -13,7 +13,7 @@ by Bruce Momjian
 <CENTER>
 <BR>
 <BR>
-<IMG src="flow.jpg" usemap="#flowmap" alt="flowchart" border=0>
+<IMG src="flow.gif" usemap="#flowmap" alt="flowchart" border=0>
 </CENTER>
 <MAP name="flowmap">
 <AREA COORDS="70,0,230,40" HREF="backend_dirs.html#main">