Hi Fernanda,

When I apply the latest patch on 387802 and then do svn update, I get
conflicts on

C      
java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java
C      java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java

Could you please resolve these against main and submit a new patch?

Bernt

>>>>>>>>>>>> Bernt M. Johnsen wrote (2006-03-23 14:24:43):
> As far as I can tell, this one is now properly reviewed and ready for
> commit. It is a rather large patch and there has been a lot of
> discussion so I plan to commit this on monday if there are no
> objections.

-- 
Bernt Marius Johnsen, Database Technology Group, 
Staff Engineer, Technical Lead Derby/Java DB
Sun Microsystems, Trondheim, Norway

Attachment: signature.asc
Description: Digital signature

Reply via email to