Index: SQLite.Interop/src/core/sqlite3.c
==================================================================
--- SQLite.Interop/src/core/sqlite3.c
+++ SQLite.Interop/src/core/sqlite3.c
@@ -325,11 +325,11 @@
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
 #define SQLITE_VERSION        "3.8.11"
 #define SQLITE_VERSION_NUMBER 3008011
-#define SQLITE_SOURCE_ID      "2015-07-24 17:36:34 1997ee548b2e569a39e73319b661c1a78dfe5dae"
+#define SQLITE_SOURCE_ID      "2015-07-24 23:28:05 db129149812cb4eadb4cd79ad293d14962d2638d"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
 **
@@ -8363,14 +8363,18 @@
 
 /*
 ** Make sure that the compiler intrinsics we desire are enabled when
 ** compiling with an appropriate version of MSVC.
 */
-#if defined(_MSC_VER) && _MSC_VER>=1300 && !defined(_WIN32_WCE)
-#  include <intrin.h>
-#  pragma intrinsic(_byteswap_ushort)
-#  pragma intrinsic(_byteswap_ulong)
+#if defined(_MSC_VER) && _MSC_VER>=1300
+#  if !defined(_WIN32_WCE)
+#    include <intrin.h>
+#    pragma intrinsic(_byteswap_ushort)
+#    pragma intrinsic(_byteswap_ulong)
+#  else
+#    include <cmnintrin.h>
+#  endif
 #endif
 
 /*
 ** The SQLITE_THREADSAFE macro must be defined as 0, 1, or 2.
 ** 0 means mutexes are permanently disable and the library is never
@@ -156954,11 +156958,14 @@
 */
 
 /* #include <assert.h> */
 /* #include <string.h> */
 /* #include <stdio.h> */
-/* #include <unistd.h> */
+
+#if !defined(_WIN32)
+/* #  include <unistd.h> */
+#endif
 
 /* #include "sqlite3.h" */
 
 #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_RBU)
 /************** Include sqlite3rbu.h in the middle of sqlite3rbu.c ***********/
@@ -157861,11 +157868,11 @@
   int rc;
   memset(pIter, 0, sizeof(RbuObjIter));
 
   rc = prepareAndCollectError(p->dbRbu, &pIter->pTblIter, &p->zErrmsg, 
       "SELECT substr(name, 6) FROM sqlite_master "
-      "WHERE type='table' AND name LIKE 'data_%'"
+      "WHERE type IN ('table', 'view') AND name LIKE 'data_%'"
   );
 
   if( rc==SQLITE_OK ){
     rc = prepareAndCollectError(p->dbMain, &pIter->pIdxIter, &p->zErrmsg,
         "SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE' "
@@ -157913,12 +157920,13 @@
 ** RBU handle. If an error has already occurred when this function is
 ** called, it is a no-op.
 */
 static int rbuMPrintfExec(sqlite3rbu *p, sqlite3 *db, const char *zFmt, ...){
   va_list ap;
+  char *zSql;
   va_start(ap, zFmt);
-  char *zSql = sqlite3_vmprintf(zFmt, ap);
+  zSql = sqlite3_vmprintf(zFmt, ap);
   if( p->rc==SQLITE_OK ){
     if( zSql==0 ){
       p->rc = SQLITE_NOMEM;
     }else{
       p->rc = sqlite3_exec(db, zSql, 0, 0, &p->zErrmsg);
@@ -159933,11 +159941,11 @@
   int rnd;
   char zRnd[64];
 
   assert( p->rc==SQLITE_OK );
   sqlite3_randomness(sizeof(int), (void*)&rnd);
-  sprintf(zRnd, "rbu_vfs_%d", rnd);
+  sqlite3_snprintf(sizeof(zRnd), zRnd, "rbu_vfs_%d", rnd);
   p->rc = sqlite3rbu_create_vfs(zRnd, 0);
   if( p->rc==SQLITE_OK ){
     sqlite3_vfs *pVfs = sqlite3_vfs_find(zRnd);
     assert( pVfs );
     p->zVfsName = pVfs->zName;
@@ -160818,11 +160826,11 @@
 /*
 ** Close the dynamic library handle pHandle.
 */
 static void rbuVfsDlClose(sqlite3_vfs *pVfs, void *pHandle){
   sqlite3_vfs *pRealVfs = ((rbu_vfs*)pVfs)->pRealVfs;
-  return pRealVfs->xDlClose(pRealVfs, pHandle);
+  pRealVfs->xDlClose(pRealVfs, pHandle);
 }
 #endif /* SQLITE_OMIT_LOAD_EXTENSION */
 
 /*
 ** Populate the buffer pointed to by zBufOut with nByte bytes of 

Index: SQLite.Interop/src/core/sqlite3.h
==================================================================
--- SQLite.Interop/src/core/sqlite3.h
+++ SQLite.Interop/src/core/sqlite3.h
@@ -111,11 +111,11 @@
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
 #define SQLITE_VERSION        "3.8.11"
 #define SQLITE_VERSION_NUMBER 3008011
-#define SQLITE_SOURCE_ID      "2015-07-24 17:36:34 1997ee548b2e569a39e73319b661c1a78dfe5dae"
+#define SQLITE_SOURCE_ID      "2015-07-24 23:28:05 db129149812cb4eadb4cd79ad293d14962d2638d"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
 **

Index: SQLite.Interop/src/ext/fts5.c
==================================================================
--- SQLite.Interop/src/ext/fts5.c
+++ SQLite.Interop/src/ext/fts5.c
@@ -2838,11 +2838,11 @@
   Fts5ExprNearset *pNear;         /* For FTS5_STRING - cluster of phrases */
 
   /* Child nodes. For a NOT node, this array always contains 2 entries. For 
   ** AND or OR nodes, it contains 2 or more entries.  */
   int nChild;                     /* Number of child nodes */
-  Fts5ExprNode *apChild[0];       /* Array of child nodes */
+  Fts5ExprNode *apChild[1];       /* Array of child nodes */
 };
 
 #define Fts5NodeIsString(p) ((p)->eType==FTS5_TERM || (p)->eType==FTS5_STRING)
 
 /*
@@ -4397,11 +4397,11 @@
       nChild = 2;
       if( pLeft->eType==eType ) nChild += pLeft->nChild-1;
       if( pRight->eType==eType ) nChild += pRight->nChild-1;
     }
 
-    nByte = sizeof(Fts5ExprNode) + sizeof(Fts5ExprNode*)*nChild;
+    nByte = sizeof(Fts5ExprNode) + sizeof(Fts5ExprNode*)*(nChild-1);
     pRet = (Fts5ExprNode*)sqlite3Fts5MallocZero(&pParse->rc, nByte);
 
     if( pRet ){
       pRet->eType = eType;
       pRet->pNear = pNear;
@@ -9039,17 +9039,17 @@
   assert( iLvl>=0 );
   for(fts5MultiIterNew(p, pStruct, 0, 0, 0, 0, iLvl, nInput, &pIter);
       fts5MultiIterEof(p, pIter)==0;
       fts5MultiIterNext(p, pIter, 0, 0)
   ){
-    Fts5SegIter *pSeg = &pIter->aSeg[ pIter->aFirst[1].iFirst ];
+    Fts5SegIter *pSegIter = &pIter->aSeg[ pIter->aFirst[1].iFirst ];
     int nPos;                     /* position-list size field value */
     int nTerm;
     const u8 *pTerm;
 
     /* Check for key annihilation. */
-    if( pSeg->nPos==0 && (bOldest || pSeg->bDel==0) ) continue;
+    if( pSegIter->nPos==0 && (bOldest || pSegIter->bDel==0) ) continue;
 
     pTerm = fts5MultiIterTerm(pIter, &nTerm);
     if( nTerm!=term.n || memcmp(pTerm, term.p, nTerm) ){
       if( pnRem && writer.nLeafWritten>nRem ){
         break;
@@ -9064,15 +9064,15 @@
       bRequireDoclistTerm = 1;
     }
 
     /* Append the rowid to the output */
     /* WRITEPOSLISTSIZE */
-    nPos = pSeg->nPos*2 + pSeg->bDel;
+    nPos = pSegIter->nPos*2 + pSegIter->bDel;
     fts5WriteAppendRowid(p, &writer, fts5MultiIterRowid(pIter), nPos);
 
     /* Append the position-list data to the output */
-    fts5ChunkIterate(p, pSeg, (void*)&writer, fts5MergeChunkCallback);
+    fts5ChunkIterate(p, pSegIter, (void*)&writer, fts5MergeChunkCallback);
   }
 
   /* Flush the last leaf page to disk. Set the output segment b-tree height
   ** and last leaf page number at the same time.  */
   fts5WriteFinish(p, &writer, &pSeg->nHeight, &pSeg->pgnoLast);
@@ -13246,11 +13246,11 @@
   sqlite3_context *pCtx,          /* Function call context */
   int nArg,                       /* Number of args */
   sqlite3_value **apVal           /* Function arguments */
 ){
   assert( nArg==0 );
-  sqlite3_result_text(pCtx, "fts5: 2015-07-16 20:17:57 e9bf275cd969eca6fb41384d3637528d6a19f819", -1, SQLITE_TRANSIENT);
+  sqlite3_result_text(pCtx, "fts5: 2015-07-24 23:28:05 db129149812cb4eadb4cd79ad293d14962d2638d", -1, SQLITE_TRANSIENT);
 }
 
 #ifdef _WIN32
 __declspec(dllexport)
 #endif