svn commit: r1558468 - in /subversion/trunk/subversion: include/private/svn_sqlite.h libsvn_subr/sqlite.c

[rh...@apache.org]

Author: rhuijben
Date: Wed Jan 15 17:08:45 2014
New Revision: 1558468

URL: http://svn.apache.org/r1558468
Log:
Add private sqlite api to enable the sqlite logging infrastructure in an
attempt to find out why some tests keep failing on the Windows buildbot.

* subversion/include/private/svn_sqlite.h
  (svn_sqlite__dbg_enable_errorlog): New function.

* subversion/libsvn_subr/sqlite.c
  (sqlite_error_log,
   svn_sqlite__dbg_enable_errorlog): New function.

Modified:
    subversion/trunk/subversion/include/private/svn_sqlite.h
    subversion/trunk/subversion/libsvn_subr/sqlite.c

Modified: subversion/trunk/subversion/include/private/svn_sqlite.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_sqlite.h?rev=1558468&r1=1558467&r2=1558468&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_sqlite.h (original)
+++ subversion/trunk/subversion/include/private/svn_sqlite.h Wed Jan 15 17:08:45 2014
@@ -345,6 +345,11 @@ svn_sqlite__column_is_null(svn_sqlite__s
 int
 svn_sqlite__column_bytes(svn_sqlite__stmt_t *stmt, int column);
 
+/* When Subversion is compiled in maintainer mode: enables the sqlite error
+   logging to stderr. */
+void
+svn_sqlite__dbg_enable_errorlog();
+
 
 /* --------------------------------------------------------------------- */
 

Modified: subversion/trunk/subversion/libsvn_subr/sqlite.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/sqlite.c?rev=1558468&r1=1558467&r2=1558468&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/sqlite.c (original)
+++ subversion/trunk/subversion/libsvn_subr/sqlite.c Wed Jan 15 17:08:45 2014
@@ -109,6 +109,23 @@ sqlite_profiler(void *data, const char *
 }
 #endif
 
+#if defined(SVN_DEBUG) && defined(SQLITE_CONFIG_LOG)
+static void
+sqlite_error_log(void* baton, int err, const char* msg)
+{
+  fprintf(stderr, "DBG: sqlite[S%d]: %s\n", err, msg);
+}
+#endif
+
+void
+svn_sqlite__dbg_enable_errorlog()
+{
+#if defined(SVN_DEBUG) && defined(SQLITE_CONFIG_LOG)
+  sqlite3_config(SQLITE_CONFIG_LOG, sqlite_error_log, (void*)NULL /* baton */);
+#endif
+}
+
+
 struct svn_sqlite__db_t
 {
   sqlite3 *db3;