Add spacing for single-line comments with trailing semicolon _and_

comma, per Tom.

2 files changed, 46 insertions, 29 deletions

diff --git a/HISTORY b/HISTORY
index 10cd2f0d104..c44371e28a2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -65,7 +65,7 @@ PL/pgSQL memory leak fix (Jan, Tom)
 Fix nested EXCEPT/INTERSECT (Tom)
 Python fix fetchone() (Gerhard Haring)
 ECPG fixes (Michael, Christof Petig)
-
+PL/PgSQL trailing semicolon optional (Tom)
 
 Enhancements
 ------------
@@ -124,6 +124,16 @@ Allow ALTER TABLE ADD UNIQUE (Christopher Kings-Lynne)
 Super-user id now defaults to 1 (Peter E)
 Reject invalid multibyte character sequences (Tatsuo)
 New libpq PQescapeString() function to escape query strings (Florian Weimer)
+New EXPLAIN ANALYZE command that shows runtimes and tuple counts (Martijn
+  van Oosterhout)
+New postgresql.conf option to enable/disable "col = NULL" comparisons
+  (Peter E)
+New postgresql.conf parameter to control memory usage by VACUUM (Tom)
+New postgresql.conf time out parameter for client authentication (Tom)
+New pg_ctl 'reload' option (Tom)
+Add /contrib/intarray boolean queries, fixes (Oleg Bartunov)
+Measure transaction times in milliseconds (Thomas)
+'NOW' returns time in milliseconds 
 
 Types
 -----
@@ -133,7 +143,10 @@ BIT, BIT VARYING now returns error on too long input (Peter E)
 New function bit_length() (Peter E)
 inet, cidr text conversion functions (Alex Pilosov)
 inet, cidr operators << and <<= indexable (Alex Pilosov)
-Bytea comparison improvements (Joe Conway)
+Bytea comparison improvements, \### now requires three octal digits (Joe Conway)
+Make trim/ltrim/rtrim/btrim/lpad/rpad/translate() multibyte aware (Tatsuo)
+Add pg_database_encoding_max_length() (Tatsuo)
+Make mic2ascii() non-ASCII aware (Tatsuo)
 
 Performance
 -----------
@@ -147,39 +160,42 @@ Load pg_hba.conf only on startup and SIGHUP (Bruce)
 Interfaces
 ----------
 JDBC
-	return oid of INSERT (Ken K)
-	hande more data types (Ken K)
-	handle single quotes and newlines in strings (Ken K)
-	handle NULL variables (Ken K)
-	fix for timezone handling (Barry Lind)
+	Return oid of INSERT (Ken K)
+	Hande more data types (Ken K)
+	Handle single quotes and newlines in strings (Ken K)
+	Handle NULL variables (Ken K)
+	Fix for timezone handling (Barry Lind)
 	Improved Druid support
 	Allow eight-bit characters with non-multibyte server (Barry Lind)
-	support BIT, BINARY types (Ned Wolpert)
-	reduce memory usage (Michael Stephens, Dave Cramer)
-	update DatabaseMetaData (Peter E)
-	add DatabaseMetaData.getCatalogs() (Peter E)
-	encoding fixes (Anders Bengtsson)
-	get/setCatalog methods (Jason Davies)
-	DatabaseMetaData.getColumns() now returns column defaults (Jason Davies)
-	jdbc1 and jdbc2 merging (Anders Bengtsson)
-	transaction performance improvements (Barry Lind)
-	array fixes (Greg Zoller)
+	Support BIT, BINARY types (Ned Wolpert)
+	Reduce memory usage (Michael Stephens, Dave Cramer)
+	Update DatabaseMetaData (Peter E)
+	Add DatabaseMetaData.getCatalogs() (Peter E)
+	Encoding fixes (Anders Bengtsson)
+	Get/setCatalog methods (Jason Davies)
+	Databasemetadata.getColumns() now returns column defaults (Jason Davies)
+	Jdbc1 and jdbc2 merging (Anders Bengtsson)
+	Transaction performance improvements (Barry Lind)
+	Array fixes (Greg Zoller)
 	Serialize addition 
-	fix batch processing (Ren? Pijlman)
+	Fix batch processing (Ren? Pijlman)
 	ExecSQL method reorganization (Anders Bengtsson)
-	getColumn() fixes (Jeroen van Vianen)
-	fix isWriteable() function (Ren? Pijlman)
+	GetColumn() fixes (Jeroen van Vianen)
+	Fix isWriteable() function (Ren? Pijlman)
 	Improved passage of jdbc2 conformance tests (Ren? Pijlman)
 	Add bytea type capability (Barry Lind)
+	Add isNullable() (Rene Pijlman)
+	JDBC date/time test suite fixes (Liam Stewart)
 ODBC
-	remove query limit (Hiroshi)
-	remove text field size limit (Hiroshi)
-	fix for SQLPrimaryKeys() (Hiroshi)
-	procedure calls (Hiroshi)
+	Remove query limit (Hiroshi)
+	Remove text field size limit (Hiroshi)
+	Fix for SQLPrimaryKeys() (Hiroshi)
+	Procedure calls (Hiroshi)
 	FETCH first fix (Aidan Mountford)
-	updatable cursors (Hiroshi)
+	Updatable cursors (Hiroshi)
 	Most configure options on setable via DSN (Hiroshi)
-	multibyte, performance fixes (Hiroshi)
+	Multibyte, performance fixes (Hiroshi)
+	Allow driver to be used with iODBC or unixODBC (Peter E)
 ECPG
 	EXECUTE ... INTO ...    implemented
 	multiple row descriptor support (e.g. CARDINALITY)
@@ -207,12 +223,12 @@ Remove EXTEND INDEX (Martijn van Oosterhout, Tom)
 Correct description of translate() function (Bruce)
 /contrib/fulltextindex fixes (Christopher Kings-Lynne)
 Fix for Win32 socket communication failures (Magnus, Mikhail Terekhov)
-/contrib/intarray fixes (Oleg Bartunov)
 Hurd compile fix (Oliver Elphick)
 New /contrib/fuzzystrmatch with lievnshtein and metaphone, soundex merged (Joe Conway)
 Beos fixes (Cyril VELTER)
 Remove OID's from some system tables (Tom)
-New functions in /contrib/pgcrypto: crypt(), hmac(), encrypt() (Marko Kreen)
+New functions in /contrib/pgcrypto: crypt(), hmac(), encrypt(), gen_salt()
+  (Marko Kreen)
 System table operator reorganization (Oleg Bartunov, Teodor Sigaev, Tom)
 Rename config.h to pg_config.h (Peter E)
 pg_log now pg_clog (Tom)
@@ -225,6 +241,7 @@ Better cleanup for semaphore resource failure (Tatsuo, Tom)
 Remove compile-time limit on number of backends (Tom)
 Enable SIGTERM, SIGQUIT to kill backends (Jan)
 New pgjindent utility to indent java code (Bruce)
+Replace strcasecmp() with strcmp() where appropriate (Peter E)
 
 
 
diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
index 9938f92241e..4f58d28bf3f 100755
--- a/src/tools/pgindent/pgindent
+++ b/src/tools/pgindent/pgindent
@@ -1292,7 +1292,7 @@ int	pgindent_func_no_var_fix;\
 # pull in #endif comments
 	sed 's;^#endif[ 	][ 	]*/\*;#endif   /*;' |
 # add space after comments that start on tab stops
-	sed 's,;\(/\*.*\*/\)$,;	\1,' |
+	sed 's:\([;,]\)/\*.*\*/\)$:\1	\2:' |
 # work around #else indenting next line if #ifdef defines variables at top
 # work around misindenting of function with no variables defined
 	awk '