subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1035277 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Date Mon, 15 Nov 2010 13:55:30 GMT
Author: philip
Date: Mon Nov 15 13:55:30 2010
New Revision: 1035277

URL: http://svn.apache.org/viewvc?rev=1035277&view=rev
Log:
I think this will fix the "SQL statements in progress" errors,
although I don't see them locally.

* subversion/libsvn_wc/wc_db.c (read_tree_conflict): Reset statement.

Modified:
    subversion/trunk/subversion/libsvn_wc/wc_db.c

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1035277&r1=1035276&r2=1035277&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Nov 15 13:55:30 2010
@@ -4372,6 +4372,7 @@ read_tree_conflict(const svn_wc_conflict
 
   conflict_data = svn_sqlite__column_text(stmt, 0, NULL);
   skel = svn_skel__parse(conflict_data, strlen(conflict_data), scratch_pool);
+  SVN_ERR(svn_sqlite__reset(stmt));
   SVN_ERR(svn_wc__deserialize_conflict(tree_conflict, skel,
                                        pdh->wcroot->abspath, result_pool,
                                        scratch_pool));



Mime
View raw message