svn commit: r1357418 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

[rhuijben]

Author: rhuijben
Date: Wed Jul  4 21:34:43 2012
New Revision: 1357418

URL: http://svn.apache.org/viewvc?rev=1357418&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
  (get_conflict_marker_files): Fix column index to really retrieve the skel
    instead of NULL. Don't perform unneeded copy to scratch_pool.

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=1357418&r1=1357417&r2=1357418&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Wed Jul  4 21:34:43 2012
@@ -11747,7 +11747,7 @@ get_conflict_marker_files(void *baton, s
   if (have_row && !svn_sqlite__column_is_null(stmt, 2))
     {
       apr_size_t len;
-      const void *data = svn_sqlite__column_blob(stmt, 2, &len, scratch_pool);
+      const void *data = svn_sqlite__column_blob(stmt, 2, &len, NULL);
       svn_skel_t *conflicts;
       const apr_array_header_t *markers;
       int i;
@@ -11776,8 +11776,8 @@ get_conflict_marker_files(void *baton, s
   while (have_row)
     {
       apr_size_t len;
-      const void *data = svn_sqlite__column_blob(stmt, 2, &len, scratch_pool);
-      
+      const void *data = svn_sqlite__column_blob(stmt, 1, &len, NULL);
+
       const apr_array_header_t *markers;
       int i;