Re: Report: removing the inconsistencies in our CVS->git conversion

Tom Lane <tgl@sss.pgh.pa.us>

From: Tom Lane <tgl@sss.pgh.pa.us>
To: Robert Haas <robertmhaas@gmail.com>
Cc: pgsql-hackers@postgresql.org, Michael Haggerty <mhagger@alum.mit.edu>, Max Bowsher <maxb@f2s.com>
Date: 2010-09-17T16:40:35Z
Lists: pgsql-hackers

Commits

Same data as JSON: GET /api/v1/messages/:b64id/commits the thread's linked commits as JSON, with link sources. API reference →
  1. Applied patch to jdbc from Kim Ho at RedHat, fixing improper handling of empty queries under the V3 protocol

  2. Applied patch for jdbc from Kim Ho at RedHat to more correctly deal with boolean values

  3. Applied patch from Oliver Jowett to improve a buffer sizing.

  4. Code cleanup inspired by recent resname bug report (doesn't fix the bug

  5. Pass shared memory id and socket descriptor number on command line for

  6. Second try at avoiding conflicts with system isblank().

  7. Applied Kris Jurkas patch to fix rollback and SQLException

  8. applied patch from Oliver Jowett

  9. Make the world at least somewhat safe for zero-column tables, and

  10. Add mention of -F not supported by pg_dumpall. Code already disallows it.

  11. Two versions of QueryExecutor, currently only version 2 works 100%

  12. modifications to the way the protocol is handled to be consistent with

  13. Part of Anders Bengtsson's patch to clean up Connection.java

  14. Applied Anders patch to move the startup code out of Connection into StartupPacket

  15. >Added ServerEncoding

  16. > I am backing out this patch. Please resubmit with this corrected. Thanks.

  17. Fixes bug where query hangs if there is an error in the query, went back to

  18. Backpatch array I/O code and documentation fixes, also array slice

  19. fixed QueryExecuter to deal with multiple errors

  20. Repair bad calculation in timetz_izone() which gave erroneous results.

  21. backed out changes for cancel, no need to look for two 'Z' responses

  22. Patch by Nicolas Verger to correctly propogate SQLWarning to the Statement and ResultSet

  23. fixed cancel query bug introduced by patch

  24. Autoconf for jdbc debug changes.

  25. Updated the list of encodings supported to match what the backend now supports

  26. Added some additional comments in the code

  27. Update TODO list.

  28. Remove ConnectionHook.java. No longer used, bad code.

  29. The attached patch removes some old and dead code (and some related

  30. First batch of the tools merged in...

  31. This patch fixes an arrayindexoutofbounds exception that was just

  32. Add ./include/config.h.win32 to RELEASE update list.

Robert Haas <robertmhaas@gmail.com> writes:
>> On Fri, Sep 17, 2010 at 11:39 AM, Tom Lane <tgl@sss.pgh.pa.us> wrote:
>>> and I only see nine. It's got some *other* problems though; compared
>>> to a conversion I just finished locally, it's missing a whole lot of
>>> history for some of the old jdbc files.

> What's the problem with the old JDBC files?

This is what I sent to Magnus off-list:

There seems to be something wrong with this :-(.  I pulled this down
and compared the output of "git log --all --source --name-status"
to what I got from a fresh conversion of my own.  There seems to be
a substantial loss of history around some of the jdbc files.  See
attached diffs from my log to yours.

			regards, tom lane


*** revhist.git17	Fri Sep 17 10:44:50 2010
--- revhist.gitmha	Fri Sep 17 11:24:03 2010
***************
*** 236673,236679 ****
      
      From Donald Fraser.
  
- M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
  M	src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
  
--- 236673,236678 ----
***************
*** 249776,249786 ****
       	jdbc/org/postgresql/test/jdbc2/ServerCursorTest.java
  
  M	src/interfaces/jdbc/org/postgresql/Driver.java.in
- M	src/interfaces/jdbc/org/postgresql/core/BaseResultSet.java
- M	src/interfaces/jdbc/org/postgresql/core/BaseStatement.java
- M	src/interfaces/jdbc/org/postgresql/core/Field.java
- M	src/interfaces/jdbc/org/postgresql/core/PGStream.java
- M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSet.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java
--- 249775,249780 ----
***************
*** 254896,254902 ****
      
      Per report from Hans Nather.
  
- M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
  M	src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
  M	src/interfaces/jdbc/org/postgresql/test/jdbc2/Jdbc2TestSuite.java
  A	src/interfaces/jdbc/org/postgresql/test/jdbc2/NotifyTest.java
--- 254890,254895 ----
***************
*** 256307,256321 ****
  D	src/interfaces/jdbc/org/postgresql/PGNotification.java
  D	src/interfaces/jdbc/org/postgresql/PGRefCursorResultSet.java
  D	src/interfaces/jdbc/org/postgresql/PGStatement.java
- D	src/interfaces/jdbc/org/postgresql/core/BaseConnection.java
- D	src/interfaces/jdbc/org/postgresql/core/BaseResultSet.java
- D	src/interfaces/jdbc/org/postgresql/core/BaseStatement.java
- D	src/interfaces/jdbc/org/postgresql/core/Encoding.java
- D	src/interfaces/jdbc/org/postgresql/core/Field.java
- D	src/interfaces/jdbc/org/postgresql/core/Notification.java
- D	src/interfaces/jdbc/org/postgresql/core/PGStream.java
- D	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
- D	src/interfaces/jdbc/org/postgresql/core/StartupPacket.java
  D	src/interfaces/jdbc/org/postgresql/errors.properties
  D	src/interfaces/jdbc/org/postgresql/errors_de.properties
  D	src/interfaces/jdbc/org/postgresql/errors_fr.properties
--- 256300,256305 ----
***************
*** 261723,261729 ****
  M	src/interfaces/jdbc/example/corba/StockServer.java
  M	src/interfaces/jdbc/example/corba/stock.idl
  M	src/interfaces/jdbc/example/corba/stock.sql
- M	src/interfaces/jdbc/org/postgresql/core/StartupPacket.java
  M	src/interfaces/jdbc/org/postgresql/test/jdbc2/BlobTest.java
  M	src/interfaces/jdbc/org/postgresql/test/jdbc2/ConnectionTest.java
  M	src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java
--- 261707,261712 ----
***************
*** 262635,262648 ****
  M	src/interfaces/jdbc/org/postgresql/PGNotification.java
  M	src/interfaces/jdbc/org/postgresql/PGRefCursorResultSet.java
  M	src/interfaces/jdbc/org/postgresql/PGStatement.java
- M	src/interfaces/jdbc/org/postgresql/core/BaseConnection.java
- M	src/interfaces/jdbc/org/postgresql/core/BaseResultSet.java
- M	src/interfaces/jdbc/org/postgresql/core/BaseStatement.java
- M	src/interfaces/jdbc/org/postgresql/core/Encoding.java
- M	src/interfaces/jdbc/org/postgresql/core/Field.java
- M	src/interfaces/jdbc/org/postgresql/core/Notification.java
- M	src/interfaces/jdbc/org/postgresql/core/PGStream.java
- M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
  M	src/interfaces/jdbc/org/postgresql/errors_de.properties
  M	src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
  M	src/interfaces/jdbc/org/postgresql/fastpath/FastpathArg.java
--- 262618,262623 ----
***************
*** 266110,266117 ****
  
      Patches from Oliver Jowett to fix CursorFetchTest, 7.4 now does not automatically delete cursors
  
- M	src/interfaces/jdbc/org/postgresql/core/BaseConnection.java
- M	src/interfaces/jdbc/org/postgresql/core/BaseStatement.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSet.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java
--- 266085,266090 ----
***************
*** 270417,270434 ****
  
  M	src/backend/rewrite/rewriteDefine.c
  
! commit e8839c2b6c00bac6d8119ec0cc27a5e77169c8a0	refs/tags/REL7_4_BETA4
! Author: Barry Lind <barry@xythos.com>
! Date:   Wed Sep 17 08:21:36 2003 +0000
! 
!     Applied patch to jdbc from Kim Ho at RedHat, fixing improper handling of empty queries under the V3 protocol
!     
!      Modified Files:
!      	jdbc/org/postgresql/core/QueryExecutor.java
! 
! M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
! 
! commit c020d67bc692498520702e8b0734894558d47f70	refs/tags/REL7_4_BETA4
  Author: Barry Lind <barry@xythos.com>
  Date:   Wed Sep 17 07:00:24 2003 +0000
  
--- 270390,270396 ----
  
  M	src/backend/rewrite/rewriteDefine.c
  
! commit 245f6d3d963c59394b08dba31493d9a4374eec3a	refs/tags/REL7_4_BETA4
  Author: Barry Lind <barry@xythos.com>
  Date:   Wed Sep 17 07:00:24 2003 +0000
  
***************
*** 270976,270982 ****
       	jdbc/org/postgresql/util/PSQLState.java
  
  M	src/interfaces/jdbc/org/postgresql/Driver.java.in
- M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
  M	src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
  M	src/interfaces/jdbc/org/postgresql/geometric/PGbox.java
  M	src/interfaces/jdbc/org/postgresql/geometric/PGcircle.java
--- 270938,270943 ----
***************
*** 271667,271673 ****
       	jdbc/org/postgresql/jdbc2/AbstractJdbc2Statement.java
       	jdbc/org/postgresql/util/PSQLState.java
  
- M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSet.java
--- 271628,271633 ----
***************
*** 271821,271829 ****
       	jdbc/org/postgresql/util/PSQLException.java
  
  M	src/interfaces/jdbc/org/postgresql/Driver.java.in
- M	src/interfaces/jdbc/org/postgresql/core/Encoding.java
- M	src/interfaces/jdbc/org/postgresql/core/PGStream.java
- M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
  M	src/interfaces/jdbc/org/postgresql/errors.properties
  M	src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
--- 271781,271786 ----
***************
*** 272303,272309 ****
  M	src/interfaces/ecpg/test/test1.pgc
  M	src/interfaces/ecpg/test/test_thread.pgc
  M	src/interfaces/jdbc/build.xml
- M	src/interfaces/jdbc/org/postgresql/core/BaseStatement.java
  M	src/interfaces/jdbc/org/postgresql/errors.properties
  M	src/interfaces/jdbc/org/postgresql/errors_de.properties
  M	src/interfaces/jdbc/org/postgresql/errors_it.properties
--- 272260,272265 ----
***************
*** 273562,273568 ****
      older version of the driver exists in the classpath when trying to build.
  
  M	src/interfaces/jdbc/build.xml
- M	src/interfaces/jdbc/org/postgresql/core/BaseStatement.java
  M	src/interfaces/jdbc/org/postgresql/errors.properties
  M	src/interfaces/jdbc/org/postgresql/errors_de.properties
  M	src/interfaces/jdbc/org/postgresql/errors_it.properties
--- 273518,273523 ----
***************
*** 274536,274545 ****
       	jdbc/org/postgresql/core/QueryExecutor.java
       	jdbc/org/postgresql/util/PSQLException.java
  
- M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
  M	src/interfaces/jdbc/org/postgresql/util/PSQLException.java
  
! commit d7c609f7c4de9cdab1d2bd92964273d4cb34067f	refs/heads/WIN32_DEV
  Author: Barry Lind <barry@xythos.com>
  Date:   Mon Aug 11 21:12:00 2003 +0000
  
--- 274491,274499 ----
       	jdbc/org/postgresql/core/QueryExecutor.java
       	jdbc/org/postgresql/util/PSQLException.java
  
  M	src/interfaces/jdbc/org/postgresql/util/PSQLException.java
  
! commit 6684a3e6a4f2f12052e53ced276a963e4cc150ad	refs/remotes/origin/WIN32_DEV
  Author: Barry Lind <barry@xythos.com>
  Date:   Mon Aug 11 21:12:00 2003 +0000
  
***************
*** 274563,274572 ****
       	jdbc/build.xml jdbc/org/postgresql/core/BaseStatement.java
       	jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
  
- M	src/interfaces/jdbc/org/postgresql/core/BaseStatement.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
  
! commit 88381ade63de931c84f53dc873c986d40b8c8b61	refs/heads/WIN32_DEV
  Author: Tom Lane <tgl@sss.pgh.pa.us>
  Date:   Mon Aug 11 20:46:47 2003 +0000
  
--- 274517,274525 ----
       	jdbc/build.xml jdbc/org/postgresql/core/BaseStatement.java
       	jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
  
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
  
! commit cf40c6759694f21bd3bdda9f8ffc9753b159ff72	refs/remotes/origin/WIN32_DEV
  Author: Tom Lane <tgl@sss.pgh.pa.us>
  Date:   Mon Aug 11 20:46:47 2003 +0000
  
***************
*** 284744,284755 ****
       	jdbc/org/postgresql/test/jdbc3/Jdbc3TestSuite.java
  
  M	src/interfaces/jdbc/org/postgresql/PGConnection.java
- M	src/interfaces/jdbc/org/postgresql/core/BaseConnection.java
- M	src/interfaces/jdbc/org/postgresql/core/Encoding.java
- M	src/interfaces/jdbc/org/postgresql/core/Field.java
- M	src/interfaces/jdbc/org/postgresql/core/PGStream.java
- M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
- M	src/interfaces/jdbc/org/postgresql/core/StartupPacket.java
  M	src/interfaces/jdbc/org/postgresql/errors.properties
  M	src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
  M	src/interfaces/jdbc/org/postgresql/fastpath/FastpathArg.java
--- 284697,284702 ----
***************
*** 286670,286680 ****
       	jdbc/org/postgresql/core/QueryExecutor.java
       	jdbc/org/postgresql/jdbc3/AbstractJdbc3Connection.java
  
- M	src/interfaces/jdbc/org/postgresql/core/BaseStatement.java
- M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
  M	src/interfaces/jdbc/org/postgresql/jdbc3/AbstractJdbc3Connection.java
  
! commit d9fd7d12f6c08f1502e8d57d222797e86198b1a6	refs/tags/REL7_4_BETA1
  Author: Bruce Momjian <bruce@momjian.us>
  Date:   Tue May 6 23:34:56 2003 +0000
  
--- 286617,286625 ----
       	jdbc/org/postgresql/core/QueryExecutor.java
       	jdbc/org/postgresql/jdbc3/AbstractJdbc3Connection.java
  
  M	src/interfaces/jdbc/org/postgresql/jdbc3/AbstractJdbc3Connection.java
  
! commit 5cdb62cf6e569c6151ad2b96bb562a75528d699c	refs/tags/REL7_4_BETA1
  Author: Bruce Momjian <bruce@momjian.us>
  Date:   Tue May 6 23:34:56 2003 +0000
  
***************
*** 287095,287101 ****
       	jdbc/org/postgresql/test/jdbc2/RefCursorTest.java
  
  A	src/interfaces/jdbc/org/postgresql/PGRefCursorResultSet.java
- M	src/interfaces/jdbc/org/postgresql/core/BaseStatement.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSet.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/Jdbc1CallableStatement.java
--- 287040,287045 ----
***************
*** 288440,288449 ****
       	jdbc/org/postgresql/core/BaseConnection.java
       	jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java
  
- M	src/interfaces/jdbc/org/postgresql/core/BaseConnection.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java
  
! commit e3859d1ad982880a0d1cc57e4fd5e2b598634fc6	refs/tags/REL7_2_5
  Author: Tom Lane <tgl@sss.pgh.pa.us>
  Date:   Sun Apr 13 04:07:43 2003 +0000
  
--- 288384,288392 ----
       	jdbc/org/postgresql/core/BaseConnection.java
       	jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java
  
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java
  
! commit 948072686bbbda38f77130e1e9582c73022dca09	refs/tags/REL7_2_5
  Author: Tom Lane <tgl@sss.pgh.pa.us>
  Date:   Sun Apr 13 04:07:43 2003 +0000
  
***************
*** 291990,291996 ****
       	jdbc/org/postgresql/jdbc2/Array.java
       	jdbc/org/postgresql/util/PSQLException.java
  
- M	src/interfaces/jdbc/org/postgresql/core/BaseResultSet.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSet.java
  M	src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2ResultSet.java
  M	src/interfaces/jdbc/org/postgresql/util/PSQLException.java
--- 291933,291938 ----
***************
*** 292130,292144 ****
  M	src/interfaces/jdbc/org/postgresql/PGNotification.java
  M	src/interfaces/jdbc/org/postgresql/PGStatement.java
  D	src/interfaces/jdbc/org/postgresql/PG_Stream.java
- A	src/interfaces/jdbc/org/postgresql/core/BaseConnection.java
- A	src/interfaces/jdbc/org/postgresql/core/BaseResultSet.java
- A	src/interfaces/jdbc/org/postgresql/core/BaseStatement.java
- M	src/interfaces/jdbc/org/postgresql/core/Encoding.java
- A	src/interfaces/jdbc/org/postgresql/core/Field.java
- M	src/interfaces/jdbc/org/postgresql/core/Notification.java
- A	src/interfaces/jdbc/org/postgresql/core/PGStream.java
- M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
- M	src/interfaces/jdbc/org/postgresql/core/StartupPacket.java
  M	src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
  M	src/interfaces/jdbc/org/postgresql/fastpath/FastpathArg.java
  M	src/interfaces/jdbc/org/postgresql/geometric/PGbox.java
--- 292072,292077 ----
***************
*** 294429,294435 ****
       	jdbc/org/postgresql/core/Encoding.java
       	jdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java
  
- M	src/interfaces/jdbc/org/postgresql/core/Encoding.java
  M	src/interfaces/jdbc/org/postgresql/errors.properties
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java
  
--- 294362,294367 ----
***************
*** 294446,294452 ****
       	jdbc/org/postgresql/core/Encoding.java
       	jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java
  
- M	src/interfaces/jdbc/org/postgresql/core/Encoding.java
  M	src/interfaces/jdbc/org/postgresql/errors.properties
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java
  
--- 294378,294383 ----
***************
*** 294766,294788 ****
  M	doc/src/sgml/ref/fetch.sgml
  M	doc/src/sgml/ref/move.sgml
  
! commit 65b4214d06796a8e56c850a57ed74440ae4dabca	refs/tags/REL7_3_4
! Author: Dave Cramer <davec@fastcrypt.com>
! Date:   Tue Feb 4 11:16:00 2003 +0000
! 
!     Fix for rollback SQLException from Kris Jurka
! 
! M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
! 
! commit 985e551b486647a16c880c01e41cabd37855ecb8	refs/tags/REL7_4_BETA1
! Author: Dave Cramer <davec@fastcrypt.com>
! Date:   Tue Feb 4 11:01:52 2003 +0000
! 
!     Applied Kris Jurkas patch to fix rollback and SQLException
! 
! M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
! 
! commit d23fd9572b4cd6bfea3f74067a2d631c20fda886	refs/tags/REL7_4_BETA1
  Author: Dave Cramer <davec@fastcrypt.com>
  Date:   Tue Feb 4 10:44:37 2003 +0000
  
--- 294697,294703 ----
  M	doc/src/sgml/ref/fetch.sgml
  M	doc/src/sgml/ref/move.sgml
  
! commit e1cc52e02ce48b73f0995cfb929723751bb2a612	refs/tags/REL7_4_BETA1
  Author: Dave Cramer <davec@fastcrypt.com>
  Date:   Tue Feb 4 10:44:37 2003 +0000
  
***************
*** 294808,294814 ****
      so that rows can be fetched incrementally.  This is enabled by using
      setFetchSize()
  
- M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSet.java
--- 294723,294728 ----
***************
*** 302664,302671 ****
       	jdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java
       	jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java
  
- M	src/interfaces/jdbc/org/postgresql/core/Encoding.java
- M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
  M	src/interfaces/jdbc/org/postgresql/errors.properties
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java
--- 302578,302583 ----
***************
*** 302686,302693 ****
       	jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
       	jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java
  
- M	src/interfaces/jdbc/org/postgresql/core/Encoding.java
- M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
  M	src/interfaces/jdbc/org/postgresql/errors.properties
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java
--- 302598,302603 ----
***************
*** 304365,304372 ****
  D	contrib/retep/uk/org/retep/util/models/PropertiesTableModel.java
  D	contrib/retep/uk/org/retep/util/proped/Main.java
  D	contrib/retep/uk/org/retep/util/proped/PropertyEditor.java
- D	contrib/retep/uk/org/retep/xml/core/XMLFactory.java
- D	contrib/retep/uk/org/retep/xml/core/XMLFactoryException.java
  D	contrib/retep/uk/org/retep/xml/jdbc/XMLDatabase.java
  D	contrib/retep/uk/org/retep/xml/jdbc/XMLResultSet.java
  D	contrib/retep/uk/org/retep/xml/parser/TagHandler.java
--- 304275,304280 ----
***************
*** 304388,304404 ****
  D	src/interfaces/jdbc/utils/changelog.pl
  D	src/test/regress/expected/geometry-bsdi-precision.out
  
! commit 7001c399bb5957ca9b7a3412128ae8e38829ed65	refs/tags/REL7_3_2
! Author: PostgreSQL Daemon <webmaster@postgresql.org>
  Date:   Mon Nov 4 17:14:30 2002 +0000
  
!     This commit was manufactured by cvs2svn to create branch 'REL7_3_STABLE'.
      
      Sprout from master 2002-11-04 17:14:29 UTC Tom Lane <tgl@sss.pgh.pa.us> 'Remove extraneous semicolons after routine bodies.  These don't bother'
      Cherrypick from master 2002-09-04 07:23:04 UTC Bruce Momjian <bruce@momjian.us> 'Brand 7.3.  Ready for beta!':
          contrib/xml/README
          contrib/retep/uk/org/retep/xml/test/XMLExport.java
          contrib/xml/pgxml.source
          contrib/retep/Implementation
          contrib/retep/Makefile
          contrib/retep/README
--- 304296,304313 ----
  D	src/interfaces/jdbc/utils/changelog.pl
  D	src/test/regress/expected/geometry-bsdi-precision.out
  
! commit 32c0b8b61586afd904cf50d1b5cfd818b77d103b	refs/tags/REL7_3_2
! Author: Git to CVS conversion script <webmaster@postgresql.org>
  Date:   Mon Nov 4 17:14:30 2002 +0000
  
!     This commit was manufactured by cvs2git to create branch 'REL7_3_STABLE'.
      
      Sprout from master 2002-11-04 17:14:29 UTC Tom Lane <tgl@sss.pgh.pa.us> 'Remove extraneous semicolons after routine bodies.  These don't bother'
      Cherrypick from master 2002-09-04 07:23:04 UTC Bruce Momjian <bruce@momjian.us> 'Brand 7.3.  Ready for beta!':
          contrib/xml/README
          contrib/retep/uk/org/retep/xml/test/XMLExport.java
          contrib/xml/pgxml.source
+         contrib/retep/CHANGELOG
          contrib/retep/Implementation
          contrib/retep/Makefile
          contrib/retep/README
***************
*** 304406,304419 ****
          contrib/retep/retep.jpx
          contrib/retep/data/cds.dtd
          contrib/retep/data/cds.xml
-         contrib/retep/uk/org/retep/tools.properties
-         contrib/retep/uk/org/retep/dtu/DCollection.java
-         contrib/retep/uk/org/retep/dtu/DConstants.java
          contrib/xml/pgxml_dom.source
          contrib/retep/uk/org/retep/dtu/DElement.java
          contrib/retep/uk/org/retep/dtu/DEnvironment.java
          contrib/retep/uk/org/retep/dtu/DModule.java
-         contrib/retep/uk/org/retep/dtu/DModuleXML.java
          contrib/retep/uk/org/retep/dtu/DNode.java
          contrib/retep/uk/org/retep/dtu/DProcessor.java
          contrib/retep/uk/org/retep/dtu/DTransform.java
--- 304315,304325 ----
          contrib/retep/retep.jpx
          contrib/retep/data/cds.dtd
          contrib/retep/data/cds.xml
          contrib/xml/pgxml_dom.source
+         contrib/retep/uk/org/retep/dtu/DConstants.java
          contrib/retep/uk/org/retep/dtu/DElement.java
          contrib/retep/uk/org/retep/dtu/DEnvironment.java
          contrib/retep/uk/org/retep/dtu/DModule.java
          contrib/retep/uk/org/retep/dtu/DNode.java
          contrib/retep/uk/org/retep/dtu/DProcessor.java
          contrib/retep/uk/org/retep/dtu/DTransform.java
***************
*** 304433,304455 ****
          contrib/retep/uk/org/retep/util/models/PropertiesTableModel.java
          contrib/retep/uk/org/retep/util/proped/Main.java
          contrib/retep/uk/org/retep/util/proped/PropertyEditor.java
-         contrib/retep/uk/org/retep/xml/core/XMLFactory.java
-         contrib/retep/uk/org/retep/xml/core/XMLFactoryException.java
          contrib/retep/uk/org/retep/xml/jdbc/XMLDatabase.java
          contrib/retep/uk/org/retep/xml/jdbc/XMLResultSet.java
          contrib/retep/uk/org/retep/xml/parser/TagListener.java
          doc/src/sgml/libpgeasy.sgml
          doc/src/sgml/odbc.sgml
          doc/src/sgml/recovery.sgml
-         src/test/regress/expected/geometry-bsdi-precision.out
-         contrib/retep/uk/org/retep/xml/parser/TagHandler.java
          doc/src/sgml/version.sgml
          doc/src/sgml/y2k.sgml
-         src/interfaces/jdbc/utils/CheckVersion.java
          src/interfaces/jdbc/utils/buildDriver
          src/interfaces/jdbc/utils/changelog.pl
          src/interfaces/jdbc/Implementation
!         contrib/retep/CHANGELOG
          src/interfaces/jdbc/CHANGELOG
          src/interfaces/jdbc/jdbc.jpx
  
--- 304339,304361 ----
          contrib/retep/uk/org/retep/util/models/PropertiesTableModel.java
          contrib/retep/uk/org/retep/util/proped/Main.java
          contrib/retep/uk/org/retep/util/proped/PropertyEditor.java
          contrib/retep/uk/org/retep/xml/jdbc/XMLDatabase.java
          contrib/retep/uk/org/retep/xml/jdbc/XMLResultSet.java
+         contrib/retep/uk/org/retep/xml/parser/TagHandler.java
          contrib/retep/uk/org/retep/xml/parser/TagListener.java
          doc/src/sgml/libpgeasy.sgml
+         src/test/regress/expected/geometry-bsdi-precision.out
          doc/src/sgml/odbc.sgml
          doc/src/sgml/recovery.sgml
          doc/src/sgml/version.sgml
          doc/src/sgml/y2k.sgml
          src/interfaces/jdbc/utils/buildDriver
+         contrib/retep/uk/org/retep/tools.properties
+         contrib/retep/uk/org/retep/dtu/DCollection.java
+         src/interfaces/jdbc/utils/CheckVersion.java
          src/interfaces/jdbc/utils/changelog.pl
          src/interfaces/jdbc/Implementation
!         contrib/retep/uk/org/retep/dtu/DModuleXML.java
          src/interfaces/jdbc/CHANGELOG
          src/interfaces/jdbc/jdbc.jpx
  
***************
*** 304487,304494 ****
  A	contrib/retep/uk/org/retep/util/models/PropertiesTableModel.java
  A	contrib/retep/uk/org/retep/util/proped/Main.java
  A	contrib/retep/uk/org/retep/util/proped/PropertyEditor.java
- A	contrib/retep/uk/org/retep/xml/core/XMLFactory.java
- A	contrib/retep/uk/org/retep/xml/core/XMLFactoryException.java
  A	contrib/retep/uk/org/retep/xml/jdbc/XMLDatabase.java
  A	contrib/retep/uk/org/retep/xml/jdbc/XMLResultSet.java
  A	contrib/retep/uk/org/retep/xml/parser/TagHandler.java
--- 304393,304398 ----
***************
*** 306056,306063 ****
  D	contrib/retep/uk/org/retep/util/models/PropertiesTableModel.java
  D	contrib/retep/uk/org/retep/util/proped/Main.java
  D	contrib/retep/uk/org/retep/util/proped/PropertyEditor.java
- D	contrib/retep/uk/org/retep/xml/core/XMLFactory.java
- D	contrib/retep/uk/org/retep/xml/core/XMLFactoryException.java
  D	contrib/retep/uk/org/retep/xml/jdbc/XMLDatabase.java
  D	contrib/retep/uk/org/retep/xml/jdbc/XMLResultSet.java
  D	contrib/retep/uk/org/retep/xml/parser/TagHandler.java
--- 305960,305965 ----
***************
*** 306159,306165 ****
       	jdbc/utils/changelog.pl
  
  M	src/interfaces/jdbc/Makefile
- M	src/interfaces/jdbc/org/postgresql/core/Encoding.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
  D	src/interfaces/jdbc/utils/CheckVersion.java
  D	src/interfaces/jdbc/utils/buildDriver
--- 306061,306066 ----
***************
*** 310347,310356 ****
  M	src/interfaces/jdbc/org/postgresql/PGConnection.java
  M	src/interfaces/jdbc/org/postgresql/PGNotification.java
  M	src/interfaces/jdbc/org/postgresql/PGStatement.java
- M	src/interfaces/jdbc/org/postgresql/core/Encoding.java
- M	src/interfaces/jdbc/org/postgresql/core/Notification.java
- M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
- M	src/interfaces/jdbc/org/postgresql/core/StartupPacket.java
  M	src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java
--- 310248,310253 ----
***************
*** 312352,312359 ****
  M	src/interfaces/jdbc/org/postgresql/PGConnection.java
  A	src/interfaces/jdbc/org/postgresql/PGNotification.java
  M	src/interfaces/jdbc/org/postgresql/PGStatement.java
- A	src/interfaces/jdbc/org/postgresql/core/Notification.java
- M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSet.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java
--- 312249,312254 ----
***************
*** 314599,314605 ****
       	jdbc/org/postgresql/jdbc2/AbstractJdbc2Statement.java
       	jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java
  
- M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java
  M	src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2ResultSet.java
--- 314494,314499 ----
***************
*** 315610,315622 ****
  
  M	src/interfaces/jdbc/org/postgresql/Driver.java.in
  M	src/interfaces/jdbc/org/postgresql/PG_Stream.java
- D	src/interfaces/jdbc/org/postgresql/core/BytePoolDim1.java
- D	src/interfaces/jdbc/org/postgresql/core/BytePoolDim2.java
- D	src/interfaces/jdbc/org/postgresql/core/MemoryPool.java
- D	src/interfaces/jdbc/org/postgresql/core/ObjectPool.java
- D	src/interfaces/jdbc/org/postgresql/core/SimpleObjectPool.java
  
! commit c43760a7143b3f1f0c746e907849bf77b8674c36	refs/tags/REL7_4_BETA1
  Author: Bruce Momjian <bruce@momjian.us>
  Date:   Tue Aug 20 02:20:48 2002 +0000
  
--- 315504,315511 ----
  
  M	src/interfaces/jdbc/org/postgresql/Driver.java.in
  M	src/interfaces/jdbc/org/postgresql/PG_Stream.java
  
! commit 353e8d63887ff6ce9b189e351237b5c4be7c0149	refs/tags/REL7_4_BETA1
  Author: Bruce Momjian <bruce@momjian.us>
  Date:   Tue Aug 20 02:20:48 2002 +0000
  
***************
*** 319778,319784 ****
  A	src/interfaces/jdbc/org/postgresql/PGStatement.java
  D	src/interfaces/jdbc/org/postgresql/ResultSet.java
  D	src/interfaces/jdbc/org/postgresql/Statement.java
- M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
  M	src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
  A	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
  A	src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSet.java
--- 319667,319672 ----
***************
*** 322769,322779 ****
  A	src/test/regress/expected/rangefuncs.out
  A	src/test/regress/sql/rangefuncs.sql
  
! commit 36288fbd202ea55fe602e5c34dac4945421e1974	refs/heads/ecpg_big_bison
! Author: PostgreSQL Daemon <webmaster@postgresql.org>
  Date:   Thu Jun 20 20:29:55 2002 +0000
  
!     This commit was manufactured by cvs2svn to create branch 'ecpg_big_bison'.
      
      Sprout from master 2002-06-20 20:29:54 UTC Bruce Momjian <bruce@momjian.us> 'Update copyright to 2002.'
      Delete:
--- 322657,322667 ----
  A	src/test/regress/expected/rangefuncs.out
  A	src/test/regress/sql/rangefuncs.sql
  
! commit 6b45cd034bde6e49a84e71c11b34a1f99211f8ff	refs/remotes/origin/ecpg_big_bison
! Author: Git to CVS conversion script <webmaster@postgresql.org>
  Date:   Thu Jun 20 20:29:55 2002 +0000
  
!     This commit was manufactured by cvs2git to create branch 'ecpg_big_bison'.
      
      Sprout from master 2002-06-20 20:29:54 UTC Bruce Momjian <bruce@momjian.us> 'Update copyright to 2002.'
      Delete:
***************
*** 323040,323047 ****
          contrib/retep/uk/org/retep/util/models/PropertiesTableModel.java
          contrib/retep/uk/org/retep/util/proped/Main.java
          contrib/retep/uk/org/retep/util/proped/PropertyEditor.java
-         contrib/retep/uk/org/retep/xml/core/XMLFactory.java
-         contrib/retep/uk/org/retep/xml/core/XMLFactoryException.java
          contrib/retep/uk/org/retep/xml/jdbc/XMLDatabase.java
          contrib/retep/uk/org/retep/xml/jdbc/XMLResultSet.java
          contrib/retep/uk/org/retep/xml/parser/TagHandler.java
--- 322928,322933 ----
***************
*** 324680,324693 ****
          src/interfaces/jdbc/org/postgresql/PostgresqlDataSource.java
          src/interfaces/jdbc/org/postgresql/ResultSet.java
          src/interfaces/jdbc/org/postgresql/Statement.java
-         src/interfaces/jdbc/org/postgresql/core/BytePoolDim1.java
-         src/interfaces/jdbc/org/postgresql/core/BytePoolDim2.java
-         src/interfaces/jdbc/org/postgresql/core/Encoding.java
-         src/interfaces/jdbc/org/postgresql/core/MemoryPool.java
-         src/interfaces/jdbc/org/postgresql/core/ObjectPool.java
-         src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
-         src/interfaces/jdbc/org/postgresql/core/SimpleObjectPool.java
-         src/interfaces/jdbc/org/postgresql/core/StartupPacket.java
          src/interfaces/jdbc/org/postgresql/errors.properties
          src/interfaces/jdbc/org/postgresql/errors_de.properties
          src/interfaces/jdbc/org/postgresql/errors_fr.properties
--- 324566,324571 ----
***************
*** 325736,325743 ****
  D	contrib/retep/uk/org/retep/util/models/PropertiesTableModel.java
  D	contrib/retep/uk/org/retep/util/proped/Main.java
  D	contrib/retep/uk/org/retep/util/proped/PropertyEditor.java
- D	contrib/retep/uk/org/retep/xml/core/XMLFactory.java
- D	contrib/retep/uk/org/retep/xml/core/XMLFactoryException.java
  D	contrib/retep/uk/org/retep/xml/jdbc/XMLDatabase.java
  D	contrib/retep/uk/org/retep/xml/jdbc/XMLResultSet.java
  D	contrib/retep/uk/org/retep/xml/parser/TagHandler.java
--- 325614,325619 ----
***************
*** 327376,327389 ****
  D	src/interfaces/jdbc/org/postgresql/PostgresqlDataSource.java
  D	src/interfaces/jdbc/org/postgresql/ResultSet.java
  D	src/interfaces/jdbc/org/postgresql/Statement.java
- D	src/interfaces/jdbc/org/postgresql/core/BytePoolDim1.java
- D	src/interfaces/jdbc/org/postgresql/core/BytePoolDim2.java
- D	src/interfaces/jdbc/org/postgresql/core/Encoding.java
- D	src/interfaces/jdbc/org/postgresql/core/MemoryPool.java
- D	src/interfaces/jdbc/org/postgresql/core/ObjectPool.java
- D	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
- D	src/interfaces/jdbc/org/postgresql/core/SimpleObjectPool.java
- D	src/interfaces/jdbc/org/postgresql/core/StartupPacket.java
  D	src/interfaces/jdbc/org/postgresql/errors.properties
  D	src/interfaces/jdbc/org/postgresql/errors_de.properties
  D	src/interfaces/jdbc/org/postgresql/errors_fr.properties
--- 327252,327257 ----
***************
*** 336274,336281 ****
  
  M	src/interfaces/jdbc/org/postgresql/Connection.java
  M	src/interfaces/jdbc/org/postgresql/Driver.java.in
- M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
- D	src/interfaces/jdbc/org/postgresql/core/QueryExecutor2.java
  M	src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
  M	src/interfaces/jdbc/org/postgresql/jdbc2/Connection.java
  
--- 336142,336147 ----
***************
*** 336758,336778 ****
  
  M	src/bin/pg_dump/pg_dump.c
  
! commit 78d40a2a2f415071e82a6be9667ba96d398856ab	refs/tags/REL7_4_BETA1
! Author: Dave Cramer <davec@fastcrypt.com>
! Date:   Thu Mar 21 03:20:30 2002 +0000
! 
!     Two versions of QueryExecutor, currently only version 2 works 100%
!     these versions adhere to the backend protocol better than previous version
!     fixes problem when an error occurs on the backend, and the connection is still used
!     previous versions were throwing an exception half way through the protocol, leaving it
!     indeterminate.
!     also removes empty query code, should speed things up a bit
! 
! M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
! A	src/interfaces/jdbc/org/postgresql/core/QueryExecutor2.java
! 
! commit 54cc549d8f2505fa4a3bd0aae382247497a4c613	refs/tags/REL7_4_BETA1
  Author: Dave Cramer <davec@fastcrypt.com>
  Date:   Thu Mar 21 02:52:37 2002 +0000
  
--- 336624,336630 ----
  
  M	src/bin/pg_dump/pg_dump.c
  
! commit a7b0aad3040b9d117b6d2510ab2961ea584cb5bc	refs/tags/REL7_4_BETA1
  Author: Dave Cramer <davec@fastcrypt.com>
  Date:   Thu Mar 21 02:52:37 2002 +0000
  
***************
*** 336783,336797 ****
  
  M	src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
  
! commit 00923229c2f076d241daf03dbc05e1458539c6d3	refs/tags/REL7_4_BETA1
! Author: Dave Cramer <davec@fastcrypt.com>
! Date:   Thu Mar 21 02:40:03 2002 +0000
! 
!     Part of Anders Bengtsson's patch to clean up Connection.java
! 
! A	src/interfaces/jdbc/org/postgresql/core/StartupPacket.java
! 
! commit d96c29ab301ac22488cf8443e1da819826c47ac1	refs/tags/REL7_4_BETA1
  Author: Dave Cramer <davec@fastcrypt.com>
  Date:   Thu Mar 21 02:39:06 2002 +0000
  
--- 336635,336641 ----
  
  M	src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
  
! commit 5f629417b24f473116f65d078ecd71008b86524d	refs/tags/REL7_4_BETA1
  Author: Dave Cramer <davec@fastcrypt.com>
  Date:   Thu Mar 21 02:39:06 2002 +0000
  
***************
*** 337058,337086 ****
  
  M	src/backend/utils/adt/ri_triggers.c
  
! commit eb1fb8650fb2b12d93f8c20cdb97c772ede944de	refs/tags/REL7_4_BETA1
! Author: Bruce Momjian <bruce@momjian.us>
! Date:   Tue Mar 19 02:48:45 2002 +0000
! 
!     >Added ServerEncoding
!     >       Korean (JOHAB), Thai (WIN874),
!     >       Vietnamese (TCVN), Arabic (WIN1256)
!     >
!     >Added ClientEncoding
!     >       Simplified Chinese (GBK), Korean (UHC)
!     >
!     >Add PsqlODBC and document ...etc patch.
!     
!     
!     "JDBC patch" is delivered, too. :-)
!     
!     
!     
!     Eiji Tokuya
! 
! M	src/interfaces/jdbc/org/postgresql/core/Encoding.java
! 
! commit d3337c6e3f9bca1c98ca8e3de218b0e2a5d2f29d	refs/tags/REL7_4_BETA1
  Author: Bruce Momjian <bruce@momjian.us>
  Date:   Tue Mar 19 02:47:57 2002 +0000
  
--- 336902,336908 ----
  
  M	src/backend/utils/adt/ri_triggers.c
  
! commit 60b39ed9687c43f2f93d1e5138f5baa7550301a0	refs/tags/REL7_4_BETA1
  Author: Bruce Momjian <bruce@momjian.us>
  Date:   Tue Mar 19 02:47:57 2002 +0000
  
***************
*** 337247,337262 ****
  M	doc/FAQ
  M	doc/src/FAQ/FAQ.html
  
! commit 202a19e47bfd3a28dc1ec7ef73d15c05a532bd13	refs/tags/REL7_4_BETA1
! Author: Dave Cramer <davec@fastcrypt.com>
! Date:   Mon Mar 18 04:16:33 2002 +0000
! 
!     Fixes bug where query hangs if there is an error in the query, went back to
!     code before QueryExecutor class was created and copied behaviour
! 
! M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
! 
! commit bbc1fb07c62526469af4896a634b895623d403a1	refs/tags/REL7_2_3
  Author: Tom Lane <tgl@sss.pgh.pa.us>
  Date:   Sun Mar 17 20:05:59 2002 +0000
  
--- 337069,337075 ----
  M	doc/FAQ
  M	doc/src/FAQ/FAQ.html
  
! commit 5e4dae0b37104f7255c104f464091495e01d0ef7	refs/tags/REL7_2_3
  Author: Tom Lane <tgl@sss.pgh.pa.us>
  Date:   Sun Mar 17 20:05:59 2002 +0000
  
***************
*** 337288,337296 ****
  
  M	src/backend/utils/adt/arrayfuncs.c
  
! commit 134fe5ec61cb280459a4782b6d465e115c5ac5a8	refs/tags/REL7_4_BETA1
  Author: Dave Cramer <davec@fastcrypt.com>
! Date:   Sat Mar 16 02:15:23 2002 +0000
  
      fixed QueryExecuter to deal with multiple errors
      previously it was throwing a SQLException as soon as the error message was
--- 337101,337109 ----
  
  M	src/backend/utils/adt/arrayfuncs.c
  
! commit e90d2c594d0146ce2eef96799969105cfd71d41c	refs/tags/REL7_4_BETA1
  Author: Dave Cramer <davec@fastcrypt.com>
! Date:   Sat Mar 16 02:15:22 2002 +0000
  
      fixed QueryExecuter to deal with multiple errors
      previously it was throwing a SQLException as soon as the error message was
***************
*** 337300,337308 ****
      Also added setLogLevel to Driver.java, and made the log levels public
  
  M	src/interfaces/jdbc/org/postgresql/Driver.java.in
- M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
  
! commit efec53adb3a35b5ebbff3f12a0063685c1cd3e09	refs/tags/REL7_2_3
  Author: Thomas G. Lockhart <lockhart@fourpalms.org>
  Date:   Fri Mar 15 23:37:48 2002 +0000
  
--- 337113,337120 ----
      Also added setLogLevel to Driver.java, and made the log levels public
  
  M	src/interfaces/jdbc/org/postgresql/Driver.java.in
  
! commit 13506210df646063a74d36b5c0a46e7ed58a11d4	refs/tags/REL7_2_3
  Author: Thomas G. Lockhart <lockhart@fourpalms.org>
  Date:   Fri Mar 15 23:37:48 2002 +0000
  
***************
*** 338451,338465 ****
  
  M	src/interfaces/jdbc/org/postgresql/jdbc2/Statement.java
  
! commit ffe356b5dd39ce5e48546d1f6299c6c6897eb501	refs/tags/REL7_4_BETA1
! Author: Dave Cramer <davec@fastcrypt.com>
! Date:   Tue Mar 5 20:11:57 2002 +0000
! 
!     backed out changes for cancel, no need to look for two 'Z' responses
! 
! M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
! 
! commit 29ea8ff9b13f7e4e42d18a04a46e5cc3d8f9cfd2	refs/tags/REL7_4_BETA1
  Author: Dave Cramer <davec@fastcrypt.com>
  Date:   Tue Mar 5 18:02:44 2002 +0000
  
--- 338263,338269 ----
  
  M	src/interfaces/jdbc/org/postgresql/jdbc2/Statement.java
  
! commit 3ae2c4b06f6322a3cb777f08b59edec35099e409	refs/tags/REL7_4_BETA1
  Author: Dave Cramer <davec@fastcrypt.com>
  Date:   Tue Mar 5 18:02:44 2002 +0000
  
***************
*** 338468,338483 ****
  M	src/interfaces/jdbc/org/postgresql/ResultSet.java
  M	src/interfaces/jdbc/org/postgresql/Statement.java
  
! commit ff2f9b663f73b020cc5f8fa05d848a6f6d33c6ac	refs/tags/REL7_4_BETA1
  Author: Dave Cramer <davec@fastcrypt.com>
! Date:   Tue Mar 5 18:01:27 2002 +0000
  
      fixed cancel query bug introduced by patch
  
  M	src/interfaces/jdbc/org/postgresql/Connection.java
- M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
  
! commit b7cc409f7f5e81628a2c62da15f013ec33714392	refs/tags/REL7_4_BETA1
  Author: Bruce Momjian <bruce@momjian.us>
  Date:   Tue Mar 5 17:55:45 2002 +0000
  
--- 338272,338286 ----
  M	src/interfaces/jdbc/org/postgresql/ResultSet.java
  M	src/interfaces/jdbc/org/postgresql/Statement.java
  
! commit 73de87d505c9079b484c8fbb17c5a08a8b12a018	refs/tags/REL7_4_BETA1
  Author: Dave Cramer <davec@fastcrypt.com>
! Date:   Tue Mar 5 18:00:36 2002 +0000
  
      fixed cancel query bug introduced by patch
  
  M	src/interfaces/jdbc/org/postgresql/Connection.java
  
! commit 54c3f680c2366db831f1ce45d23f991e132f963e	refs/tags/REL7_4_BETA1
  Author: Bruce Momjian <bruce@momjian.us>
  Date:   Tue Mar 5 17:55:45 2002 +0000
  
***************
*** 346690,346696 ****
  M	src/interfaces/jdbc/org/postgresql/Connection.java
  M	src/interfaces/jdbc/org/postgresql/ResultSet.java
  M	src/interfaces/jdbc/org/postgresql/Statement.java
- M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/Connection.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/PreparedStatement.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/ResultSet.java
--- 346493,346498 ----
***************
*** 347466,347474 ****
  M	src/interfaces/jdbc/example/corba/StockServer.java
  M	src/interfaces/jdbc/example/psql.java
  M	src/interfaces/jdbc/org/postgresql/Connection.java
- M	src/interfaces/jdbc/org/postgresql/core/BytePoolDim1.java
- M	src/interfaces/jdbc/org/postgresql/core/BytePoolDim2.java
- M	src/interfaces/jdbc/org/postgresql/core/SimpleObjectPool.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/PreparedStatement.java
  M	src/interfaces/jdbc/org/postgresql/jdbc2/PreparedStatement.java
  M	src/interfaces/jdbc/org/postgresql/util/Serialize.java
--- 347268,347273 ----
***************
*** 347502,347510 ****
  M	src/interfaces/jdbc/org/postgresql/PG_Stream.java
  M	src/interfaces/jdbc/org/postgresql/PostgresqlDataSource.java
  M	src/interfaces/jdbc/org/postgresql/Statement.java
- M	src/interfaces/jdbc/org/postgresql/core/BytePoolDim1.java
- M	src/interfaces/jdbc/org/postgresql/core/BytePoolDim2.java
- M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
  M	src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
  M	src/interfaces/jdbc/org/postgresql/geometric/PGpath.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
--- 347301,347306 ----
***************
*** 347564,347576 ****
  M	src/interfaces/jdbc/org/postgresql/PostgresqlDataSource.java
  M	src/interfaces/jdbc/org/postgresql/ResultSet.java
  M	src/interfaces/jdbc/org/postgresql/Statement.java
- M	src/interfaces/jdbc/org/postgresql/core/BytePoolDim1.java
- M	src/interfaces/jdbc/org/postgresql/core/BytePoolDim2.java
- M	src/interfaces/jdbc/org/postgresql/core/Encoding.java
- M	src/interfaces/jdbc/org/postgresql/core/MemoryPool.java
- M	src/interfaces/jdbc/org/postgresql/core/ObjectPool.java
- M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
- M	src/interfaces/jdbc/org/postgresql/core/SimpleObjectPool.java
  M	src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
  M	src/interfaces/jdbc/org/postgresql/fastpath/FastpathArg.java
  M	src/interfaces/jdbc/org/postgresql/geometric/PGbox.java
--- 347360,347365 ----
***************
*** 351265,351277 ****
  M	src/interfaces/jdbc/org/postgresql/PostgresqlDataSource.java
  M	src/interfaces/jdbc/org/postgresql/ResultSet.java
  M	src/interfaces/jdbc/org/postgresql/Statement.java
- M	src/interfaces/jdbc/org/postgresql/core/BytePoolDim1.java
- M	src/interfaces/jdbc/org/postgresql/core/BytePoolDim2.java
- M	src/interfaces/jdbc/org/postgresql/core/Encoding.java
- M	src/interfaces/jdbc/org/postgresql/core/MemoryPool.java
- M	src/interfaces/jdbc/org/postgresql/core/ObjectPool.java
- M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
- M	src/interfaces/jdbc/org/postgresql/core/SimpleObjectPool.java
  M	src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
  M	src/interfaces/jdbc/org/postgresql/fastpath/FastpathArg.java
  M	src/interfaces/jdbc/org/postgresql/geometric/PGbox.java
--- 351054,351059 ----
***************
*** 353001,353015 ****
  M	src/bin/initdb/initdb.sh
  M	src/test/regress/expected/rules.out
  
! commit bf737b859f7e4e5f69b9bfff80f6d50329622e65	refs/tags/REL7_2_BETA1
! Author: Barry Lind <barry@xythos.com>
! Date:   Tue Oct 16 20:07:17 2001 +0000
! 
!     Updated the list of encodings supported to match what the backend now supports
! 
! M	src/interfaces/jdbc/org/postgresql/core/Encoding.java
! 
! commit f50793c743c755e208b89dcc845e9318e6ca881f	refs/tags/REL7_2_BETA1
  Author: Barry Lind <barry@xythos.com>
  Date:   Tue Oct 16 20:05:22 2001 +0000
  
--- 352783,352789 ----
  M	src/bin/initdb/initdb.sh
  M	src/test/regress/expected/rules.out
  
! commit 5bd1d4cc5a9cac572f3680b8da06afd0d7551115	refs/tags/REL7_2_BETA1
  Author: Barry Lind <barry@xythos.com>
  Date:   Tue Oct 16 20:05:22 2001 +0000
  
***************
*** 353864,353870 ****
  
  M	src/interfaces/jdbc/org/postgresql/Connection.java
  M	src/interfaces/jdbc/org/postgresql/ResultSet.java
- M	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/Connection.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/ResultSet.java
  M	src/interfaces/jdbc/org/postgresql/jdbc2/Connection.java
--- 353638,353643 ----
***************
*** 359103,359112 ****
  
      Add missing files.
  
- A	src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
  A	src/interfaces/jdbc/org/postgresql/jdbc2/PBatchUpdateException.java
  
! commit 311eef41ea01ceb8ee2e331b788ed68da4c9dda5	refs/tags/REL7_2_BETA1
  Author: Bruce Momjian <bruce@momjian.us>
  Date:   Thu Sep 6 03:46:09 2001 +0000
  
--- 358876,358884 ----
  
      Add missing files.
  
  A	src/interfaces/jdbc/org/postgresql/jdbc2/PBatchUpdateException.java
  
! commit 7624f6521cd8508eb7e2e84bc6b9e5b27efa39d9	refs/tags/REL7_2_BETA1
  Author: Bruce Momjian <bruce@momjian.us>
  Date:   Thu Sep 6 03:46:09 2001 +0000
  
***************
*** 363464,363470 ****
  M	src/interfaces/jdbc/Implementation
  M	src/interfaces/jdbc/org/postgresql/Connection.java
  M	src/interfaces/jdbc/org/postgresql/PG_Stream.java
- A	src/interfaces/jdbc/org/postgresql/core/Encoding.java
  M	src/interfaces/jdbc/org/postgresql/jdbc1/ResultSet.java
  M	src/interfaces/jdbc/org/postgresql/jdbc2/ResultSet.java
  A	src/interfaces/jdbc/org/postgresql/test/EncodingTest.java
--- 363236,363241 ----
***************
*** 364688,364702 ****
  
  M	src/backend/parser/analyze.c
  
! commit 5621ec0629b1da42869375210b2a90e6605dd9f0	refs/tags/REL7_2_BETA1
! Author: Bruce Momjian <bruce@momjian.us>
! Date:   Wed Jul 4 15:57:25 2001 +0000
! 
!     Remove ConnectionHook.java.  No longer used, bad code.
! 
! D	src/interfaces/jdbc/org/postgresql/core/ConnectionHook.java
! 
! commit 0e4d43f4593cda055d15641e0edce424b0b84fab	refs/tags/REL7_2_BETA1
  Author: Bruce Momjian <bruce@momjian.us>
  Date:   Wed Jul 4 15:09:54 2001 +0000
  
--- 364459,364465 ----
  
  M	src/backend/parser/analyze.c
  
! commit 3c54539a71d93287f7efd373237dff33480603f8	refs/tags/REL7_2_BETA1
  Author: Bruce Momjian <bruce@momjian.us>
  Date:   Wed Jul 4 15:09:54 2001 +0000
  
***************
*** 375738,375747 ****
      Minor fixes...
  
  M	src/interfaces/jdbc/org/postgresql/Driver.java.in
- A	src/interfaces/jdbc/org/postgresql/core/ConnectionHook.java
  M	src/interfaces/jdbc/org/postgresql/jdbc2/CallableStatement.java
  
! commit e2e84a1c5e137111a2d11e21423af204344190c5	refs/tags/REL7_1
  Author: Peter Mount <peter@retep.org.uk>
  Date:   Mon Mar 5 09:15:38 2001 +0000
  
--- 375501,375509 ----
      Minor fixes...
  
  M	src/interfaces/jdbc/org/postgresql/Driver.java.in
  M	src/interfaces/jdbc/org/postgresql/jdbc2/CallableStatement.java
  
! commit e9a341bd1bb801787c63202f06894167a508c8ad	refs/tags/REL7_1
  Author: Peter Mount <peter@retep.org.uk>
  Date:   Mon Mar 5 09:15:38 2001 +0000
  
***************
*** 380554,380572 ****
  M	src/interfaces/odbc/psqlodbc.rc
  M	src/interfaces/odbc/resource.h
  
! commit 4e45005ffb8f89ce055953ea66dde908be7c26ed	refs/tags/REL7_1
! Author: Bruce Momjian <bruce@momjian.us>
! Date:   Thu Jan 25 00:02:58 2001 +0000
! 
!     This patch fixes an arrayindexoutofbounds exception that was just
!     introduced into the code.  The fix is a fix to
!     org.postgresql.core.ByteArrayDim1.java.
!     
!     Barry Lind
! 
! M	src/interfaces/jdbc/org/postgresql/core/BytePoolDim1.java
! 
! commit ba6fda5191a188b04a953b304be5eaf04fc3f902	refs/tags/REL7_1
  Author: Bruce Momjian <bruce@momjian.us>
  Date:   Thu Jan 25 00:01:17 2001 +0000
  
--- 380316,380322 ----
  M	src/interfaces/odbc/psqlodbc.rc
  M	src/interfaces/odbc/resource.h
  
! commit 233ba6a69f637597ae61682dd1366c2c89f20217	refs/tags/REL7_1
  Author: Bruce Momjian <bruce@momjian.us>
  Date:   Thu Jan 25 00:01:17 2001 +0000
  
***************
*** 381729,381736 ****
  A	contrib/retep/data/cds.dtd
  A	contrib/retep/data/cds.xml
  M	contrib/retep/retep.jpx
- A	contrib/retep/uk/org/retep/xml/core/XMLFactory.java
- A	contrib/retep/uk/org/retep/xml/core/XMLFactoryException.java
  A	contrib/retep/uk/org/retep/xml/jdbc/XMLDatabase.java
  A	contrib/retep/uk/org/retep/xml/jdbc/XMLResultSet.java
  M	contrib/retep/uk/org/retep/xml/parser/TagHandler.java
--- 381479,381484 ----
***************
*** 382777,382787 ****
  A	src/interfaces/jdbc/jdbc.jpx
  M	src/interfaces/jdbc/org/postgresql/Connection.java
  M	src/interfaces/jdbc/org/postgresql/PG_Stream.java
- A	src/interfaces/jdbc/org/postgresql/core/BytePoolDim1.java
- A	src/interfaces/jdbc/org/postgresql/core/BytePoolDim2.java
- A	src/interfaces/jdbc/org/postgresql/core/MemoryPool.java
- A	src/interfaces/jdbc/org/postgresql/core/ObjectPool.java
- A	src/interfaces/jdbc/org/postgresql/core/SimpleObjectPool.java
  M	src/interfaces/jdbc/org/postgresql/errors.properties
  M	src/interfaces/jdbc/org/postgresql/jdbc1/Statement.java
  M	src/interfaces/jdbc/org/postgresql/jdbc2/ResultSet.java
--- 382525,382530 ----