Author: philip
Date: Tue Sep 21 10:18:05 2010
New Revision: 999300
URL: http://svn.apache.org/viewvc?rev=999300&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
(scan_upwards_for_repos): Use the nodes statement when
SVN_WC__NODES_ONLY is set, otherwise reset it in one place only.
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=999300&r1=999299&r2=999300&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue Sep 21 10:18:05 2010
@@ -608,6 +608,10 @@ scan_upwards_for_repos(apr_int64_t *repo
stmt, data_stmt,
current_relpath,
scratch_pool));
+ SVN_ERR(svn_sqlite__reset(data_stmt));
+#else
+ have_row = have_data_row;
+ stmt = data_stmt;
#endif
#endif
@@ -633,7 +637,6 @@ scan_upwards_for_repos(apr_int64_t *repo
}
#ifdef SVN_WC__NODES
- SVN_ERR(svn_sqlite__reset(data_stmt));
#endif
return svn_error_compose_create(err, svn_sqlite__reset(stmt));
}
@@ -654,14 +657,8 @@ scan_upwards_for_repos(apr_int64_t *repo
NULL),
relpath_suffix,
result_pool);
-#ifdef SVN_WC__NODES
- SVN_ERR(svn_sqlite__reset(data_stmt));
-#endif
return svn_sqlite__reset(stmt);
}
-#ifdef SVN_WC__NODES
- SVN_ERR(svn_sqlite__reset(data_stmt));
-#endif
#ifndef SVN_WC__NODES_ONLY
SVN_ERR(svn_sqlite__reset(stmt));
#endif
