Small regression and doc patch

diff --git a/src/BACKEND_DIRS b/src/BACKEND_DIRS
index d61efea704a7c435b627e125fbe48f2f9edda126..92131e128fcf1ac8e0b83e405f1fbd85aaaf8b6e 100644 (file)
--- a/src/BACKEND_DIRS
+++ b/src/BACKEND_DIRS
@@ -16,7 +16,6 @@ lib             support library
 libpq           communication to client libpq library routines
 main            passes control to postmaster or postgres
 nodes           creation/manipulation of nodes
-obj             object files
 optimizer       creates path and plan
 optimizer/path          creates path from parser output
 optimizer/plan          optmizes path output
@@ -46,21 +45,3 @@ utils/init              initialization stuff
 utils/mmgr              memory manager(process-local memory)
 utils/sort              sort routines for internal algorithms
 utils/time              transaction time qualification routines
-
-port            port-specific files
-port/BSD44_derived
-port/aix
-port/alpha
-port/bsdi
-port/dgux
-port/hpux
-port/i386_solaris
-port/irix5
-port/linux
-port/sunos4
-port/sparc_solaris
-port/svr4
-port/ultrix4
-port/win32
-port/win32/regex
-port/win32/sys

diff --git a/src/test/regress/expected.input b/src/test/regress/expected.input
index 6428dfc8d6a85305249e36eeb0d12f616171a8a5..7afc44ff14dd8e4e07c85ebbc0e9225566e128b9 100644 (file)
--- a/src/test/regress/expected.input
+++ b/src/test/regress/expected.input
@@ -4771,11 +4771,16 @@ QUERY: CLOSE foo25;
 QUERY: END;
 QUERY: PURGE hash_f8_heap BEFORE 'now';
 QUERY: SELECT count(*) AS has_10002 FROM hash_f8_heap[,] h;
+has_10002
+---------
+    10002
+(1 row)
+
 QUERY: VACUUM hash_f8_heap;
 QUERY: SELECT count(*) AS has_10000 FROM hash_f8_heap[,] h;
 has_10000
 ---------
-    10002
+    10000
 (1 row)
 
 QUERY: PURGE hash_i4_heap AFTER '@ 1 second ago';
@@ -6914,7 +6919,7 @@ QUERY: drop index 314159;
 WARN:parser: syntax error at or near "314159"
 
 QUERY: drop index nonesuch;
-WARN:index "nonesuch" nonexistant
+WARN:index "nonesuch" nonexistent
 QUERY: drop aggregate;
 WARN:parser: syntax error at or near ";"