From 3b2c9b3250b9332c15ece5574061235cf6f90139 Mon Sep 17 00:00:00 2001
From: dan <dan@noemail.net>
Date: Mon, 23 Jul 2012 19:25:39 +0000
Subject: [PATCH 01/36] Modify the code in vdbesort.c so that most reads and
 writes to temporary files are aligned page-sized blocks.

FossilOrigin-Name: 55e47ef338c42f95f0f071d6ec92cd2480f9f1fe
---
 manifest         |  17 ++-
 manifest.uuid    |   2 +-
 src/vdbesort.c   | 385 +++++++++++++++++++++++++++++++++--------------
 test/index4.test |  24 +++
 4 files changed, 305 insertions(+), 123 deletions(-)

diff --git a/manifest b/manifest
index 8576e56420..c893586b7a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\sthere\sis\salways\sat\sleast\sone\saReadMark\sslot\susable\sby\san\sunprivileged\sreader\swhile\sa\scheckpoint\sis\srunning.\sAlso,\sif\sone\sor\smore\stransactions\sare\srecovered\sfrom\sa\slog\sfile,\sinitialize\sone\sof\sthe\saReadMark\sslots\sto\scontain\smxFrame\sas\spart\sof\sthe\srecovery\sprocess.
-D 2012-07-17T14:37:12.494
+C Modify\sthe\scode\sin\svdbesort.c\sso\sthat\smost\sreads\sand\swrites\sto\stemporary\sfiles\sare\saligned\spage-sized\sblocks.
+D 2012-07-23T19:25:39.921
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 8f6d858bf3df9978ba43df19985146a1173025e4
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -244,7 +244,7 @@ F src/vdbeapi.c 88ea823bbcb4320f5a6607f39cd7c2d3cc4c26b1
 F src/vdbeaux.c dce80038c3c41f2680e5ab4dd0f7e0d8b7ff9071
 F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
 F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
-F src/vdbesort.c b25814d385895544ebc8118245c8311ded7f81c9
+F src/vdbesort.c 6822221af97e57bd17091cfe5abec902c1ef04ad
 F src/vdbetrace.c 79059ebd17b3c8545fab2a24253713e77e4ab392
 F src/vtab.c bb8ea3a26608bb1357538a5d2fc72beba6638998
 F src/wal.c 9294df6f96aae5909ae1a9b733fd1e1b4736978b
@@ -530,7 +530,7 @@ F test/incrvacuum_ioerr.test 22f208d01c528403240e05beecc41dc98ed01637
 F test/index.test b5429732b3b983fa810e3ac867d7ca85dae35097
 F test/index2.test ee83c6b5e3173a3d7137140d945d9a5d4fdfb9d6
 F test/index3.test 423a25c789fc8cc51aaf2a4370bbdde2d9e9eed7
-F test/index4.test 2983216eb8c86ee62d9ed7cb206b5cc3331c0026
+F test/index4.test 1e299862024012e0165531cce251572f7f084d15
 F test/indexedby.test be501e381b82b2f8ab406309ba7aac46e221f4ad
 F test/indexfault.test 31d4ab9a7d2f6e9616933eb079722362a883eb1d
 F test/init.test 15c823093fdabbf7b531fe22cf037134d09587a7
@@ -1005,7 +1005,10 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 8c9ee1d78f99394eef73a177141ca9e1c67e4e07
-R 21a0c6942de3e9593e3e93f462c443c7
+P e4163596339c2166f9c4356ab824fff8bda8d0b0
+R ed9539f5559c8070d5186f316e47e4b4
+T *branch * sorter-coalesce-writes
+T *sym-sorter-coalesce-writes *
+T -sym-trunk *
 U dan
-Z a98d8c358c03bd601d60af308961371e
+Z 0e4fc9d4c65d0946db257b091fe0d573
diff --git a/manifest.uuid b/manifest.uuid
index dad8b25eaa..53013f689c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e4163596339c2166f9c4356ab824fff8bda8d0b0
\ No newline at end of file
+55e47ef338c42f95f0f071d6ec92cd2480f9f1fe
\ No newline at end of file
diff --git a/src/vdbesort.c b/src/vdbesort.c
index afea1f510a..393e937d32 100644
--- a/src/vdbesort.c
+++ b/src/vdbesort.c
@@ -22,6 +22,7 @@
 
 typedef struct VdbeSorterIter VdbeSorterIter;
 typedef struct SorterRecord SorterRecord;
+typedef struct FileWriter FileWriter;
 
 /*
 ** NOTES ON DATA STRUCTURE USED FOR N-WAY MERGES:
@@ -119,6 +120,22 @@ struct VdbeSorterIter {
   sqlite3_file *pFile;            /* File iterator is reading from */
   u8 *aAlloc;                     /* Allocated space */
   u8 *aKey;                       /* Pointer to current key */
+  u8 *aBuffer;                    /* Current read buffer */
+  int nBuffer;                    /* Size of read buffer in bytes */
+};
+
+/*
+** An instance of this structure is used to separate the stream of records
+** being written to files by the merge-sort code into aligned, page-sized
+** blocks.
+*/
+struct FileWriter {
+  u8 *aBuffer;                    /* Pointer to write buffer */
+  int nBuffer;                    /* Size of write buffer in bytes */
+  int iBufStart;                  /* First byte of buffer to write */
+  int iBufEnd;                    /* Last byte of buffer to write */
+  i64 iWriteOff;                  /* Offset of start of buffer in file */
+  sqlite3_file *pFile;            /* File to write to */
 };
 
 /*
@@ -144,9 +161,107 @@ struct SorterRecord {
 */
 static void vdbeSorterIterZero(sqlite3 *db, VdbeSorterIter *pIter){
   sqlite3DbFree(db, pIter->aAlloc);
+  sqlite3DbFree(db, pIter->aBuffer);
   memset(pIter, 0, sizeof(VdbeSorterIter));
 }
 
+/*
+** Read nByte bytes of data from the stream of data iterated by object p.
+** If successful, set *ppOut to point to a buffer containing the data
+** and return SQLITE_OK. Otherwise, if an error occurs, return an SQLite
+** error code.
+**
+** The buffer indicated by *ppOut may only be considered valid until the
+** next call to this function.
+*/
+static int vdbeSorterIterRead(
+  sqlite3 *db,                    /* Database handle (for malloc) */
+  VdbeSorterIter *p,              /* Iterator */
+  int nByte,                      /* Bytes of data to read */
+  u8 **ppOut                      /* OUT: Pointer to buffer containing data */
+){
+  int iBuf;
+  int nAvail;
+  assert( p->aBuffer );
+
+  iBuf = p->iReadOff % p->nBuffer;
+  if( iBuf==0 ){
+    int nRead;
+    int rc;
+
+    nRead = p->iEof - p->iReadOff;
+    if( nRead>p->nBuffer ) nRead = p->nBuffer;
+    assert( nRead>0 );
+    rc = sqlite3OsRead(p->pFile, p->aBuffer, nRead, p->iReadOff);
+    assert( rc!=SQLITE_IOERR_SHORT_READ );
+    if( rc!=SQLITE_OK ) return rc;
+  }
+  nAvail = p->nBuffer - iBuf;
+
+  if( nByte<=nAvail ){
+    *ppOut = &p->aBuffer[iBuf];
+    p->iReadOff += nByte;
+  }else{
+    int nRem;
+    if( p->nAlloc<nByte ){
+      int nNew = p->nAlloc*2;
+      while( nByte>nNew ) nNew = nNew*2;
+
+      p->aAlloc = sqlite3DbReallocOrFree(db, p->aAlloc, nNew);
+      if( !p->aAlloc ) return SQLITE_NOMEM;
+    }
+
+    memcpy(p->aAlloc, &p->aBuffer[iBuf], nAvail);
+    p->iReadOff += nAvail;
+    nRem = nByte - nAvail;
+    while( nRem>0 ){
+      int rc;
+      int nCopy;
+      u8 *aNext;
+
+      nCopy = nRem;
+      if( nRem>p->nBuffer ) nCopy = p->nBuffer;
+      rc = vdbeSorterIterRead(db, p, nCopy, &aNext);
+      if( rc!=SQLITE_OK ) return rc;
+      assert( aNext!=p->aAlloc );
+
+      memcpy(&p->aAlloc[nByte - nRem], aNext, nCopy);
+      nRem -= nCopy;
+    }
+
+    *ppOut = p->aAlloc;
+  }
+
+  return SQLITE_OK;
+}
+
+/*
+** Read a varint from the stream of data accessed by p. Set *pnOut to
+** the value read.
+*/
+static int vdbeSorterIterVarint(sqlite3 *db, VdbeSorterIter *p, u64 *pnOut){
+  int iBuf;
+
+  iBuf = p->iReadOff % p->nBuffer;
+  if( iBuf && (p->nBuffer-iBuf)>=9 ){
+    p->iReadOff += sqlite3GetVarint(&p->aBuffer[iBuf], pnOut);
+  }else{
+    u8 aVarint[9];
+    int i;
+    for(i=0; i<sizeof(aVarint); i++){
+      u8 *a;
+      int rc = vdbeSorterIterRead(db, p, 1, &a);
+      if( rc ) return rc;
+      aVarint[i] = *a;
+      if( (aVarint[i] & 0x80)==0 ) break;
+    }
+    sqlite3GetVarint(aVarint, pnOut);
+  }
+
+  return SQLITE_OK;
+}
+
+
 /*
 ** Advance iterator pIter to the next key in its PMA. Return SQLITE_OK if
 ** no error occurs, or an SQLite error code if one does.
@@ -156,96 +271,18 @@ static int vdbeSorterIterNext(
   VdbeSorterIter *pIter           /* Iterator to advance */
 ){
   int rc;                         /* Return Code */
-  int nRead;                      /* Number of bytes read */
-  int nRec = 0;                   /* Size of record in bytes */
-  int iOff = 0;                   /* Size of serialized size varint in bytes */
+  u64 nRec = 0;                   /* Size of record in bytes */
 
-  assert( pIter->iEof>=pIter->iReadOff );
-  if( pIter->iEof-pIter->iReadOff>5 ){
-    nRead = 5;
-  }else{
-    nRead = (int)(pIter->iEof - pIter->iReadOff);
-  }
-  if( nRead<=0 ){
+  if( pIter->iReadOff>=pIter->iEof ){
     /* This is an EOF condition */
     vdbeSorterIterZero(db, pIter);
     return SQLITE_OK;
   }
 
-  rc = sqlite3OsRead(pIter->pFile, pIter->aAlloc, nRead, pIter->iReadOff);
+  rc = vdbeSorterIterVarint(db, pIter, &nRec);
   if( rc==SQLITE_OK ){
-    iOff = getVarint32(pIter->aAlloc, nRec);
-    if( (iOff+nRec)>nRead ){
-      int nRead2;                   /* Number of extra bytes to read */
-      if( (iOff+nRec)>pIter->nAlloc ){
-        int nNew = pIter->nAlloc*2;
-        while( (iOff+nRec)>nNew ) nNew = nNew*2;
-        pIter->aAlloc = sqlite3DbReallocOrFree(db, pIter->aAlloc, nNew);
-        if( !pIter->aAlloc ) return SQLITE_NOMEM;
-        pIter->nAlloc = nNew;
-      }
-  
-      nRead2 = iOff + nRec - nRead;
-      rc = sqlite3OsRead(
-          pIter->pFile, &pIter->aAlloc[nRead], nRead2, pIter->iReadOff+nRead
-      );
-    }
-  }
-
-  assert( rc!=SQLITE_OK || nRec>0 );
-  pIter->iReadOff += iOff+nRec;
-  pIter->nKey = nRec;
-  pIter->aKey = &pIter->aAlloc[iOff];
-  return rc;
-}
-
-/*
-** Write a single varint, value iVal, to file-descriptor pFile. Return
-** SQLITE_OK if successful, or an SQLite error code if some error occurs.
-**
-** The value of *piOffset when this function is called is used as the byte
-** offset in file pFile to write to. Before returning, *piOffset is 
-** incremented by the number of bytes written.
-*/
-static int vdbeSorterWriteVarint(
-  sqlite3_file *pFile,            /* File to write to */
-  i64 iVal,                       /* Value to write as a varint */
-  i64 *piOffset                   /* IN/OUT: Write offset in file pFile */
-){
-  u8 aVarint[9];                  /* Buffer large enough for a varint */
-  int nVarint;                    /* Number of used bytes in varint */
-  int rc;                         /* Result of write() call */
-
-  nVarint = sqlite3PutVarint(aVarint, iVal);
-  rc = sqlite3OsWrite(pFile, aVarint, nVarint, *piOffset);
-  *piOffset += nVarint;
-
-  return rc;
-}
-
-/*
-** Read a single varint from file-descriptor pFile. Return SQLITE_OK if
-** successful, or an SQLite error code if some error occurs.
-**
-** The value of *piOffset when this function is called is used as the
-** byte offset in file pFile from whence to read the varint. If successful
-** (i.e. if no IO error occurs), then *piOffset is set to the offset of
-** the first byte past the end of the varint before returning. *piVal is
-** set to the integer value read. If an error occurs, the final values of
-** both *piOffset and *piVal are undefined.
-*/
-static int vdbeSorterReadVarint(
-  sqlite3_file *pFile,            /* File to read from */
-  i64 *piOffset,                  /* IN/OUT: Read offset in pFile */
-  i64 *piVal                      /* OUT: Value read from file */
-){
-  u8 aVarint[9];                  /* Buffer large enough for a varint */
-  i64 iOff = *piOffset;           /* Offset in file to read from */
-  int rc;                         /* Return code */
-
-  rc = sqlite3OsRead(pFile, aVarint, 9, iOff);
-  if( rc==SQLITE_OK ){
-    *piOffset += getVarint(aVarint, (u64 *)piVal);
+    pIter->nKey = (int)nRec;
+    rc = vdbeSorterIterRead(db, pIter, nRec, &pIter->aKey);
   }
 
   return rc;
@@ -264,22 +301,43 @@ static int vdbeSorterIterInit(
   VdbeSorterIter *pIter,          /* Iterator to populate */
   i64 *pnByte                     /* IN/OUT: Increment this value by PMA size */
 ){
-  int rc;
+  int rc = SQLITE_OK;
+  int nBuf;
+
+  nBuf = sqlite3BtreeGetPageSize(db->aDb[0].pBt);
 
   assert( pSorter->iWriteOff>iStart );
   assert( pIter->aAlloc==0 );
+  assert( pIter->aBuffer==0 );
   pIter->pFile = pSorter->pTemp1;
   pIter->iReadOff = iStart;
   pIter->nAlloc = 128;
   pIter->aAlloc = (u8 *)sqlite3DbMallocRaw(db, pIter->nAlloc);
-  if( !pIter->aAlloc ){
+  pIter->nBuffer = nBuf;
+  pIter->aBuffer = (u8 *)sqlite3DbMallocRaw(db, nBuf);
+
+  if( !pIter->aBuffer ){
     rc = SQLITE_NOMEM;
   }else{
-    i64 nByte;                         /* Total size of PMA in bytes */
-    rc = vdbeSorterReadVarint(pSorter->pTemp1, &pIter->iReadOff, &nByte);
-    *pnByte += nByte;
-    pIter->iEof = pIter->iReadOff + nByte;
+    int iBuf;
+
+    iBuf = pIter->iReadOff % nBuf;
+    if( iBuf ){
+      rc = sqlite3OsRead(
+          pSorter->pTemp1, &pIter->aBuffer[iBuf], nBuf-iBuf, iStart
+      );
+      assert( rc!=SQLITE_IOERR_SHORT_READ );
+    }
+
+    if( rc==SQLITE_OK ){
+      u64 nByte;                       /* Size of PMA in bytes */
+      pIter->iEof = iStart + pIter->nBuffer;
+      rc = vdbeSorterIterVarint(db, pIter, &nByte);
+      pIter->iEof = pIter->iReadOff + nByte;
+      *pnByte += nByte;
+    }
   }
+
   if( rc==SQLITE_OK ){
     rc = vdbeSorterIterNext(db, pIter);
   }
@@ -531,6 +589,92 @@ static int vdbeSorterSort(VdbeCursor *pCsr){
   return SQLITE_OK;
 }
 
+/*
+** Initialize a file-writer object.
+*/
+static int fileWriterInit(
+  sqlite3 *db,                    /* Database (for malloc) */
+  sqlite3_file *pFile,            /* File to write to */
+  FileWriter *p,                  /* Object to populate */
+  i64 iStart                      /* Offset of pFile to begin writing at */
+){
+  int nBuf = sqlite3BtreeGetPageSize(db->aDb[0].pBt);
+
+  memset(p, 0, sizeof(FileWriter));
+  p->aBuffer = (u8 *)sqlite3DbMallocRaw(db, nBuf);
+  if( !p->aBuffer ) return SQLITE_NOMEM;
+
+  p->iBufEnd = p->iBufStart = (iStart % nBuf);
+  p->iWriteOff = iStart - p->iBufStart;
+  p->nBuffer = nBuf;
+  p->pFile = pFile;
+  return SQLITE_OK;
+}
+
+/*
+** Write nData bytes of data to the file-write object. Return SQLITE_OK
+** if successful, or an SQLite error code if an error occurs.
+*/
+static int fileWriterWrite(FileWriter *p, u8 *pData, int nData){
+  int nRem = nData;
+  while( nRem>0 ){
+    int nCopy = nRem;
+    if( nCopy>(p->nBuffer - p->iBufEnd) ){
+      nCopy = p->nBuffer - p->iBufEnd;
+    }
+
+    memcpy(&p->aBuffer[p->iBufEnd], &pData[nData-nRem], nCopy);
+    p->iBufEnd += nCopy;
+    if( p->iBufEnd==p->nBuffer ){
+      int rc = sqlite3OsWrite(p->pFile, 
+          &p->aBuffer[p->iBufStart], p->iBufEnd - p->iBufStart, 
+          p->iWriteOff + p->iBufStart
+      );
+      if( rc!=SQLITE_OK ) return rc;
+      p->iBufStart = p->iBufEnd = 0;
+      p->iWriteOff += p->nBuffer;
+    }
+    assert( p->iBufEnd<p->nBuffer );
+
+    nRem -= nCopy;
+  }
+
+  return SQLITE_OK;
+}
+
+/*
+** Flush any buffered data to disk and clean up the file-writer object.
+** The results of using the file-writer after this call are undefined.
+** Return SQLITE_OK if flushing the buffered data succeeds or is not 
+** required. Otherwise, return an SQLite error code.
+**
+** Before returning, set *piEof to the offset immediately following the
+** last byte written to the file.
+*/
+static int fileWriterFinish(sqlite3 *db, FileWriter *p, i64 *piEof){
+  int rc = SQLITE_OK;
+  if( p->aBuffer && p->iBufEnd>p->iBufStart ){
+    rc = sqlite3OsWrite(p->pFile, 
+        &p->aBuffer[p->iBufStart], p->iBufEnd - p->iBufStart, 
+        p->iWriteOff + p->iBufStart
+    );
+  }
+  *piEof = (p->iWriteOff + p->iBufEnd);
+  sqlite3DbFree(db, p->aBuffer);
+  memset(p, 0, sizeof(FileWriter));
+  return rc;
+}
+
+/*
+** Write value iVal encoded as a varint to the file-write object. Return 
+** SQLITE_OK if successful, or an SQLite error code if an error occurs.
+*/
+static int fileWriterWriteVarint(FileWriter *p, u64 iVal){
+  int nByte; 
+  u8 aByte[10];
+  nByte = sqlite3PutVarint(aByte, iVal);
+  return fileWriterWrite(p, aByte, nByte);
+}
 
 /*
 ** Write the current contents of the in-memory linked-list to a PMA. Return
@@ -547,7 +691,11 @@ static int vdbeSorterSort(VdbeCursor *pCsr){
 */
 static int vdbeSorterListToPMA(sqlite3 *db, VdbeCursor *pCsr){
   int rc = SQLITE_OK;             /* Return code */
+  int rc2;                        /* fileWriterFinish return code */
   VdbeSorter *pSorter = pCsr->pSorter;
+  FileWriter writer;
+
+  memset(&writer, 0, sizeof(FileWriter));
 
   if( pSorter->nInMemory==0 ){
     assert( pSorter->pRecord==0 );
@@ -565,41 +713,32 @@ static int vdbeSorterListToPMA(sqlite3 *db, VdbeCursor *pCsr){
   }
 
   if( rc==SQLITE_OK ){
-    i64 iOff = pSorter->iWriteOff;
+    rc = fileWriterInit(db, pSorter->pTemp1, &writer, pSorter->iWriteOff);
+  }
+
+  if( rc==SQLITE_OK ){
     SorterRecord *p;
     SorterRecord *pNext = 0;
-    static const char eightZeros[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+
 
     pSorter->nPMA++;
-    rc = vdbeSorterWriteVarint(pSorter->pTemp1, pSorter->nInMemory, &iOff);
+    rc = fileWriterWriteVarint(&writer, pSorter->nInMemory);
     for(p=pSorter->pRecord; rc==SQLITE_OK && p; p=pNext){
       pNext = p->pNext;
-      rc = vdbeSorterWriteVarint(pSorter->pTemp1, p->nVal, &iOff);
-
+      rc = fileWriterWriteVarint(&writer, p->nVal);
       if( rc==SQLITE_OK ){
-        rc = sqlite3OsWrite(pSorter->pTemp1, p->pVal, p->nVal, iOff);
-        iOff += p->nVal;
+        rc = fileWriterWrite(&writer, p->pVal, p->nVal);
       }
 
       sqlite3DbFree(db, p);
     }
 
-    /* This assert verifies that unless an error has occurred, the size of 
-    ** the PMA on disk is the same as the expected size stored in
-    ** pSorter->nInMemory. */ 
-    assert( rc!=SQLITE_OK || pSorter->nInMemory==(
-          iOff-pSorter->iWriteOff-sqlite3VarintLen(pSorter->nInMemory)
-    ));
-
-    pSorter->iWriteOff = iOff;
-    if( rc==SQLITE_OK ){
-      /* Terminate each file with 8 extra bytes so that from any offset
-      ** in the file we can always read 9 bytes without a SHORT_READ error */
-      rc = sqlite3OsWrite(pSorter->pTemp1, eightZeros, 8, iOff);
-    }
     pSorter->pRecord = p;
   }
 
+  rc2 = fileWriterFinish(db, &writer, &pSorter->iWriteOff);
+  if( rc==SQLITE_OK ) rc = rc2;
+
   return rc;
 }
 
@@ -642,8 +781,14 @@ int sqlite3VdbeSorterWrite(
         (pSorter->nInMemory>pSorter->mxPmaSize)
      || (pSorter->nInMemory>pSorter->mnPmaSize && sqlite3HeapNearlyFull())
   )){
+#ifdef SQLITE_DEBUG
+    i64 nExpect = pSorter->iWriteOff
+                + sqlite3VarintLen(pSorter->nInMemory)
+                + pSorter->nInMemory;
+#endif
     rc = vdbeSorterListToPMA(db, pCsr);
     pSorter->nInMemory = 0;
+    assert( rc!=SQLITE_OK || (nExpect==pSorter->iWriteOff) );
   }
 
   return rc;
@@ -704,7 +849,7 @@ int sqlite3VdbeSorterRewind(sqlite3 *db, VdbeCursor *pCsr, int *pbEof){
     return vdbeSorterSort(pCsr);
   }
 
-  /* Write the current b-tree to a PMA. Close the b-tree cursor. */
+  /* Write the current in-memory list to a PMA. */
   rc = vdbeSorterListToPMA(db, pCsr);
   if( rc!=SQLITE_OK ) return rc;
 
@@ -726,8 +871,12 @@ int sqlite3VdbeSorterRewind(sqlite3 *db, VdbeCursor *pCsr, int *pbEof){
         rc==SQLITE_OK && iNew*SORTER_MAX_MERGE_COUNT<pSorter->nPMA; 
         iNew++
     ){
+      int rc2;                    /* Return code from fileWriterFinish() */
+      FileWriter writer;          /* Object used to write to disk */
       i64 nWrite;                 /* Number of bytes in new PMA */
 
+      memset(&writer, 0, sizeof(FileWriter));
+
       /* If there are SORTER_MAX_MERGE_COUNT or less PMAs in file pTemp1,
       ** initialize an iterator for each of them and break out of the loop.
       ** These iterators will be incrementally merged as the VDBE layer calls
@@ -749,24 +898,30 @@ int sqlite3VdbeSorterRewind(sqlite3 *db, VdbeCursor *pCsr, int *pbEof){
         rc = vdbeSorterOpenTempFile(db, &pTemp2);
       }
 
+      rc = fileWriterInit(db, pTemp2, &writer, iWrite2);
+
       if( rc==SQLITE_OK ){
-        rc = vdbeSorterWriteVarint(pTemp2, nWrite, &iWrite2);
+        rc = fileWriterWriteVarint(&writer, nWrite);
       }
 
       if( rc==SQLITE_OK ){
         int bEof = 0;
         while( rc==SQLITE_OK && bEof==0 ){
-          int nToWrite;
           VdbeSorterIter *pIter = &pSorter->aIter[ pSorter->aTree[1] ];
           assert( pIter->pFile );
-          nToWrite = pIter->nKey + sqlite3VarintLen(pIter->nKey);
-          rc = sqlite3OsWrite(pTemp2, pIter->aAlloc, nToWrite, iWrite2);
-          iWrite2 += nToWrite;
+
+          rc = fileWriterWriteVarint(&writer, pIter->nKey);
+          if( rc==SQLITE_OK ){
+            rc = fileWriterWrite(&writer, pIter->aKey, pIter->nKey);
+          }
           if( rc==SQLITE_OK ){
             rc = sqlite3VdbeSorterNext(db, pCsr, &bEof);
           }
         }
       }
+
+      rc2 = fileWriterFinish(db, &writer, &iWrite2);
+      if( rc==SQLITE_OK ) rc = rc2;
     }
 
     if( pSorter->nPMA<=SORTER_MAX_MERGE_COUNT ){
diff --git a/test/index4.test b/test/index4.test
index 018ed744a1..7da77715a4 100644
--- a/test/index4.test
+++ b/test/index4.test
@@ -17,6 +17,30 @@ source $testdir/tester.tcl
 
 set testprefix index4
 
+#proc str {n} { string range [string repeat [format %.06d. $n] 20] 0 101 }
+#db func str str
+#do_execsql_test 1.1 {
+#  BEGIN;
+#    CREATE TABLE t1(x);
+#    INSERT INTO t1 VALUES(str(1));
+#    INSERT INTO t1 SELECT str(rowid + 1) FROM t1;        --     2
+#    INSERT INTO t1 SELECT str(rowid + 2) FROM t1;        --     4
+#    INSERT INTO t1 SELECT str(rowid + 4) FROM t1;        --     8
+#    INSERT INTO t1 SELECT str(rowid + 8) FROM t1;        --    16
+#    INSERT INTO t1 SELECT str(rowid + 16) FROM t1;       --    32
+#    INSERT INTO t1 SELECT str(rowid + 32) FROM t1;       --    64
+#    INSERT INTO t1 SELECT str(rowid + 64) FROM t1;       --   128
+#    INSERT INTO t1 SELECT str(rowid + 128) FROM t1;      --   256
+#    INSERT INTO t1 SELECT str(rowid + 256) FROM t1;      --   512
+#    INSERT INTO t1 SELECT str(rowid + 512) FROM t1;      --  1024
+#    INSERT INTO t1 SELECT str(rowid + 1024) FROM t1;     --  2048
+#    INSERT INTO t1 SELECT str(rowid + 2048) FROM t1;     --  4096
+#    INSERT INTO t1 SELECT str(rowid + 4096) FROM t1;     --  8192
+#    INSERT INTO t1 SELECT str(rowid + 8192) FROM t1;     -- 16384
+#    INSERT INTO t1 SELECT str(rowid + 16384) FROM t1;    -- 32768
+#  COMMIT;
+#}
+
 do_execsql_test 1.1 {
   BEGIN;
     CREATE TABLE t1(x);

From 407fae09ee56e7b86097a98c16a606f49df342bb Mon Sep 17 00:00:00 2001
From: dan <dan@noemail.net>
Date: Mon, 23 Jul 2012 20:10:35 +0000
Subject: [PATCH 02/36] Fix an edge case in vdbesort.c.

FossilOrigin-Name: 4ba266fc534f390267180eca8d68b8d5f0b7f832
---
 manifest       | 15 ++++++---------
 manifest.uuid  |  2 +-
 src/vdbesort.c | 10 +++++++---
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/manifest b/manifest
index c893586b7a..8ee9b917a6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Modify\sthe\scode\sin\svdbesort.c\sso\sthat\smost\sreads\sand\swrites\sto\stemporary\sfiles\sare\saligned\spage-sized\sblocks.
-D 2012-07-23T19:25:39.921
+C Fix\san\sedge\scase\sin\svdbesort.c.
+D 2012-07-23T20:10:35.296
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 8f6d858bf3df9978ba43df19985146a1173025e4
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -244,7 +244,7 @@ F src/vdbeapi.c 88ea823bbcb4320f5a6607f39cd7c2d3cc4c26b1
 F src/vdbeaux.c dce80038c3c41f2680e5ab4dd0f7e0d8b7ff9071
 F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
 F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
-F src/vdbesort.c 6822221af97e57bd17091cfe5abec902c1ef04ad
+F src/vdbesort.c bd37dbd4a023f75e9cd1eec18e171aa6f2552d20
 F src/vdbetrace.c 79059ebd17b3c8545fab2a24253713e77e4ab392
 F src/vtab.c bb8ea3a26608bb1357538a5d2fc72beba6638998
 F src/wal.c 9294df6f96aae5909ae1a9b733fd1e1b4736978b
@@ -1005,10 +1005,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P e4163596339c2166f9c4356ab824fff8bda8d0b0
-R ed9539f5559c8070d5186f316e47e4b4
-T *branch * sorter-coalesce-writes
-T *sym-sorter-coalesce-writes *
-T -sym-trunk *
+P 55e47ef338c42f95f0f071d6ec92cd2480f9f1fe
+R c1d0187a30b4d8ec69c9c7f13c2ce356
 U dan
-Z 0e4fc9d4c65d0946db257b091fe0d573
+Z 60c5c030c4ed6dd425cd291cf7eefd27
diff --git a/manifest.uuid b/manifest.uuid
index 53013f689c..239b7c9706 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-55e47ef338c42f95f0f071d6ec92cd2480f9f1fe
\ No newline at end of file
+4ba266fc534f390267180eca8d68b8d5f0b7f832
\ No newline at end of file
diff --git a/src/vdbesort.c b/src/vdbesort.c
index 393e937d32..7778196f1c 100644
--- a/src/vdbesort.c
+++ b/src/vdbesort.c
@@ -321,17 +321,21 @@ static int vdbeSorterIterInit(
   }else{
     int iBuf;
 
-    iBuf = pIter->iReadOff % nBuf;
+    iBuf = iStart % nBuf;
     if( iBuf ){
+      int nRead = nBuf - iBuf;
+      if( (iStart + nRead) > pSorter->iWriteOff ){
+        nRead = pSorter->iWriteOff - iStart;
+      }
       rc = sqlite3OsRead(
-          pSorter->pTemp1, &pIter->aBuffer[iBuf], nBuf-iBuf, iStart
+          pSorter->pTemp1, &pIter->aBuffer[iBuf], nRead, iStart
       );
       assert( rc!=SQLITE_IOERR_SHORT_READ );
     }
 
     if( rc==SQLITE_OK ){
       u64 nByte;                       /* Size of PMA in bytes */
-      pIter->iEof = iStart + pIter->nBuffer;
+      pIter->iEof = pSorter->iWriteOff;
       rc = vdbeSorterIterVarint(db, pIter, &nByte);
       pIter->iEof = pIter->iReadOff + nByte;
       *pnByte += nByte;

From 2b596da8b72647411a679b40c1a8bf2474c9b6b6 Mon Sep 17 00:00:00 2001
From: drh <drh@noemail.net>
Date: Mon, 23 Jul 2012 21:43:19 +0000
Subject: [PATCH 03/36] Refactor field names in the SelectDest object to make
 them distinct and easier to grep for.

FossilOrigin-Name: b589f1efb3907a68058bf2ee981dca126d083e83
---
 manifest        |  20 ++++-----
 manifest.uuid   |   2 +-
 src/expr.c      |   8 ++--
 src/insert.c    |  12 ++---
 src/select.c    | 115 ++++++++++++++++++++++++------------------------
 src/sqliteInt.h |   8 ++--
 6 files changed, 83 insertions(+), 82 deletions(-)

diff --git a/manifest b/manifest
index 8576e56420..a71ad43270 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\sthere\sis\salways\sat\sleast\sone\saReadMark\sslot\susable\sby\san\sunprivileged\sreader\swhile\sa\scheckpoint\sis\srunning.\sAlso,\sif\sone\sor\smore\stransactions\sare\srecovered\sfrom\sa\slog\sfile,\sinitialize\sone\sof\sthe\saReadMark\sslots\sto\scontain\smxFrame\sas\spart\sof\sthe\srecovery\sprocess.
-D 2012-07-17T14:37:12.494
+C Refactor\sfield\snames\sin\sthe\sSelectDest\sobject\sto\smake\sthem\sdistinct\sand\seasier\nto\sgrep\sfor.
+D 2012-07-23T21:43:19.390
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 8f6d858bf3df9978ba43df19985146a1173025e4
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -132,7 +132,7 @@ F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
 F src/ctime.c 500d019da966631ad957c37705642be87524463b
 F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
 F src/delete.c 4c20ea4f6213b3bc1c6a510586864b679946e05e
-F src/expr.c 06a7733d19dc725dc46ba51afd9feadb4b85d991
+F src/expr.c e2927abf9c69ce4ff9a931bd201946961c34819a
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c 657212460bf5cfd3ae607d12ea62092844c227b5
 F src/func.c 18dfedfb857e100b05755a1b12e88b389f957879
@@ -140,7 +140,7 @@ F src/global.c 4cfdca5cb0edd33c4d021baec4ede958cb2c793b
 F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
 F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
 F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
-F src/insert.c 0bbffe75c254c62a5686ab5e7f88e29235e16174
+F src/insert.c 770ed633830fb49d73d90c3fdf20b703973e1e84
 F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
 F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
@@ -176,11 +176,11 @@ F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f
 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c b3c70ab28cac60de33684c9aa9e5138dcf71d6dd
 F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
-F src/select.c f6c4833c4d8e94714761d99013d74f381e084f1d
+F src/select.c eecb852bc7d8c00253b9b9cbab9e528f0d4dd9a5
 F src/shell.c 076e1c90d594644f36027c8ecff9a392cf2d3a06
 F src/sqlite.h.in 310ae7e538883fa1619ab0638c775ce11ad43015
 F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
-F src/sqliteInt.h 2bc2ebc2ff1a2b530ee5ed9ffd46c6fce93b244c
+F src/sqliteInt.h ed41801550b0b8fb8217fcfd2e362118062b30c0
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@ -1005,7 +1005,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 8c9ee1d78f99394eef73a177141ca9e1c67e4e07
-R 21a0c6942de3e9593e3e93f462c443c7
-U dan
-Z a98d8c358c03bd601d60af308961371e
+P e4163596339c2166f9c4356ab824fff8bda8d0b0
+R adb51909ed26f080ecf60f96fb1f4ac0
+U drh
+Z 14fefb32c4db69f21df1898d6655f0c2
diff --git a/manifest.uuid b/manifest.uuid
index dad8b25eaa..4c27b7b677 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e4163596339c2166f9c4356ab824fff8bda8d0b0
\ No newline at end of file
+b589f1efb3907a68058bf2ee981dca126d083e83
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 1e46596a2f..790aa45f3b 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -1701,7 +1701,7 @@ int sqlite3CodeSubselect(
 
         assert( !isRowid );
         sqlite3SelectDestInit(&dest, SRT_Set, pExpr->iTable);
-        dest.affinity = (u8)affinity;
+        dest.affSdst = (u8)affinity;
         assert( (pExpr->iTable&0x0000FFFF)==pExpr->iTable );
         pExpr->x.pSelect->iLimit = 0;
         if( sqlite3Select(pParse, pExpr->x.pSelect, &dest) ){
@@ -1794,11 +1794,11 @@ int sqlite3CodeSubselect(
       sqlite3SelectDestInit(&dest, 0, ++pParse->nMem);
       if( pExpr->op==TK_SELECT ){
         dest.eDest = SRT_Mem;
-        sqlite3VdbeAddOp2(v, OP_Null, 0, dest.iParm);
+        sqlite3VdbeAddOp2(v, OP_Null, 0, dest.iSDParm);
         VdbeComment((v, "Init subquery result"));
       }else{
         dest.eDest = SRT_Exists;
-        sqlite3VdbeAddOp2(v, OP_Integer, 0, dest.iParm);
+        sqlite3VdbeAddOp2(v, OP_Integer, 0, dest.iSDParm);
         VdbeComment((v, "Init EXISTS result"));
       }
       sqlite3ExprDelete(pParse->db, pSel->pLimit);
@@ -1808,7 +1808,7 @@ int sqlite3CodeSubselect(
       if( sqlite3Select(pParse, pSel, &dest) ){
         return 0;
       }
-      rReg = dest.iParm;
+      rReg = dest.iSDParm;
       ExprSetIrreducible(pExpr);
       break;
     }
diff --git a/src/insert.c b/src/insert.c
index a589c8aef6..faed6470c2 100644
--- a/src/insert.c
+++ b/src/insert.c
@@ -597,7 +597,7 @@ void sqlite3Insert(
     VdbeComment((v, "SELECT eof flag"));
     sqlite3SelectDestInit(&dest, SRT_Coroutine, ++pParse->nMem);
     addrSelect = sqlite3VdbeCurrentAddr(v)+2;
-    sqlite3VdbeAddOp2(v, OP_Integer, addrSelect-1, dest.iParm);
+    sqlite3VdbeAddOp2(v, OP_Integer, addrSelect-1, dest.iSDParm);
     j1 = sqlite3VdbeAddOp2(v, OP_Goto, 0, 0);
     VdbeComment((v, "Jump over SELECT coroutine"));
 
@@ -608,15 +608,15 @@ void sqlite3Insert(
       goto insert_cleanup;
     }
     sqlite3VdbeAddOp2(v, OP_Integer, 1, regEof);         /* EOF <- 1 */
-    sqlite3VdbeAddOp1(v, OP_Yield, dest.iParm);   /* yield X */
+    sqlite3VdbeAddOp1(v, OP_Yield, dest.iSDParm);   /* yield X */
     sqlite3VdbeAddOp2(v, OP_Halt, SQLITE_INTERNAL, OE_Abort);
     VdbeComment((v, "End of SELECT coroutine"));
     sqlite3VdbeJumpHere(v, j1);                          /* label B: */
 
-    regFromSelect = dest.iMem;
+    regFromSelect = dest.iSdst;
     assert( pSelect->pEList );
     nColumn = pSelect->pEList->nExpr;
-    assert( dest.nMem==nColumn );
+    assert( dest.nSdst==nColumn );
 
     /* Set useTempTable to TRUE if the result of the SELECT statement
     ** should be written into a temporary table (template 4).  Set to
@@ -652,7 +652,7 @@ void sqlite3Insert(
       regRec = sqlite3GetTempReg(pParse);
       regTempRowid = sqlite3GetTempReg(pParse);
       sqlite3VdbeAddOp2(v, OP_OpenEphemeral, srcTab, nColumn);
-      addrTop = sqlite3VdbeAddOp1(v, OP_Yield, dest.iParm);
+      addrTop = sqlite3VdbeAddOp1(v, OP_Yield, dest.iSDParm);
       addrIf = sqlite3VdbeAddOp1(v, OP_If, regEof);
       sqlite3VdbeAddOp3(v, OP_MakeRecord, regFromSelect, nColumn, regRec);
       sqlite3VdbeAddOp2(v, OP_NewRowid, srcTab, regTempRowid);
@@ -789,7 +789,7 @@ void sqlite3Insert(
     **         goto C
     **      D: ...
     */
-    addrCont = sqlite3VdbeAddOp1(v, OP_Yield, dest.iParm);
+    addrCont = sqlite3VdbeAddOp1(v, OP_Yield, dest.iSDParm);
     addrInsTop = sqlite3VdbeAddOp1(v, OP_If, regEof);
   }
 
diff --git a/src/select.c b/src/select.c
index d79a6112f7..1d424caf1e 100644
--- a/src/select.c
+++ b/src/select.c
@@ -36,10 +36,10 @@ static void clearSelect(sqlite3 *db, Select *p){
 */
 void sqlite3SelectDestInit(SelectDest *pDest, int eDest, int iParm){
   pDest->eDest = (u8)eDest;
-  pDest->iParm = iParm;
-  pDest->affinity = 0;
-  pDest->iMem = 0;
-  pDest->nMem = 0;
+  pDest->iSDParm = iParm;
+  pDest->affSdst = 0;
+  pDest->iSdst = 0;
+  pDest->nSdst = 0;
 }
 
 
@@ -551,7 +551,7 @@ static void selectInnerLoop(
   int hasDistinct;        /* True if the DISTINCT keyword is present */
   int regResult;              /* Start of memory holding result set */
   int eDest = pDest->eDest;   /* How to dispose of results */
-  int iParm = pDest->iParm;   /* First argument to disposal method */
+  int iParm = pDest->iSDParm; /* First argument to disposal method */
   int nResultCol;             /* Number of result columns */
 
   assert( v );
@@ -569,14 +569,14 @@ static void selectInnerLoop(
   }else{
     nResultCol = pEList->nExpr;
   }
-  if( pDest->iMem==0 ){
-    pDest->iMem = pParse->nMem+1;
-    pDest->nMem = nResultCol;
+  if( pDest->iSdst==0 ){
+    pDest->iSdst = pParse->nMem+1;
+    pDest->nSdst = nResultCol;
     pParse->nMem += nResultCol;
   }else{ 
-    assert( pDest->nMem==nResultCol );
+    assert( pDest->nSdst==nResultCol );
   }
-  regResult = pDest->iMem;
+  regResult = pDest->iSdst;
   if( nColumn>0 ){
     for(i=0; i<nColumn; i++){
       sqlite3VdbeAddOp3(v, OP_Column, srcTab, i, regResult+i);
@@ -655,7 +655,7 @@ static void selectInnerLoop(
     */
     case SRT_Set: {
       assert( nColumn==1 );
-      p->affinity = sqlite3CompareAffinity(pEList->a[0].pExpr, pDest->affinity);
+      p->affinity = sqlite3CompareAffinity(pEList->a[0].pExpr, pDest->affSdst);
       if( pOrderBy ){
         /* At first glance you would think we could optimize out the
         ** ORDER BY in this case since the order of entries in the set
@@ -710,7 +710,7 @@ static void selectInnerLoop(
         pushOntoSorter(pParse, pOrderBy, p, r1);
         sqlite3ReleaseTempReg(pParse, r1);
       }else if( eDest==SRT_Coroutine ){
-        sqlite3VdbeAddOp1(v, OP_Yield, pDest->iParm);
+        sqlite3VdbeAddOp1(v, OP_Yield, pDest->iSDParm);
       }else{
         sqlite3VdbeAddOp2(v, OP_ResultRow, regResult, nColumn);
         sqlite3ExprCacheAffinityChange(pParse, regResult, nColumn);
@@ -890,7 +890,7 @@ static void generateSortTail(
   ExprList *pOrderBy = p->pOrderBy;
 
   int eDest = pDest->eDest;
-  int iParm = pDest->iParm;
+  int iParm = pDest->iSDParm;
 
   int regRow;
   int regRowid;
@@ -949,17 +949,17 @@ static void generateSortTail(
       testcase( eDest==SRT_Output );
       testcase( eDest==SRT_Coroutine );
       for(i=0; i<nColumn; i++){
-        assert( regRow!=pDest->iMem+i );
-        sqlite3VdbeAddOp3(v, OP_Column, pseudoTab, i, pDest->iMem+i);
+        assert( regRow!=pDest->iSdst+i );
+        sqlite3VdbeAddOp3(v, OP_Column, pseudoTab, i, pDest->iSdst+i);
         if( i==0 ){
           sqlite3VdbeChangeP5(v, OPFLAG_CLEARCACHE);
         }
       }
       if( eDest==SRT_Output ){
-        sqlite3VdbeAddOp2(v, OP_ResultRow, pDest->iMem, nColumn);
-        sqlite3ExprCacheAffinityChange(pParse, pDest->iMem, nColumn);
+        sqlite3VdbeAddOp2(v, OP_ResultRow, pDest->iSdst, nColumn);
+        sqlite3ExprCacheAffinityChange(pParse, pDest->iSdst, nColumn);
       }else{
-        sqlite3VdbeAddOp1(v, OP_Yield, pDest->iParm);
+        sqlite3VdbeAddOp1(v, OP_Yield, pDest->iSDParm);
       }
       break;
     }
@@ -1610,7 +1610,7 @@ static int multiSelect(
   */
   if( dest.eDest==SRT_EphemTab ){
     assert( p->pEList );
-    sqlite3VdbeAddOp2(v, OP_OpenEphemeral, dest.iParm, p->pEList->nExpr);
+    sqlite3VdbeAddOp2(v, OP_OpenEphemeral, dest.iSDParm, p->pEList->nExpr);
     sqlite3VdbeChangeP5(v, BTREE_UNORDERED);
     dest.eDest = SRT_Table;
   }
@@ -1696,7 +1696,7 @@ static int multiSelect(
                                      ** of a 3-way or more compound */
         assert( p->pLimit==0 );      /* Not allowed on leftward elements */
         assert( p->pOffset==0 );     /* Not allowed on leftward elements */
-        unionTab = dest.iParm;
+        unionTab = dest.iSDParm;
       }else{
         /* We will need to create our own temporary table to hold the
         ** intermediate results.
@@ -1753,7 +1753,7 @@ static int multiSelect(
       /* Convert the data in the temporary table into whatever form
       ** it is that we currently need.
       */
-      assert( unionTab==dest.iParm || dest.eDest!=priorOp );
+      assert( unionTab==dest.iSDParm || dest.eDest!=priorOp );
       if( dest.eDest!=priorOp ){
         int iCont, iBreak, iStart;
         assert( p->pEList );
@@ -1817,7 +1817,7 @@ static int multiSelect(
       p->pLimit = 0;
       pOffset = p->pOffset;
       p->pOffset = 0;
-      intersectdest.iParm = tab2;
+      intersectdest.iSDParm = tab2;
       explainSetInteger(iSub2, pParse->iNextSelectId);
       rc = sqlite3Select(pParse, p, &intersectdest);
       testcase( rc!=SQLITE_OK );
@@ -1911,8 +1911,8 @@ static int multiSelect(
   }
 
 multi_select_end:
-  pDest->iMem = dest.iMem;
-  pDest->nMem = dest.nMem;
+  pDest->iSdst = dest.iSdst;
+  pDest->nSdst = dest.nSdst;
   sqlite3SelectDelete(db, pDelete);
   return rc;
 }
@@ -1922,8 +1922,8 @@ multi_select_end:
 ** Code an output subroutine for a coroutine implementation of a
 ** SELECT statment.
 **
-** The data to be output is contained in pIn->iMem.  There are
-** pIn->nMem columns to be output.  pDest is where the output should
+** The data to be output is contained in pIn->iSdst.  There are
+** pIn->nSdst columns to be output.  pDest is where the output should
 ** be sent.
 **
 ** regReturn is the number of the register holding the subroutine
@@ -1961,11 +1961,11 @@ static int generateOutputSubroutine(
   if( regPrev ){
     int j1, j2;
     j1 = sqlite3VdbeAddOp1(v, OP_IfNot, regPrev);
-    j2 = sqlite3VdbeAddOp4(v, OP_Compare, pIn->iMem, regPrev+1, pIn->nMem,
+    j2 = sqlite3VdbeAddOp4(v, OP_Compare, pIn->iSdst, regPrev+1, pIn->nSdst,
                               (char*)pKeyInfo, p4type);
     sqlite3VdbeAddOp3(v, OP_Jump, j2+2, iContinue, j2+2);
     sqlite3VdbeJumpHere(v, j1);
-    sqlite3ExprCodeCopy(pParse, pIn->iMem, regPrev+1, pIn->nMem);
+    sqlite3ExprCodeCopy(pParse, pIn->iSdst, regPrev+1, pIn->nSdst);
     sqlite3VdbeAddOp2(v, OP_Integer, 1, regPrev);
   }
   if( pParse->db->mallocFailed ) return 0;
@@ -1983,9 +1983,9 @@ static int generateOutputSubroutine(
       int r2 = sqlite3GetTempReg(pParse);
       testcase( pDest->eDest==SRT_Table );
       testcase( pDest->eDest==SRT_EphemTab );
-      sqlite3VdbeAddOp3(v, OP_MakeRecord, pIn->iMem, pIn->nMem, r1);
-      sqlite3VdbeAddOp2(v, OP_NewRowid, pDest->iParm, r2);
-      sqlite3VdbeAddOp3(v, OP_Insert, pDest->iParm, r1, r2);
+      sqlite3VdbeAddOp3(v, OP_MakeRecord, pIn->iSdst, pIn->nSdst, r1);
+      sqlite3VdbeAddOp2(v, OP_NewRowid, pDest->iSDParm, r2);
+      sqlite3VdbeAddOp3(v, OP_Insert, pDest->iSDParm, r1, r2);
       sqlite3VdbeChangeP5(v, OPFLAG_APPEND);
       sqlite3ReleaseTempReg(pParse, r2);
       sqlite3ReleaseTempReg(pParse, r1);
@@ -1999,13 +1999,13 @@ static int generateOutputSubroutine(
     */
     case SRT_Set: {
       int r1;
-      assert( pIn->nMem==1 );
+      assert( pIn->nSdst==1 );
       p->affinity = 
-         sqlite3CompareAffinity(p->pEList->a[0].pExpr, pDest->affinity);
+         sqlite3CompareAffinity(p->pEList->a[0].pExpr, pDest->affSdst);
       r1 = sqlite3GetTempReg(pParse);
-      sqlite3VdbeAddOp4(v, OP_MakeRecord, pIn->iMem, 1, r1, &p->affinity, 1);
-      sqlite3ExprCacheAffinityChange(pParse, pIn->iMem, 1);
-      sqlite3VdbeAddOp2(v, OP_IdxInsert, pDest->iParm, r1);
+      sqlite3VdbeAddOp4(v, OP_MakeRecord, pIn->iSdst, 1, r1, &p->affinity, 1);
+      sqlite3ExprCacheAffinityChange(pParse, pIn->iSdst, 1);
+      sqlite3VdbeAddOp2(v, OP_IdxInsert, pDest->iSDParm, r1);
       sqlite3ReleaseTempReg(pParse, r1);
       break;
     }
@@ -2014,7 +2014,7 @@ static int generateOutputSubroutine(
     /* If any row exist in the result set, record that fact and abort.
     */
     case SRT_Exists: {
-      sqlite3VdbeAddOp2(v, OP_Integer, 1, pDest->iParm);
+      sqlite3VdbeAddOp2(v, OP_Integer, 1, pDest->iSDParm);
       /* The LIMIT clause will terminate the loop for us */
       break;
     }
@@ -2025,23 +2025,23 @@ static int generateOutputSubroutine(
     ** of the scan loop.
     */
     case SRT_Mem: {
-      assert( pIn->nMem==1 );
-      sqlite3ExprCodeMove(pParse, pIn->iMem, pDest->iParm, 1);
+      assert( pIn->nSdst==1 );
+      sqlite3ExprCodeMove(pParse, pIn->iSdst, pDest->iSDParm, 1);
       /* The LIMIT clause will jump out of the loop for us */
       break;
     }
 #endif /* #ifndef SQLITE_OMIT_SUBQUERY */
 
     /* The results are stored in a sequence of registers
-    ** starting at pDest->iMem.  Then the co-routine yields.
+    ** starting at pDest->iSdst.  Then the co-routine yields.
     */
     case SRT_Coroutine: {
-      if( pDest->iMem==0 ){
-        pDest->iMem = sqlite3GetTempRange(pParse, pIn->nMem);
-        pDest->nMem = pIn->nMem;
+      if( pDest->iSdst==0 ){
+        pDest->iSdst = sqlite3GetTempRange(pParse, pIn->nSdst);
+        pDest->nSdst = pIn->nSdst;
       }
-      sqlite3ExprCodeMove(pParse, pIn->iMem, pDest->iMem, pDest->nMem);
-      sqlite3VdbeAddOp1(v, OP_Yield, pDest->iParm);
+      sqlite3ExprCodeMove(pParse, pIn->iSdst, pDest->iSdst, pDest->nSdst);
+      sqlite3VdbeAddOp1(v, OP_Yield, pDest->iSDParm);
       break;
     }
 
@@ -2055,8 +2055,8 @@ static int generateOutputSubroutine(
     */
     default: {
       assert( pDest->eDest==SRT_Output );
-      sqlite3VdbeAddOp2(v, OP_ResultRow, pIn->iMem, pIn->nMem);
-      sqlite3ExprCacheAffinityChange(pParse, pIn->iMem, pIn->nMem);
+      sqlite3VdbeAddOp2(v, OP_ResultRow, pIn->iSdst, pIn->nSdst);
+      sqlite3ExprCacheAffinityChange(pParse, pIn->iSdst, pIn->nSdst);
       break;
     }
   }
@@ -2475,7 +2475,7 @@ static int multiSelectOrderBy(
   */
   sqlite3VdbeResolveLabel(v, labelCmpr);
   sqlite3VdbeAddOp4(v, OP_Permutation, 0, 0, 0, (char*)aPermute, P4_INTARRAY);
-  sqlite3VdbeAddOp4(v, OP_Compare, destA.iMem, destB.iMem, nOrderBy,
+  sqlite3VdbeAddOp4(v, OP_Compare, destA.iSdst, destB.iSdst, nOrderBy,
                          (char*)pKeyMerge, P4_KEYINFO_HANDOFF);
   sqlite3VdbeAddOp3(v, OP_Jump, addrAltB, addrAeqB, addrAgtB);
 
@@ -3721,23 +3721,24 @@ static void explainSimpleCount(
 **
 **     SRT_Mem         Only valid if the result is a single column.
 **                     Store the first column of the first result row
-**                     in register pDest->iParm then abandon the rest
+**                     in register pDest->iSDParm then abandon the rest
 **                     of the query.  This destination implies "LIMIT 1".
 **
 **     SRT_Set         The result must be a single column.  Store each
-**                     row of result as the key in table pDest->iParm. 
+**                     row of result as the key in table pDest->iSDParm. 
 **                     Apply the affinity pDest->affinity before storing
 **                     results.  Used to implement "IN (SELECT ...)".
 **
-**     SRT_Union       Store results as a key in a temporary table pDest->iParm.
+**     SRT_Union       Store results as a key in a temporary table 
+**                     identified by pDest->iSDParm.
 **
-**     SRT_Except      Remove results from the temporary table pDest->iParm.
+**     SRT_Except      Remove results from the temporary table pDest->iSDParm.
 **
-**     SRT_Table       Store results in temporary table pDest->iParm.
+**     SRT_Table       Store results in temporary table pDest->iSDParm.
 **                     This is like SRT_EphemTab except that the table
 **                     is assumed to already be open.
 **
-**     SRT_EphemTab    Create an temporary table pDest->iParm and store
+**     SRT_EphemTab    Create an temporary table pDest->iSDParm and store
 **                     the result there. The cursor is left open after
 **                     returning.  This is like SRT_Table except that
 **                     this destination uses OP_OpenEphemeral to create
@@ -3745,9 +3746,9 @@ static void explainSimpleCount(
 **
 **     SRT_Coroutine   Generate a co-routine that returns a new row of
 **                     results each time it is invoked.  The entry point
-**                     of the co-routine is stored in register pDest->iParm.
+**                     of the co-routine is stored in register pDest->iSDParm.
 **
-**     SRT_Exists      Store a 1 in memory cell pDest->iParm if the result
+**     SRT_Exists      Store a 1 in memory cell pDest->iSDParm if the result
 **                     set is not empty.
 **
 **     SRT_Discard     Throw the results away.  This is used by SELECT
@@ -3991,7 +3992,7 @@ int sqlite3Select(
   /* If the output is destined for a temporary table, open that table.
   */
   if( pDest->eDest==SRT_EphemTab ){
-    sqlite3VdbeAddOp2(v, OP_OpenEphemeral, pDest->iParm, pEList->nExpr);
+    sqlite3VdbeAddOp2(v, OP_OpenEphemeral, pDest->iSDParm, pEList->nExpr);
   }
 
   /* Set the limiter.
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index f7f5fd386e..c525ebd16f 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -2118,10 +2118,10 @@ struct Select {
 typedef struct SelectDest SelectDest;
 struct SelectDest {
   u8 eDest;         /* How to dispose of the results */
-  u8 affinity;      /* Affinity used when eDest==SRT_Set */
-  int iParm;        /* A parameter used by the eDest disposal method */
-  int iMem;         /* Base register where results are written */
-  int nMem;         /* Number of registers allocated */
+  u8 affSdst;       /* Affinity used when eDest==SRT_Set */
+  int iSDParm;      /* A parameter used by the eDest disposal method */
+  int iSdst;        /* Base register where results are written */
+  int nSdst;        /* Number of registers allocated */
 };
 
 /*

From 35d8ac980dabde27e47d45ded8f05f715cde67af Mon Sep 17 00:00:00 2001
From: mistachkin <mistachkin@noemail.net>
Date: Tue, 24 Jul 2012 06:02:35 +0000
Subject: [PATCH 04/36] Add another define to the MSVC makefile that is
 sometimes required to build cleanly for WinRT.

FossilOrigin-Name: d582cd890d88e873d76a23545bcd49cf093ee9d2
---
 Makefile.msc  |  1 +
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Makefile.msc b/Makefile.msc
index e16ced35e4..03872d7de8 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -123,6 +123,7 @@ TCC = $(CC) -W3 -DSQLITE_OS_WIN=1 -I. -I$(TOP)\src -fp:precise
 #
 !IF $(FOR_WINRT)!=0
 TCC = $(TCC) -DSQLITE_OS_WINRT=1
+TCC = $(TCC) -DWINAPI_FAMILY=WINAPI_PARTITION_APP
 !ENDIF
 
 # Also, we need to dynamically link to the correct MSVC runtime
diff --git a/manifest b/manifest
index a71ad43270..74d8f3cb5e 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Refactor\sfield\snames\sin\sthe\sSelectDest\sobject\sto\smake\sthem\sdistinct\sand\seasier\nto\sgrep\sfor.
-D 2012-07-23T21:43:19.390
+C Add\sanother\sdefine\sto\sthe\sMSVC\smakefile\sthat\sis\ssometimes\srequired\sto\sbuild\scleanly\sfor\sWinRT.
+D 2012-07-24T06:02:35.411
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 8f6d858bf3df9978ba43df19985146a1173025e4
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc 56ff0fcc3fc3b275aec7f6acb34b3c0526c684bc
+F Makefile.msc a2a8fcd4104a67e037351323c88e0e4822596926
 F Makefile.vxworks 879f034a64062a364b21000266bbd5bc6e0c19b9
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 F VERSION a71848df48082f1d6585d4b0819d530fc455485d
@@ -1005,7 +1005,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P e4163596339c2166f9c4356ab824fff8bda8d0b0
-R adb51909ed26f080ecf60f96fb1f4ac0
-U drh
-Z 14fefb32c4db69f21df1898d6655f0c2
+P b589f1efb3907a68058bf2ee981dca126d083e83
+R 75a13812cd02d645a4e2c62d598f937c
+U mistachkin
+Z 17af9fcca0ae08ed5daad968a9e3388d
diff --git a/manifest.uuid b/manifest.uuid
index 4c27b7b677..d8da19bf2a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b589f1efb3907a68058bf2ee981dca126d083e83
\ No newline at end of file
+d582cd890d88e873d76a23545bcd49cf093ee9d2
\ No newline at end of file

From c041c16ce147f63c3a2cd2df4597820ff6387ada Mon Sep 17 00:00:00 2001
From: drh <drh@noemail.net>
Date: Tue, 24 Jul 2012 19:46:38 +0000
Subject: [PATCH 05/36] Mark parameters to sorter interfaces as const where
 appropriate.

FossilOrigin-Name: d8da26f1f43610ac83af2a5d0e170be5abaf7aaa
---
 manifest       | 18 +++++++++---------
 manifest.uuid  |  2 +-
 src/select.c   |  2 +-
 src/vdbeInt.h  | 10 +++++-----
 src/vdbesort.c | 30 +++++++++++++++---------------
 5 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/manifest b/manifest
index 74d8f3cb5e..7c1d8a6053 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sanother\sdefine\sto\sthe\sMSVC\smakefile\sthat\sis\ssometimes\srequired\sto\sbuild\scleanly\sfor\sWinRT.
-D 2012-07-24T06:02:35.411
+C Mark\sparameters\sto\ssorter\sinterfaces\sas\sconst\swhere\sappropriate.
+D 2012-07-24T19:46:38.570
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 8f6d858bf3df9978ba43df19985146a1173025e4
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -176,7 +176,7 @@ F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f
 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c b3c70ab28cac60de33684c9aa9e5138dcf71d6dd
 F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
-F src/select.c eecb852bc7d8c00253b9b9cbab9e528f0d4dd9a5
+F src/select.c a365da6d7a6d7d8a10ad60ca71837ab5e9369466
 F src/shell.c 076e1c90d594644f36027c8ecff9a392cf2d3a06
 F src/sqlite.h.in 310ae7e538883fa1619ab0638c775ce11ad43015
 F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
@@ -239,12 +239,12 @@ F src/util.c 0af2e515dc0dabacec931bca39525f6c3f1c5455
 F src/vacuum.c 587a52bb8833d7ac15af8916f25437e2575028bd
 F src/vdbe.c f5ad3c06dc3fe647097065829c013f3f1b9eadca
 F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
-F src/vdbeInt.h 6ff4180a05683566a8835d12f7ec504b22932c82
+F src/vdbeInt.h 986b6b11a13c517337355009e5438703ba5b0a40
 F src/vdbeapi.c 88ea823bbcb4320f5a6607f39cd7c2d3cc4c26b1
 F src/vdbeaux.c dce80038c3c41f2680e5ab4dd0f7e0d8b7ff9071
 F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
 F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
-F src/vdbesort.c b25814d385895544ebc8118245c8311ded7f81c9
+F src/vdbesort.c 628b2bc0cc82cae0e9946f70c5c81986e9fba91f
 F src/vdbetrace.c 79059ebd17b3c8545fab2a24253713e77e4ab392
 F src/vtab.c bb8ea3a26608bb1357538a5d2fc72beba6638998
 F src/wal.c 9294df6f96aae5909ae1a9b733fd1e1b4736978b
@@ -1005,7 +1005,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P b589f1efb3907a68058bf2ee981dca126d083e83
-R 75a13812cd02d645a4e2c62d598f937c
-U mistachkin
-Z 17af9fcca0ae08ed5daad968a9e3388d
+P d582cd890d88e873d76a23545bcd49cf093ee9d2
+R dfda5074dc19f89fe8c778d461e17987
+U drh
+Z 78ad216a54a8d01eec70f561ea3dc528
diff --git a/manifest.uuid b/manifest.uuid
index d8da19bf2a..4108c28d85 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d582cd890d88e873d76a23545bcd49cf093ee9d2
\ No newline at end of file
+d8da26f1f43610ac83af2a5d0e170be5abaf7aaa
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index 1d424caf1e..491356acbb 100644
--- a/src/select.c
+++ b/src/select.c
@@ -3726,7 +3726,7 @@ static void explainSimpleCount(
 **
 **     SRT_Set         The result must be a single column.  Store each
 **                     row of result as the key in table pDest->iSDParm. 
-**                     Apply the affinity pDest->affinity before storing
+**                     Apply the affinity pDest->affSdst before storing
 **                     results.  Used to implement "IN (SELECT ...)".
 **
 **     SRT_Union       Store results as a key in a temporary table 
diff --git a/src/vdbeInt.h b/src/vdbeInt.h
index 9c1af35c33..1f5694a595 100644
--- a/src/vdbeInt.h
+++ b/src/vdbeInt.h
@@ -431,11 +431,11 @@ int sqlite3VdbeTransferError(Vdbe *p);
 #else
 int sqlite3VdbeSorterInit(sqlite3 *, VdbeCursor *);
 void sqlite3VdbeSorterClose(sqlite3 *, VdbeCursor *);
-int sqlite3VdbeSorterRowkey(VdbeCursor *, Mem *);
-int sqlite3VdbeSorterNext(sqlite3 *, VdbeCursor *, int *);
-int sqlite3VdbeSorterRewind(sqlite3 *, VdbeCursor *, int *);
-int sqlite3VdbeSorterWrite(sqlite3 *, VdbeCursor *, Mem *);
-int sqlite3VdbeSorterCompare(VdbeCursor *, Mem *, int *);
+int sqlite3VdbeSorterRowkey(const VdbeCursor *, Mem *);
+int sqlite3VdbeSorterNext(sqlite3 *, const VdbeCursor *, int *);
+int sqlite3VdbeSorterRewind(sqlite3 *, const VdbeCursor *, int *);
+int sqlite3VdbeSorterWrite(sqlite3 *, const VdbeCursor *, Mem *);
+int sqlite3VdbeSorterCompare(const VdbeCursor *, Mem *, int *);
 #endif
 
 #if !defined(SQLITE_OMIT_SHARED_CACHE) && SQLITE_THREADSAFE>0
diff --git a/src/vdbesort.c b/src/vdbesort.c
index afea1f510a..5faeca8dc7 100644
--- a/src/vdbesort.c
+++ b/src/vdbesort.c
@@ -259,7 +259,7 @@ static int vdbeSorterReadVarint(
 */
 static int vdbeSorterIterInit(
   sqlite3 *db,                    /* Database handle */
-  VdbeSorter *pSorter,            /* Sorter object */
+  const VdbeSorter *pSorter,      /* Sorter object */
   i64 iStart,                     /* Start offset in pFile */
   VdbeSorterIter *pIter,          /* Iterator to populate */
   i64 *pnByte                     /* IN/OUT: Increment this value by PMA size */
@@ -303,10 +303,10 @@ static int vdbeSorterIterInit(
 ** has been allocated and contains an unpacked record that is used as key2.
 */
 static void vdbeSorterCompare(
-  VdbeCursor *pCsr,               /* Cursor object (for pKeyInfo) */
+  const VdbeCursor *pCsr,         /* Cursor object (for pKeyInfo) */
   int bOmitRowid,                 /* Ignore rowid field at end of keys */
-  void *pKey1, int nKey1,         /* Left side of comparison */
-  void *pKey2, int nKey2,         /* Right side of comparison */
+  const void *pKey1, int nKey1,   /* Left side of comparison */
+  const void *pKey2, int nKey2,   /* Right side of comparison */
   int *pRes                       /* OUT: Result of comparison */
 ){
   KeyInfo *pKeyInfo = pCsr->pKeyInfo;
@@ -338,7 +338,7 @@ static void vdbeSorterCompare(
 ** multiple b-tree segments. Parameter iOut is the index of the aTree[] 
 ** value to recalculate.
 */
-static int vdbeSorterDoCompare(VdbeCursor *pCsr, int iOut){
+static int vdbeSorterDoCompare(const VdbeCursor *pCsr, int iOut){
   VdbeSorter *pSorter = pCsr->pSorter;
   int i1;
   int i2;
@@ -464,7 +464,7 @@ static int vdbeSorterOpenTempFile(sqlite3 *db, sqlite3_file **ppFile){
 ** Set *ppOut to the head of the new list.
 */
 static void vdbeSorterMerge(
-  VdbeCursor *pCsr,               /* For pKeyInfo */
+  const VdbeCursor *pCsr,         /* For pKeyInfo */
   SorterRecord *p1,               /* First list to merge */
   SorterRecord *p2,               /* Second list to merge */
   SorterRecord **ppOut            /* OUT: Head of merged list */
@@ -498,7 +498,7 @@ static void vdbeSorterMerge(
 ** if successful, or an SQLite error code (i.e. SQLITE_NOMEM) if an error
 ** occurs.
 */
-static int vdbeSorterSort(VdbeCursor *pCsr){
+static int vdbeSorterSort(const VdbeCursor *pCsr){
   int i;
   SorterRecord **aSlot;
   SorterRecord *p;
@@ -545,7 +545,7 @@ static int vdbeSorterSort(VdbeCursor *pCsr){
 **       Each record consists of a varint followed by a blob of data (the 
 **       key). The varint is the number of bytes in the blob of data.
 */
-static int vdbeSorterListToPMA(sqlite3 *db, VdbeCursor *pCsr){
+static int vdbeSorterListToPMA(sqlite3 *db, const VdbeCursor *pCsr){
   int rc = SQLITE_OK;             /* Return code */
   VdbeSorter *pSorter = pCsr->pSorter;
 
@@ -608,7 +608,7 @@ static int vdbeSorterListToPMA(sqlite3 *db, VdbeCursor *pCsr){
 */
 int sqlite3VdbeSorterWrite(
   sqlite3 *db,                    /* Database handle */
-  VdbeCursor *pCsr,               /* Sorter cursor */
+  const VdbeCursor *pCsr,               /* Sorter cursor */
   Mem *pVal                       /* Memory cell containing record */
 ){
   VdbeSorter *pSorter = pCsr->pSorter;
@@ -654,7 +654,7 @@ int sqlite3VdbeSorterWrite(
 */
 static int vdbeSorterInitMerge(
   sqlite3 *db,                    /* Database handle */
-  VdbeCursor *pCsr,               /* Cursor handle for this sorter */
+  const VdbeCursor *pCsr,         /* Cursor handle for this sorter */
   i64 *pnByte                     /* Sum of bytes in all opened PMAs */
 ){
   VdbeSorter *pSorter = pCsr->pSorter;
@@ -684,7 +684,7 @@ static int vdbeSorterInitMerge(
 ** Once the sorter has been populated, this function is called to prepare
 ** for iterating through its contents in sorted order.
 */
-int sqlite3VdbeSorterRewind(sqlite3 *db, VdbeCursor *pCsr, int *pbEof){
+int sqlite3VdbeSorterRewind(sqlite3 *db, const VdbeCursor *pCsr, int *pbEof){
   VdbeSorter *pSorter = pCsr->pSorter;
   int rc;                         /* Return code */
   sqlite3_file *pTemp2 = 0;       /* Second temp file to use */
@@ -792,7 +792,7 @@ int sqlite3VdbeSorterRewind(sqlite3 *db, VdbeCursor *pCsr, int *pbEof){
 /*
 ** Advance to the next element in the sorter.
 */
-int sqlite3VdbeSorterNext(sqlite3 *db, VdbeCursor *pCsr, int *pbEof){
+int sqlite3VdbeSorterNext(sqlite3 *db, const VdbeCursor *pCsr, int *pbEof){
   VdbeSorter *pSorter = pCsr->pSorter;
   int rc;                         /* Return code */
 
@@ -822,7 +822,7 @@ int sqlite3VdbeSorterNext(sqlite3 *db, VdbeCursor *pCsr, int *pbEof){
 ** current key.
 */
 static void *vdbeSorterRowkey(
-  VdbeSorter *pSorter,            /* Sorter object */
+  const VdbeSorter *pSorter,      /* Sorter object */
   int *pnKey                      /* OUT: Size of current key in bytes */
 ){
   void *pKey;
@@ -841,7 +841,7 @@ static void *vdbeSorterRowkey(
 /*
 ** Copy the current sorter key into the memory cell pOut.
 */
-int sqlite3VdbeSorterRowkey(VdbeCursor *pCsr, Mem *pOut){
+int sqlite3VdbeSorterRowkey(const VdbeCursor *pCsr, Mem *pOut){
   VdbeSorter *pSorter = pCsr->pSorter;
   void *pKey; int nKey;           /* Sorter key to copy into pOut */
 
@@ -867,7 +867,7 @@ int sqlite3VdbeSorterRowkey(VdbeCursor *pCsr, Mem *pOut){
 ** key.
 */
 int sqlite3VdbeSorterCompare(
-  VdbeCursor *pCsr,               /* Sorter cursor */
+  const VdbeCursor *pCsr,         /* Sorter cursor */
   Mem *pVal,                      /* Value to compare to current sorter key */
   int *pRes                       /* OUT: Result of comparison */
 ){

From 9d0c0ea6012c4da933831894cb8c8ae32c92a1b1 Mon Sep 17 00:00:00 2001
From: dan <dan@noemail.net>
Date: Thu, 26 Jul 2012 09:21:14 +0000
Subject: [PATCH 06/36] Update some comments in vdbesort.c.

FossilOrigin-Name: f4b3fded231231ef15bde98d2a996b4e16415d4c
---
 manifest       | 12 ++++++------
 manifest.uuid  |  2 +-
 src/vdbesort.c | 39 ++++++++++++++++++++++++++++-----------
 3 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/manifest b/manifest
index 8ee9b917a6..c3c728bb31 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sedge\scase\sin\svdbesort.c.
-D 2012-07-23T20:10:35.296
+C Update\ssome\scomments\sin\svdbesort.c.
+D 2012-07-26T09:21:14.241
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 8f6d858bf3df9978ba43df19985146a1173025e4
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -244,7 +244,7 @@ F src/vdbeapi.c 88ea823bbcb4320f5a6607f39cd7c2d3cc4c26b1
 F src/vdbeaux.c dce80038c3c41f2680e5ab4dd0f7e0d8b7ff9071
 F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
 F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
-F src/vdbesort.c bd37dbd4a023f75e9cd1eec18e171aa6f2552d20
+F src/vdbesort.c 106796cedf32a8209e92f28560d0523193c19a9a
 F src/vdbetrace.c 79059ebd17b3c8545fab2a24253713e77e4ab392
 F src/vtab.c bb8ea3a26608bb1357538a5d2fc72beba6638998
 F src/wal.c 9294df6f96aae5909ae1a9b733fd1e1b4736978b
@@ -1005,7 +1005,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 55e47ef338c42f95f0f071d6ec92cd2480f9f1fe
-R c1d0187a30b4d8ec69c9c7f13c2ce356
+P 4ba266fc534f390267180eca8d68b8d5f0b7f832
+R e276763c29e00cdde695ab89ab0038a7
 U dan
-Z 60c5c030c4ed6dd425cd291cf7eefd27
+Z 42e5e7096761a49ccf3e633dc0ad5716
diff --git a/manifest.uuid b/manifest.uuid
index 239b7c9706..528757c4ac 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4ba266fc534f390267180eca8d68b8d5f0b7f832
\ No newline at end of file
+f4b3fded231231ef15bde98d2a996b4e16415d4c
\ No newline at end of file
diff --git a/src/vdbesort.c b/src/vdbesort.c
index 7778196f1c..c00e9a2f1a 100644
--- a/src/vdbesort.c
+++ b/src/vdbesort.c
@@ -180,51 +180,68 @@ static int vdbeSorterIterRead(
   int nByte,                      /* Bytes of data to read */
   u8 **ppOut                      /* OUT: Pointer to buffer containing data */
 ){
-  int iBuf;
-  int nAvail;
+  int iBuf;                       /* Offset within buffer to read from */
+  int nAvail;                     /* Bytes of data available in buffer */
   assert( p->aBuffer );
 
+  /* If there is no more data to be read from the buffer, read the next 
+  ** p->nBuffer bytes of data from the file into it. Or, if there are less
+  ** than p->nBuffer bytes remaining in the PMA, read all remaining data.  */
   iBuf = p->iReadOff % p->nBuffer;
   if( iBuf==0 ){
-    int nRead;
-    int rc;
+    int nRead;                    /* Bytes to read from disk */
+    int rc;                       /* sqlite3OsRead() return code */
 
+    /* Determine how many bytes of data to read. */
     nRead = p->iEof - p->iReadOff;
     if( nRead>p->nBuffer ) nRead = p->nBuffer;
     assert( nRead>0 );
+
+    /* Read data from the file. Return early if an error occurs. */
     rc = sqlite3OsRead(p->pFile, p->aBuffer, nRead, p->iReadOff);
     assert( rc!=SQLITE_IOERR_SHORT_READ );
     if( rc!=SQLITE_OK ) return rc;
   }
-  nAvail = p->nBuffer - iBuf;
+  nAvail = p->nBuffer - iBuf; 
 
   if( nByte<=nAvail ){
+    /* The requested data is available in the in-memory buffer. In this
+    ** case there is no need to make a copy of the data, just return a 
+    ** pointer into the buffer to the caller.  */
     *ppOut = &p->aBuffer[iBuf];
     p->iReadOff += nByte;
   }else{
-    int nRem;
+    /* The requested data is not all available in the in-memory buffer.
+    ** In this case, allocate space at p->aAlloc[] to copy the requested
+    ** range into. Then return a copy of pointer p->aAlloc to the caller.  */
+    int nRem;                     /* Bytes remaining to copy */
+
+    /* Extend the p->aAlloc[] allocation if required. */
     if( p->nAlloc<nByte ){
       int nNew = p->nAlloc*2;
       while( nByte>nNew ) nNew = nNew*2;
-
       p->aAlloc = sqlite3DbReallocOrFree(db, p->aAlloc, nNew);
       if( !p->aAlloc ) return SQLITE_NOMEM;
     }
 
+    /* Copy as much data as is available in the buffer into the start of
+    ** p->aAlloc[].  */
     memcpy(p->aAlloc, &p->aBuffer[iBuf], nAvail);
     p->iReadOff += nAvail;
     nRem = nByte - nAvail;
+
+    /* The following loop copies up to p->nBuffer bytes per iteration into
+    ** the p->aAlloc[] buffer.  */
     while( nRem>0 ){
-      int rc;
-      int nCopy;
-      u8 *aNext;
+      int rc;                     /* vdbeSorterIterRead() return code */
+      int nCopy;                  /* Number of bytes to copy */
+      u8 *aNext;                  /* Pointer to buffer to copy data from */
 
       nCopy = nRem;
       if( nRem>p->nBuffer ) nCopy = p->nBuffer;
       rc = vdbeSorterIterRead(db, p, nCopy, &aNext);
       if( rc!=SQLITE_OK ) return rc;
       assert( aNext!=p->aAlloc );
-
       memcpy(&p->aAlloc[nByte - nRem], aNext, nCopy);
       nRem -= nCopy;
     }

From 486801909ca1b4d8b3c2f69a206ca385e2966a74 Mon Sep 17 00:00:00 2001
From: mistachkin <mistachkin@noemail.net>
Date: Fri, 27 Jul 2012 02:36:06 +0000
Subject: [PATCH 07/36] Add tool to generate a VSIX package usable by Visual
 Studio 2012 RC.

FossilOrigin-Name: 8b90e0c4dbcedaf3e61c5d49452997705be1ef98
---
 manifest             |  14 +-
 manifest.uuid        |   2 +-
 tool/mkvsix.tcl      | 365 +++++++++++++++++++++++++++++++++++++++++++
 tool/win/sqlite.vsix | Bin 0 -> 34247 bytes
 4 files changed, 374 insertions(+), 7 deletions(-)
 create mode 100644 tool/mkvsix.tcl
 create mode 100644 tool/win/sqlite.vsix

diff --git a/manifest b/manifest
index 7c1d8a6053..3444e28ebb 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Mark\sparameters\sto\ssorter\sinterfaces\sas\sconst\swhere\sappropriate.
-D 2012-07-24T19:46:38.570
+C Add\stool\sto\sgenerate\sa\sVSIX\spackage\susable\sby\sVisual\sStudio\s2012\sRC.
+D 2012-07-27T02:36:06.349
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 8f6d858bf3df9978ba43df19985146a1173025e4
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -982,6 +982,7 @@ F tool/mksqlite3c-noext.tcl 8bce31074e4cbe631bb7676526a048335f4c9f02
 F tool/mksqlite3c.tcl 589c7f44e990be1b8443cfe4808dce392b0327fa
 F tool/mksqlite3h.tcl 78013ad79a5e492e5f764f3c7a8ef834255061f8
 F tool/mksqlite3internalh.tcl 3dca7bb5374cee003379b8cbac73714f610ef795
+F tool/mkvsix.tcl 75fb1b601d69ead76340fa15bf9813874fed240b
 F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
 F tool/omittest.tcl 4665982e95a6e5c1bd806cf7bc3dea95be422d77
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@ -1005,7 +1006,8 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P d582cd890d88e873d76a23545bcd49cf093ee9d2
-R dfda5074dc19f89fe8c778d461e17987
-U drh
-Z 78ad216a54a8d01eec70f561ea3dc528
+F tool/win/sqlite.vsix 84163b633f01f35cb47495c05dd2b640159677ff
+P d8da26f1f43610ac83af2a5d0e170be5abaf7aaa
+R e89b8d51f4ab3734c03bdfc7ca67399b
+U mistachkin
+Z ca7c7ef3778a69af10a33d78de2dc884
diff --git a/manifest.uuid b/manifest.uuid
index 4108c28d85..364fa66bed 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d8da26f1f43610ac83af2a5d0e170be5abaf7aaa
\ No newline at end of file
+8b90e0c4dbcedaf3e61c5d49452997705be1ef98
\ No newline at end of file
diff --git a/tool/mkvsix.tcl b/tool/mkvsix.tcl
new file mode 100644
index 0000000000..a5a569d475
--- /dev/null
+++ b/tool/mkvsix.tcl
@@ -0,0 +1,365 @@
+#!/usr/bin/tclsh
+#
+# This script is used to generate a VSIX (Visual Studio Extension) file for
+# SQLite usable by Visual Studio.
+
+proc fail { {error ""} {usage false} } {
+  if {[string length $error] > 0} then {
+    puts stdout $error
+    if {!$usage} then {exit 1}
+  }
+
+  puts stdout "usage:\
+[file tail [info nameofexecutable]]\
+[file tail [info script]] <binaryDirectory> \[sourceDirectory\]"
+
+  exit 1
+}
+
+proc getEnvironmentVariable { name } {
+  #
+  # NOTE: Returns the value of the specified environment variable or an empty
+  #       string for environment variables that do not exist in the current
+  #       process environment.
+  #
+  return [expr {[info exists ::env($name)] ? $::env($name) : ""}]
+}
+
+proc getTemporaryPath {} {
+  #
+  # NOTE: Returns the normalized path to the first temporary directory found
+  #       in the typical set of environment variables used for that purpose
+  #       or an empty string to signal a failure to locate such a directory.
+  #
+  set names [list]
+
+  foreach name [list TEMP TMP] {
+    lappend names [string toupper $name] [string tolower $name] \
+        [string totitle $name]
+  }
+
+  foreach name $names {
+    set value [getEnvironmentVariable $name]
+
+    if {[string length $value] > 0} then {
+      return [file normalize $value]
+    }
+  }
+
+  return ""
+}
+
+proc appendArgs { args } {
+  #
+  # NOTE: Returns all passed arguments joined together as a single string with
+  #       no intervening spaces between arguments.
+  #
+  eval append result $args
+}
+
+proc readFile { fileName } {
+  #
+  # NOTE: Reads and returns the entire contents of the specified file, which
+  #       may contain binary data.
+  #
+  set file_id [open $fileName RDONLY]
+  fconfigure $file_id -encoding binary -translation binary
+  set result [read $file_id]
+  close $file_id
+  return $result
+}
+
+proc writeFile { fileName data } {
+  #
+  # NOTE: Writes the entire contents of the specified file, which may contain
+  #       binary data.
+  #
+  set file_id [open $fileName {WRONLY CREAT TRUNC}]
+  fconfigure $file_id -encoding binary -translation binary
+  puts -nonewline $file_id $data
+  close $file_id
+  return ""
+}
+
+proc substFile { fileName } {
+  #
+  # NOTE: Performs all Tcl command, variable, and backslash substitutions in
+  #       the specified file and then re-writes the contents of that same file
+  #       with the substituted data.
+  #
+  return [writeFile $fileName [uplevel 1 [list subst [readFile $fileName]]]]
+}
+
+proc replacePlatform { fileName platformName } {
+  #
+  # NOTE: Returns the specified file name containing the platform name instead
+  #       of platform placeholder tokens.
+  #
+  return [string map [list <platform> $platformName] $fileName]
+}
+
+set script [file normalize [info script]]
+
+if {[string length $script] == 0} then {
+  fail "script file currently being evaluated is unknown" true
+}
+
+set path [file dirname $script]
+set rootName [file rootname [file tail $script]]
+
+###############################################################################
+
+#
+# NOTE: Process and verify all the command line arguments.
+#
+set argc [llength $argv]
+if {$argc != 1 && $argc != 2} then {fail}
+
+set binaryDirectory [lindex $argv 0]
+
+if {[string length $binaryDirectory] == 0} then {
+  fail "invalid binary directory"
+}
+
+if {![file exists $binaryDirectory] || \
+    ![file isdirectory $binaryDirectory]} then {
+  fail "binary directory does not exist"
+}
+
+if {$argc == 2} then {
+  set sourceDirectory [lindex $argv 1]
+} else {
+  #
+  # NOTE: Assume that the source directory is the parent directory of the one
+  #       that contains this script file.
+  #
+  set sourceDirectory [file dirname $path]
+}
+
+if {[string length $sourceDirectory] == 0} then {
+  fail "invalid source directory"
+}
+
+if {![file exists $sourceDirectory] || \
+    ![file isdirectory $sourceDirectory]} then {
+  fail "source directory does not exist"
+}
+
+###############################################################################
+
+set templateFile [file join $path win sqlite.vsix]
+
+if {![file exists $templateFile] || \
+    ![file isfile $templateFile]} then {
+  fail [appendArgs "template file \"" $templateFile "\" does not exist"]
+}
+
+set currentDirectory [pwd]
+set outputFile [file join $currentDirectory sqlite-output.vsix]
+
+if {[file exists $outputFile]} then {
+  fail [appendArgs "output file \"" $outputFile "\" already exists"]
+}
+
+###############################################################################
+
+#
+# NOTE: Make sure that a valid temporary directory exists.
+#
+set temporaryDirectory [getTemporaryPath]
+
+if {[string length $temporaryDirectory] == 0 || \
+    ![file exists $temporaryDirectory] || \
+    ![file isdirectory $temporaryDirectory]} then {
+  fail "cannot locate a usable temporary directory"
+}
+
+#
+# NOTE: Setup the staging directory to have a unique name inside of the
+#       configured temporary directory.
+#
+set stagingDirectory [file normalize [file join $temporaryDirectory \
+    [appendArgs $rootName . [pid]]]]
+
+###############################################################################
+
+#
+# NOTE: Configure the external zipping tool.  First, see if it has already
+#       been pre-configured.  If not, try to query it from the environment.
+#       Finally, fallback on the default of simply "zip", which will then
+#       be assumed to exist somewhere along the PATH.
+#
+if {![info exists zip]} then {
+  if {[info exists env(ZipTool)]} then {
+    set zip $env(ZipTool)
+  }
+  if {![info exists zip] || ![file exists $zip]} then {
+    set zip zip
+  }
+}
+
+#
+# NOTE: Configure the external unzipping tool.  First, see if it has already
+#       been pre-configured.  If not, try to query it from the environment.
+#       Finally, fallback on the default of simply "unzip", which will then
+#       be assumed to exist somewhere along the PATH.
+#
+if {![info exists unzip]} then {
+  if {[info exists env(UnZipTool)]} then {
+    set unzip $env(UnZipTool)
+  }
+  if {![info exists unzip] || ![file exists $unzip]} then {
+    set unzip unzip
+  }
+}
+
+###############################################################################
+
+#
+# NOTE: Attempt to extract the SQLite version from the "sqlite3.h" header file
+#       in the source directory.  This script assumes that the header file has
+#       already been generated by the build process.
+#
+set pattern {^#define\s+?SQLITE_VERSION\s+?"(.*?)"$}
+set data [readFile [file join $sourceDirectory sqlite3.h]]
+
+if {![regexp -line -- $pattern $data dummy version]} then {
+  fail [appendArgs "cannot locate SQLITE_VERSION value in \"" \
+      [file join $sourceDirectory sqlite3.h] \"]
+}
+
+###############################################################################
+
+#
+# NOTE: Setup the master file list data, including the necessary flags.
+#
+set fileNames(source) [list "" "" "" \
+    [file join $sourceDirectory sqlite3.h] \
+    [file join $binaryDirectory <platform> sqlite3.lib] \
+    [file join $binaryDirectory <platform> sqlite3.dll]]
+
+set fileNames(destination) [list \
+    [file join $stagingDirectory extension.vsixmanifest] \
+    [file join $stagingDirectory SDKManifest.xml] \
+    [file join $stagingDirectory DesignTime CommonConfiguration \
+        <platform> SQLite.WinRT.props] \
+    [file join $stagingDirectory DesignTime CommonConfiguration \
+        <platform> sqlite3.h] \
+    [file join $stagingDirectory DesignTime CommonConfiguration \
+        <platform> sqlite3.lib] \
+    [file join $stagingDirectory Redist CommonConfiguration \
+        <platform> sqlite3.dll]]
+
+set fileNames(neutral) [list 1 1 1 1 0 0]
+set fileNames(subst) [list 1 1 1 0 0 0]
+
+###############################################################################
+
+#
+# NOTE: Setup the list of platforms supported by this script.
+#
+set platformNames [list ARM x64 x86]
+
+###############################################################################
+
+#
+# NOTE: Make sure the staging directory exists, creating it if necessary.
+#
+file mkdir $stagingDirectory
+
+#
+# NOTE: Build the Tcl command used to extract the template package to the
+#       staging directory.
+#
+set extractCommand [list exec -- $unzip $templateFile -d $stagingDirectory]
+
+#
+# NOTE: Extract the template package to the staging directory.
+#
+eval $extractCommand
+
+###############################################################################
+
+#
+# NOTE: Process each file in the master file list.  There are actually four
+#       parallel lists that contain the source file names, destination file
+#       names, the platform-neutral flags, and the use-subst flags.  When the
+#       platform-neutral flag is non-zero, the file is not platform-specific.
+#       When the use-subst flag is non-zero, the file is considered to be a
+#       text file that may contain Tcl variable and/or command replacements,
+#       to be dynamically replaced during processing.  If the source file name
+#       is an empty string, then the destination file name will be assumed to
+#       already exist in the staging directory and will not be copied; however,
+#       dynamic replacements may still be performed on the destination file
+#       prior to the package being re-zipped.
+#
+foreach sourceFileName $fileNames(source) \
+    destinationFileName $fileNames(destination) \
+    isNeutral $fileNames(neutral) useSubst $fileNames(subst) {
+  #
+  # NOTE: If the current file is platform-neutral, then only one platform will
+  #       be processed for it, namely "neutral"; otherwise, each supported
+  #       platform will be processed for it individually.
+  #
+  foreach platformName [expr {$isNeutral ? [list neutral] : $platformNames}] {
+    #
+    # NOTE: Does the source file need to be copied to the destination file?
+    #
+    if {[string length $sourceFileName] > 0} then {
+      #
+      # NOTE: Copy the source file to the destination file verbatim.
+      #
+      file copy [replacePlatform $sourceFileName $platformName] \
+          [replacePlatform $destinationFileName $platformName]
+    }
+
+    #
+    # NOTE: Does the destination file contain dynamic replacements that must
+    #       be processed now?
+    #
+    if {$useSubst} then {
+      #
+      # NOTE: Perform any dynamic replacements contained in the destination
+      #       file and then re-write it in-place.
+      #
+      substFile [replacePlatform $destinationFileName $platformName]
+    }
+  }
+}
+
+###############################################################################
+
+#
+# NOTE: Change the current directory to the staging directory so that the
+#       external archive building tool can pickup the necessary files using
+#       relative paths.
+#
+cd $stagingDirectory
+
+#
+# NOTE: Build the Tcl command used to archive the final package in the
+#       output directory.
+#
+set archiveCommand [list exec -- $zip -r $outputFile *]
+
+#
+# NOTE: Build the final package archive in the output directory.
+#
+eval $archiveCommand
+
+#
+# NOTE: Change back to the previously saved current directory.
+#
+cd $currentDirectory
+
+#
+# NOTE: Cleanup the temporary staging directory.
+#
+file delete -force $stagingDirectory
+
+###############################################################################
+
+#
+# NOTE: Success, emit the fully qualified path of the generated VSIX file.
+#
+puts stdout $outputFile
diff --git a/tool/win/sqlite.vsix b/tool/win/sqlite.vsix
new file mode 100644
index 0000000000000000000000000000000000000000..16f7b57cd03cf43fd1c77761a25b98929305eb39
GIT binary patch
literal 34247
zcmbTdV~{7o_vZU;+cu_c+qN}r+qUhV?w+=7+qP}ncK4m%|K7NZ7rPr<Q71EBoO~)O
z>k}Duo{CbC1_6Zz{O91&eHHkx!T;C5{Od(boGi?2RV-{w=oS9|M2`O{k>Gz!6t=Um
zv9lGnvo*Cab8$3qwy?AP?<OP3{f}4q^}nAis3iNp5Fr2G3)q^tI6E3x|Cb2rzjR0d
zbLzW5xyxsOIS>GF4GaKq{-28|E6P|no6xCS*ea>e**n_VJ9Yh$mG2io480-y4lAAm
zMZU_{4o3~ovkVU=jCW6)n3pp!;Xl7dCmQ~_ZvLAj(&?G8mX`IB7H40JvbmAZCNq}p
zhtlYcU{Z-prq0XXa^^BZ@HjKmU#4b<sWnq1z3{NIZ0Z)A>K+rAE>NpMU7&<BC>0Od
zGO8My4%sk?B|mCYvGlBiHRBW#8NS7Dk!*I9=!H9$dIBX^rt`9we^*-8i%`V=aOzQ<
zWCIKe)Z2{G2*7tmHwm~11lRv&GDQzkCo_ZbkD4h@q4$S`(;5Rqfn-n-qTp0vGO5s3
zzF-27rE1A~tWe?uu?RaJ;z5pBmz8b*Fy|?!J6b9i4F#T~t(yXA)v44bs}C$QXV)Ov
z49X0j`R@CFj8LfS#vuRc>HegN`P|mzsHY&7Nizns!YU0TWiQh4e34WtR=_t1Wpa2K
znthz&cB8rSZ!meOci<Xpa^tdBAWl{>$Oea&bZMXd2LEpa{$D`k&c^b;faw2#LU#_f
z{|=z^e*m?+bk9lsgC_?R06_l-kcqpqiLKK=-057MEZl7jY%NSpoSa=$`fN8CV7m}j
z`4NX>%a)#5VCDRQ@gntQ6Ijn&DIx>vEW|5lJdjbyah`7q3OL5vpA4h+e-V)0Q)U=`
zN2AHkp8o+Jz_=IW=9ZybczEOqkhQVKB$GZq4pJi0Q;H#~a=F&ACoO5KP!+UdswS#g
zHgG~`Jiq_kC&udX0g0CluM-%~B7JTpoJenBpbH(le5f*&>aq0VmydnC@vS<zcLQ!Q
zuSiDalo`$DokUKpMi&bsedEKeHiBv*3FS1%@;_gzb}@&wy{Rpp!`I<L;O>{naz_9{
zb*#ZbzvmNx5ICLQ$R}s;+?%rtNEyw&7*-hR2#TkiaWunfDl#N&PBFrSHURLCbxf<D
zTOQR-@ByC9L5{Nmz=L7iy)^X+3AH3+Rj7FWE~vW;Pp+#mi_NHPRyqq7_=K%D%MKtc
z=#)JqQ)%PRldg~{|A6DkdCP|eKTI=*s3X5YGFB_a?PN9IVq!b=*U888^|h4nu2~Fc
zo9y$%*qrGajH)1<g4nvqvCWPS`i<jEFZw<(NVjQ6{gq!|rBcpX>nP4%PG5JREnv3H
zM^Y@w#^)WOiZ<i~iT}y93rVeN)-C0h$TW9hn%6;MW58~(qSD5CAoRhQtJPBkZrEgH
zYG)s&ofQ%7giI@_33szh#SMOP7;u!ko37?3MI=)0o48z76ezj|C3MnmW$O&a4Q}+^
z8FN?Tar^b%vgx|<qnf!+@X$Ek>VgLB&>6BF_|}}aBAr7_9~MFL!A_RUek9=_ky?gf
zmvH$7^dJ6F0l@#ZFJqlo0Y~M4dJF^r0Qp}){-e*r=pT6Ywq`)c2v@fe3UcCb(AfXk
z*x@84M3nyZg#QUh@PDn7r{^O804;AJEUchlZs%<0WNv3qC@CyVsNiU4YGG{x0JyJb
zDVwP%pP}=<Y(EM~hx;c<+bN+z5-JHr`J*O~Q4v8QN`({Ut)VIQA&H8D;*92ogT%)A
zN24jyz(zu^LL3t1#|9OIM~;8&c@<bKcfK4?eK)P}om4(#HOxTtLc;!)U{+-Hhb<Gr
zN7@Y<864g_q!S2$Cb0(~LN*u^Ieq;C0=)Y2@K6)?LUaRw+!tUV0ll&ry$rZvKM3bS
zY1%;k!9cyv2^`Xp{-^)}&sd>ifPff~e^x4)G9VWepg&<`cmPnK1?ZFe9WMa<vtHA@
zfB;%aL});{2>?PAlW-A$IX9qkMlDhlpuqq@HI*LZ1gz2m7$ntAB>=T8fZl0Dn0f#t
zEPz2VJcJSe>IKjr{q@To5S#`;6}wmGxudQ|JfZrxQfc)(Z6utc0a}o>4iM_<bodn0
zk{HyeYzDvv=>l~99%)!i0W1i+50d~uZUWlByM6d_pN6lVo@R?}hS#G#?*acIHZ(l=
zKANep7XSeEoPFoMY3LiU{kg&YZNBqKuR+aqVRBtwqD<=%1eyT3XY1+@_WxNM(Y*M!
zwY8(e!&Rw4AuWS(b)Rpue!X7xFY7m7p3j%3-R^yo04ALPanRS@{>ev~BHWojP{D?q
z$8qAHEigZycnidXl7?*>RHz4v$PTe0>Cq2NMZ^(8e<+7Y=YNd%cW6F9_;y$UwU&H9
zUJ10NIz}MR(&UI5&b|9D0Kk2RUEd-FB#6Ix(B6#O&kg^VcrGcx-&FFC0|1~aLPDo9
z-oQWd4@{BV0IFI+oX0*)nqF|+KCsO`m`{DSU?Gyhej!95Xk&j|M}5l5Kp~3IsaiZL
zefmWKJeFQX^Uy?lc)EVoR(M`}gm(kT>^_Rl04PwwQAiX6qV;ef!$^%^v5**PA+JPz
z5}?RYB!pw(sEWkW39J%~N|7prsuFnjypF(}VcKHt3EZOqrohk8PI1PhfO<vVMc5|c
zwo-QNV6l9dSz~9$^f>g~j9JG<Y~E<Lyp!1qbA<IcKH(9D-cw8n=0R%)y5Rw#Iu07B
zM5Bp1;!4<xVeDG9N|26-C!?7<H&EmN(OxJvP&Xk$1AIXV4H*r&Rf$qUToM+fbtrZy
zkYL4ra^l2N=|-}4q_;s#Lng*B4GEfG%gAvk^oU;J!h`H2$PvO!<Zbc5l68eD^T_jJ
z^R`OA&S=UqSR}B2C628dTh&8wCeaX5kA@s(9S$5aAL1Mm-D^Q-845TQzAEoiD2-c6
zVI3hJu^fS$q%sMr7Njd}mFB4+vBqf%Rpm7+)hLFQqOiE6b4~@JOG+12<tHy-n`4;2
zSk#<4w<B#O<IAPYs?SfHiJzvNf;_sx!iAy*jf9&~U}a!JV47jMVb-L|6k{z!VU4IT
zurpqyo}?k9*{Nz!HB)(`C5%HSOC^&f<51D7l$95kZ<oWUKB!Kp#FgnP`&5gmGAkdH
zK`s8RP%Y0=xKPGXHY?*U4J$V*wNv3Q^!@!60sebHW<XxJP%*bo@1S#-5XK0r!JUT4
z3a%p5C4hC1tZr(}+m)&#^$V{finqKhk5iagidnru=^@FKAL1a@;Wg7)4(f!WB;~<3
zavSxAa-R~Xm_??I(L~#-{BO!%jS7hh#R~C@F1G5clC0t`(T?9A0q}w&Qsmm?;%0Hv
zU|A>1Ysy<C&?V@yyj)M!bmdk>IC&i+Zauao*Qwdvy8hWRb|u>$T_^9jKJ;HIUpDV0
zPvWo|;0>@O;2W^hm^?$Q4t6|v^dlR0io!Yr0>VWG$p$HV!3k}1JOxW)F=7bO7Q@;H
zBnLLbHp2yE;ABK((z55W*Xc^KZN-$u+%nuUBU6)8`BTejtQowFD@-RDCmAalJ1zQ}
z?wT~srOmA-lJ$q0#lNqcJ8eTWIe!;vsA}poh*f1(kuG;sb(A2Lw8<sPRb(%l4b<K>
zk2ROIVAUS2f^Sqe+cf(am>FW2wG34cTqkxV`n3DReDOlSg{{F?;A!IdIyE|?a;b4`
zr%z{I^ZN`v{yn2N)0jb=S!F(GMwy@-w8&D<SP(bEFl%!PdI*n-kPe)nOW~u-z!}~e
z?K+flesa*+^PGRm%4o>wzbf6Rxn{ezxDMOQnPkbK%>K>nG&?XVysLOL#}AW}%wV-s
z=_@ZRA7IvW@{8VxK0&=|rM9KWt^CE{27~XJ&oSqK?|_GWn`!&E-Xwc(%V^7l{D57y
zUdWEH->)CzAJ3mTK#4yokQqosfM9?Y@W-pCH&IV4Ki7uIbN$+tV03PqAevxYU{&Bz
zUlo!0=w*Br(aTBdbi%X+e29YY>GCXu!LdQqfG;e0NLYw^D1WSdxCZtdV+yO=+@`S8
zj>x;nUy<z$Ge&vN8d@n<D!y_$OP+Q1c9wSjVLH>_lS>*|8j{x1xSVuU)oixb-8-LG
z4`KUR`!EMy7^(E5I`$rU)BTSjCFo^z$TVDk1!ThIIFfD!5vfYiqe<^k+(=`gJ^Jzb
z&4}se*yh4lg|(^h<?bb@WIg{}CUmlTkPI;w(Hyk}lb6MJ%D~BNWpHJqr@Io`F!6GA
zF$Vofh<6YwCz4HUHaj;vHg%n-GzqEy9<q&Up~p{#7_(}KuLS!|3*9VKe5#^Ju|fq=
zZ)T!y+A|d~&iS_@n|kVMvSEB9o;~v>=jRH!A9?Rjb5W?YIxU{YaaW}!XFZRD#|HEP
z8W?q`8h9m7Yh*K(&60e@m3m6GZx@-TtW|(+-*{kO6Oh#fj4Jd|h|k65%9W112L11y
zCWH6TEF3<xh{$Tx4U7~tzg3D&_amGzyYZg1&7{V%iorJH8Pj>wv*T^rY%Tb|<tfK0
z@V0Pk>y2<bYK>P<&!QXjDN__19YM{)Z3R6%t(_(%W7AXI{3?Yik1FpfY}fN!O$IBk
zwsY4wUY*Y@mrEO3oiAT}W8E97K&rA!rb{Ltk{=B({M8ZVXRm)hY;>yRY#gpeK;}Wd
zAb!C&ue2>L;mz}^D8(&PUx>qx5OjZM-MG=hvB9avWDf8DvKR3<JbQuKdBKO{T6c~1
zs@#KEAaKPq!=twpO21DR%TP}L&@$9&m!IUDTRz|R{1o3HK*(g_`RyU~pfYB$eipcp
zXm&pnot2#B<4gCpslSom>~&%^y<>@BchipOyf-iU6LrGf$vv%o-|Bo{zj1`3-m0En
z!=-0)?tISkowy)B(vjJbUfrf`)pqUK)#PRRa)y)5KE3tW<#C7pv%Hke$-C9{;A!_V
z^zyWWzUAvk{xv<(vF1j8UDYYysrM*wCAcQM6}H5$^}V@zv*~Bq>z4a4w<-Pt9uhS3
zo$wTgAPg3l7B>+J7kZJ+!N<wD&+qtk_E{o4V?0Bajq#oTJyDH;PVf7=bg?o$mpYf1
za-WjeW8+=)b>4e{RkJbNKaAf!=FZHh`>6JD)#tY9hIdo2gCKwCP3TAQWByk6q&!>l
zk%*O;_yY=(`tX_A>B|TJfci>`2&%ZR7o|)@;i{qz`<0ZxGhPjf?^B785Q2hY7@`N}
zLXuG*P*dLl?f>iwxmAn&`covfc?Q`}B7_+pD+VVQK8T2doHiLG$s}p|$D=Xv?96$k
z>!r2yJiGk-JUe?VL|S#LT<fIc<YSuiC9)itkRYeH0V<bs<<bl|9qR?A)*Frv59Ce{
zkPU$a;tMpJU<ZKY@;!FmLMMSWt@)jq?p{R*-HlLwL+A~9Dd>!w{1U*gr5qG}$4*d=
zx<d`V%?37Nss*bpg4mPmRxOu;`rOQ0cnO3DoDGh?0EpgrxkQQceOXuLR=!9IX0Ioa
z7<RR)<WVp<9E|(qdB8xOs7je21c8hLf(WPqbUqXCc(~kDhfxAq(iqYh(sD#$!#LP&
zMb(uy=^rrS#H0igW6)<BIUiDJQi#3_)Bq<!4nbC3Ulj_7q{|9-&5^LA>*}ujMK8K}
zqoJW=^mc|kK?O!o!9aS0I<o1F+NAhbB(t!@nw~=10Q*0i;P^YX4W8POYh?ETfgm)7
z#^rVb!;%d8@TmvO8d<Q&g64+hbwa`g0y8(Pynb9#QY35X!3CiT=2(YO2b-r*K*kgx
zaS4@Vzyo*;E+=nNJ>kaD6wm{RX6aW{EB!w~xUvg?%(2CJ8&ffR#VksP{@i@fY<3R~
zzP@QZK@;ocz7rE~5KYt0MHBTNd;WXhjz4*`wN5JRE%KW&vZS6nH-KJZ+;!&?K1U`N
z9&4inyhNMOKCa`BmgvM|ijkP-p)aRqw?hi%9hJ`ntOQ7r$@;}OQezoX0$d6zL*Xx2
zc78b1W)PrhHrs~J?|EK<a+ymrLHNdc^+Y%_tFR~mR?A4i@D=MzTWjd<_C~JIGANNC
zxt^fT{G&lOd!pz3!RJ%4Z)0KQ4lF!T%2)l~W{$UmwVn1LgCH7Ua)I6(bP7mdDM*~S
zAZOqLsSWV-mo#(^ug>MOC?whgphL@4;{H0l*Q-lT6g|ZESPC;w`tzC#?bk{(v;(58
zzF1|`qI+gr4!eZ;E-G?Ca>U*_liqk|1xEDxsFi^(cTM65w59n?R2)@-+aiags4zSr
zm*OtOR6}Xm;y}wL=;gfU-2zT<$JGKJi05uI`)_d|+=kn<_JGtY%Kb&Xtib0Egak+l
z8!T)q!fmYGwx^_tu--B_W_Jj%Wzu%nHaEqu7pYnw_TU$RL#kQ?4In-M-<27b1vD3v
z{{C;L>!sf2tlc;2UN)5*V0sXY_bLMmXcqD<i#X>(c&a#oJZ~Hv;QM9MXfuj%&ZSmI
zi)D9sjuM4Z0f*Yi_C4LbW=4Po(ddS$YZN5d9TCM$0oMS!X8dc)1p9UsG3g9cb>!>`
zU%eOV=WLtI)~h`+e)x`r@{0Hj(jGxC4&hB8{2#7ViD7rcvTO{(Zyq{6IGeP<QoJay
zn=SJS0Wg!)9?%~hegOqYfypn0+O}g1eFtPR`M`3)PM~$6(~=zoz@2^-w7OVdDB(A9
zId?O0puQErTO-x~m<p8C|I8WnY3CcFdc#)sKmhtbRWU$PR8FK?NI&rZEuQ~VDnli_
z3m~$I+h+Z<Zt}qZfdBZM))q$ptQ!+LXLsi;6+zog2G~xBQG!?h7^j;m3g|}#R9fU*
zGtJ@^OXInsL)OoaSYxlmW=iP8MyrTJSWaPH?~ludS%@sPhZCZm?al2@gn-5p9!MAD
zPtoWN!ox<C`-JDD0F)+TB*rYa%%XxyR*UqFT|5^qrv8m4{QFFZrbWc^6s46!6o<=E
zV<t&tW-~xB9znpt;M@T~kDAs}ez79U-xo>h8y9H8=Z3rcH4~nWFIzg09W{K-o7=30
zu}iA9pE~^|VF14JtZCnxW6F|))?(31;TS*bP_tQ0d9b4@KpuuWF7%)rDN%YcLt<~2
z;R+>Y{SCh-Sr%K4g`9IK)~7dzgeX%Wnk%Ony)ak1%$7^#HzF;*o0>am)|AbNiHZ?r
zA7PI=_#65exc+AT8ycwfJf0V-6aJ6`8tXQ1jx|%0)f8rkk!7ShejntxPUmz485<vt
zJjfkONO}7AjF{U-tF$ejG5>X-9h{6qFjNf}N(YY<Bz2S1r9y>*R8Wq&;D<S5ZPpN*
z^N8p}Xm`2lUCm!L_BaO3u5GH*)`fIsMIKcqFP>cQ)7b){B@v_F$mfEA0zev?C-58*
zlKM9z>$au{^m}5FR*2_;wXBa_yGHeG8dzBl6;7-(x<JEU<TEjnq|oCm)3&|9T;ON<
z$(IpjtDr9BdU~#bGG3HJIYzeIwI5M$nRgo*u}PT@uEN54jbuDwCcf)I%^t}P--zm<
zEuNj6UPAG4ziFgwPk;5Q$5&+8fZ-kR3i=IKzou>}J7Bs#w4;4g)VHBg;eB}f*p5%!
zeZbgv>UT)@qG-*}3O8L((1Pffdub0={@E=suTZc6<=XB&9~^-1(C~Zdx|)uEc)b4h
z{r#8h3s%5lar))jJu-tRZtwXR<G)!z2LCLef;Lk1azg;1`d|EqVtYpuR|^xj|F}Rl
z-oo+plPHIF)*H<>Go5ud2QfDPM*q%-7@MmX{!5FNU+oX`DbtbFm(kUwkYJn+9Ol;M
z|3t_siOL@dVt?#}0)JYT%@>b>0kijhq9UlMG?$rInKYM|P^6+FkZ8D9li!*dz<}!v
z&hcZa@sm^UnhyE?`MvM4c~>d(_+Y7i#qUz6!$lE=aHTyFFdXwp5D7!WT#kdcJ;J)W
z?>Y0x#@dA03&atTkUBxpy@bRZ2whRNimjRwW`0_$PqU>sPFW|!ulU+BWSU6p?^?9}
zSBVcnqk#g5k;g!w*}`Xl$S4^Kafux=VQ&UKJw2QQzX&~G)CUS2d6qt7X(k-!Im(_W
zGY{mD0Cw>vvzHR?EDjp+F&d2y4DuW3enyg99sDo|7`8Y%CKdqg3;==dSs?ZIo7M`&
zKosCkgM_2t2NDQ3#HNF;-33yaDHDwZV!;F|HJu;O_IKd|6co0nf#!C@&GJV<E<pMR
zgE3HrhA99EbOFE*NJy^zcVPkNIS?+}Ug?^H%;!I;<K~A~gh$9Qv!R7f{tD_PBPE&1
zgSmnx?4WFusD%WNqrHak`l73Tnc#qXl-Y0YtAmyg8t<!18ZT?=PQEQsf>-*wgt@ty
zG413oLV*45Wyh`X#BA`@49K<JgR+Dxh-Dr`;>|s_$#OX1D)1=(j*4I74*|O&*c~1Y
z4*AH)h0;L(dT8P~AOCUC``7u-@=bTAUd_x$S6Cs?WIND)uH8q_f;<yxt5bwRpV&r;
z!@iykLyw-j^x(iBF+A+WQt`-9_`3YGxwuKvL8Sf&m0!kDJ!D~CjX8v$Ue^Ae(!PW>
zpzV%2M)4RH&?0ar-vjD^-Mk4~{WN6c!5!jL{pqV0wOuWq9N1kuvb0kG;56dTe1!}f
zRJ0&4ApZ?$@kxk79wfE#Yqu3de*=U;5B##Pzi=R^KfHgI?7KA<TxBVsKPiv-$$b$V
zb|TQd@+%TOPxATpF{u3N*83TfAT+)WBxwssAy?=io+4BvV^2UV0h^>Q9utemP6Pxw
zcT}-37-g?Ca&R8X8d*jvfhxEh*&V?<wpZJL%a04ieHdsmKre4=UuFy_CenMNmX;Xr
z2zRy558B{ZHZzUsVD_Qm7%!vlEq@JW`nZAyk?r7BbQtsF$3UnSR*QK)4jzi#eqM+a
zOP&=`eLyY7aHT>u$XS#JXNI*kfEXhDNw_Yk9SQ||A4bxA)O@r`ItgX}Pd%}Xkb^(~
zC^ftiB6+ejd!ie07lIKsBXfv_#O$9+;*mTCLeG#WSf_Ym@o)xZ=Rpu@Hq;6lV*2mj
zjjF_)B~_z_$-QKf>8mVtmchGH#iWH;2%OWL_*|x(!<=NEv!T<B$j%hL%6x??>5WPK
zT!K6Xyg=--X6Q<^<0|Wv^a_H8Q47e`l;*1C%COYp1}<ZV=}<x`NpxkDGQazqdu!dl
zv|eV~P%Oy7^yqAKeH_lUKlRr6<H^}IS``{|>+GGRDrsaOWt?c(C)=IVlq!oTDjCtl
z;EN|78(@QBxmDrL)hz8AgC$Q<%TVu8aV^1<Bgf~*x1=za#Fr?OTcLSPa@P6FX~xCT
z6eh}4%ab{wQ^q;QkI{IJ43dwJT&aMEy3==%cGHEKgzt%mBH!TN#kUHA8HP1vuNy_w
z>{avVfUE}&;h1r@s~2_7cHDIoy_3<vw25hyXwGG&;>JvY5yj8o?bfCp70i-MEaJKo
zI!aqq!c;hlDw*(Pin-L1%Ph*URgqOARrgbPFPm0OIE#1<b<%TyZiS4LP`Oa|j~yEH
zInBm##<@*qO-}2*H)on2lhsH$z;yC$eVR?!&)T{?zuTBxO*-&-%?MigV0Wl?*a%E!
z_G__sWorv}wQ3tuJAYZjyLP(68fm>m61NKn5|f5fhFU=MLE*u4ic<R-eiMrP;4N_y
z^VVZEVbKypkdqUq{OyYG8dLdmMNvd`l(3h8m64WBnfZH4e`4QA(}-_^YeI8k-HLhE
zaV6h|*3O1K*_vmWYN^xWsu^x>f1YMeVQJpxT{%%%xOrW5K{ZrmnJ9%sJ-Ne@PsMMC
zYff`6RMoE@zFT#}a^c*_+&0)?n@x$^IdL)ZaN!K)VG05WqZvpqq$K3zV(~J3ylS{B
zgEPbD*DmvYlIOI3HDee@%e3QSB$FuXC%ZVOmE<PwK<5DEDI*V+5SM)<UrY`kjG41p
z=ZVJn+nV4@uhShTc?G4_ZM%2Hb?DdejqIxHHj5R$YBgEZ!sl%3X!rhDAV5YJx?oAS
zsirgB+uvgX3o3|FIM8!S(?=^p>!@On7W@aM$7mbr2Z?@!?xDK)n?>Aj!+j&^GhV0K
zcQiYkV60}W=Hv!AcQOZd6qkfpfI<N0^<iouqm*9F-)rKr$l*Yff~!XuQkH_Qmh9Fz
zH+0nSld3!P^ohoY&ET2dJ3R2FXUPL{KzX2)NKYd&z83LGAwc899_|vXn1!t+#0IH^
zcMf4rWp0bciOi##i;I%Y@>|MNdRsPDZdoos(UW=V3@rv1PSVOko6hrG(^czYyQ}76
zq;?=vIQ18Ov~#F~j#pgZT3<;#(<8K}vF5dkV46MW^dUEq$hqUAc|8Owd%cEvoM5M*
zlVK>>bI7d=5}u`Z8w8Z)@0r1hU|TkXd8EI{>xr@Yk&&;qSR83tG}qdXGU`G&rhM1<
z#kqsQ?ht!Y#A}6W4=@kP%qwM<3-QA_NE@YW;Gd}BP!+|mmJG67r)qoiepH%CR*Q%+
z$HnKSKFmmo+GVP3EX*qlvWZ%ExN9vQJu9O@qYx2Qq<Qn_&hFSHyi0$zV>;pSwPwZ5
z^;z;Pcb7V^5~>#2sP9!*&Mlg{c@MMe)qp%f5(7YJ1=La)%4f-m_)<2kR@(2eVbi^6
zLkaRYIX=yi5}Hc2FfGh|FOoK{$vF&M6Me8Y#-`9z2k^+8OruOsN;;g|)^E#_ElMnI
zo9%HjrtG~er&ea@4Ygn`n3J@01gnVgM14B1wu((q8kl*2sfMWJsR*bp*`v5=L#^zZ
zVc0ozx9BU?skPR(YIZ(Ry0pp#%Im33sf%;|<jB?lHz6gT*p=n5wX-_1!LJw*MiK5H
zlH68V;Z0DxM|o38IaIKu?B5!JcJXtz*gD%^+Ltq~6@-yI=i`r@)F^n>yxMPORL|)y
zK_E(lR=Xd&!~X66=Y;#!Co%Ik#WZpsmAql7(Yx~Y47NZb*8lck<t@ZlCHuC`hM*%&
z<DV2gDLj0Ao$s;3u|{k5%)*+v{!P5P<x0#&Koj{TmUZX+FnP|?$j#4Uo0VJIQen32
zaIvAyp?CXDLOT}cV&Z19?0Tx<vg!WZ=$_V<eQ@YFdCl|WzFF{7U47_yclF5Qx!x7q
z$#;`?^U9^<JtOC0)2g_+=se+e!4IViV-tQETm@<VV_maj`|<m^<A|TmI;tly40P&?
zglB{(+<(YqP&TALMEBV7-pK(En!`88FF9f|Z8G7+@Duf0X2~#@`L(-ByLyVQkRG*=
zw~+K{%{|3i?@`Zi$tDIqcK=1LwSnP`x6DTuq1C2iZwvj3Xq3PU<z4Yxvy+{NdM3q(
z%z%{iD=@H--`B+Lg9!)_43JbLLVKCIz^{46W>@`;Ta8_kt<ai3;73N53jABx3Rb2p
zVW>(wAwFJr?MREuLX`q$>GyMAg<-+qPb*QDzg<J`fe*QK@&O?vwEqXFj~IFbd}P3x
z#Akg|cj$#>O~-Qz>C)t;Yah33_}U>n*K3RC-g67$WtRJm&(&uR$8G2S68jIAw@!D}
z7PEK5-E05g``(x11I(8nq0$f2we@ikGjurH9QVYG?IHRd`4jj1tH+@uw!ly7$2au%
zhr>JPV>aJ``seUc-;ZTedKgm6+{WW)^|$7$+Sjh@-om+WH9SxDcLwjiqVHO7a}GB|
zXEB1MkMPt?FZWBG7g%e`T@FZ>5tzc{CmZtP0;8(|LI=S8lg6sk-HFo|;jEkq@<x;%
zICZVo*!X;_XZxjpjIh)FLTqMtBzG8DvCxIGyKDAhwbGfGnev7`?-;_afcV~R$=jz3
zD%`ezG|(|_a%4yp_YkG()b@$D_-5wPfBOKijr!$6_@rF_bM0mq$fg42M>u60aCPO|
zU2B>p7e32xP-_DuNx5(TfdEE>?-b?=KQncc!?aYbD2#-N4q+{<yJQFJSeAK~=!NM^
zGE+$Vi}+YZgtcuN$J!`my;Trn?G(5`Efk@4;6`$0WM3Q_r%3#?_Oa{T00&s$2L8^Y
z59j_{Z})6v6}55)?~F74g9xCPdVtce_x8P1C(RbNiP4zxNK2O|Tt))^=NHH`l?&Em
z`Eax|h_ih*5eT-P%kN&MKmoh85jr-6{e}Qw$aKY?VhA19KxE!`Xmc#%l|9!2-oHm{
z99)cAqMk3CWU<^S;;U&(_?vvt`WTgC)3k#29VW+7s1OAkP_r?O^zfs63(7l!bKMX_
zmdTn!5+@6oaJ6hq`Uff3STV4PWN_)yOCFT!E3Ow?t*N-Yrs%Vk(Gd?i7Uf}chHRUz
zLZD+pA&Sq}0X!a5Ed`>oMN{Be(_r}TV4FZg%qnrBro?pOQ=JZsptcHt&IWtM(yS+v
z0da=0vp*su`s3?%q$Bc+`8SZ%C(;fr>{L}L+epM0XLk~$oH5cf<77`MJ``E{IB5)Z
z;6FU~97U52qmyEgjQYDQ5(pVuU868(eb*_O{PIH$UKbZxSgeTC0X-0%Gh`duu~4Cj
zjI*vXh46k7kYSwJsasB@7|9nF=ks#djHc6QG{?cQ8bdo$MZf|jeL-6{xF|Tg$tB$s
zB3uYDB3gvZ!*%J#5X!8`#Uum9K(4(vj{eLl)weF?0|uZ``<w#<cDj{&v_v;#cpq4-
zazt5TtGLNhZksU}4+H37rOn(q5FeD}$4PHwoHL{%$a&RbjYn3jR#@9bP&+CSW#VYn
z@l$9xzm%1YYL`*&=bYnlQ^|t+DtN(REw3`UssJjcV|$EFcBj7Vgl=V-h3D?!(7>k9
zTDI`Q>eqK9xz-YYr#<u171CCFMEdqbpgT<_PtB;dSTm7EGZ@Y8+&&keukMbSgu2KZ
zLaXxU+S^pEPYWfaD3g9~0@HxF)(ZMEwA-H6`q(3AupxiGdi9?r4UVOn-oV9``tt=t
z^u)t8Wj10b3M9T^Uxoah<u>*MzvW(c=ReSB;i^80kGjDmI`bbX4;R)NclU^3f5EL|
zXQ@^YUnp#l;lQ%k%XEI*#f56^hjuE4!etR&C*iru<hcr<C_%4$*J>Nkq;7a}xv2fs
zhgDmSo3Fzjd%UNgtD9<s-MbQHH96EE3r;qA-K5C?Gh2cqK;ZjB^{~M*s!QNDhRkZ%
z&y?|LqniOn%BcD0O>=6bl8~f^=Sjr!n|k=L-YC@_YaYlj0Sa91&UF*ey-sq*6#yi$
zWw-eqQ`?PUu~SJU1SZohF`{!Jt!(DLAxLnX2Vp;Ok^Z_k4gMLm$`5=Sbh9H+ofSC~
zteyX$<8=D$zatQtD`H{xGyKJ_C_vXVe4PD$UE*b@j-*v>nh^ij{z~;S76n=iXy<iy
z;xrt5nB+RwEpE%@H1tJs(VKd!M+kr$<t2y&4g>m(v2eAtW*It5Hg7_MQBPTu$-#0I
ziKunj(|EW6q%*I2!EWT!qrN3Db&Xw0yvdJVlMD8zQj(9Rp3X~j0pAPGW*fq~kLkUE
zX~XF<Q4u7#7Ub&d*L;tqxqiV!yzExsmUZRxsHAK!848;<?AsCM4n(7GBlYq)C=lpt
zKH%{xPP2;FiARKd>m>C7DC_7IxMN*r#VxhSj7OXj)96zogb}puulVKA$_^Nb9r;NC
zf-ioT*wmTN+1ODR%oN9ShTiToA7+l0Lux1YE9Hd65gzFNW9Yzb55X&!+Q!!cC0fTv
zVo;gv@9*gi4$2PRNrYv3z#Tf*UsYRn2v52nU?i@&*>CiXI8lcrrjxPEi(0C(ye#!v
z7sZ}_=O#QJ!q-P?6Ac386XVx6uximuQPfWBA}kyCJ1U7z(5_IH7Krf#ISzW!3GxL`
zGxFMxA$5)LG<OSkf>Vmmq>)C7Ws~K&<z^J<2d5B3L{to`Qta_dfOq*iTH`rlKu{a?
ztk(zBBUo(2x_qLb`@aur__K4qVayXj{k!ZFs&OVi^1#4;D@>ZcYzPNw>2d1WnUP#J
zE5!-5-l!yuCBc+0_e?=Q?CCP2t=8V!4(Ry+51<Uj{uaeswPQ?{C=-ff)!u&&{{{Ns
z1)Bc=2(GO}G&Sb0&3Sm<l=0gI5C?B~d%T*oGVQe!;!n|+oPi)BO%uRzWdh~&)B2RX
zpI;^(CSqUI&{V4^sw9CwTl)~=B=oNb@plX^eV)aiTI10qB#X<{_~gxGT&3J8c@U8L
zHM_#98=t5=a!0Xi0>jo7^<d_UAUhDfAz|e-<BvVtBx>51(^sicm-ZM=g|8rjg(38#
z!`8y)uZw=iriC#57cqSZ-vzLS?Ox(-Nm-TEd=1-U98#OxK<t?V9@&S~iND`d0ur_0
z?MOJB=J5AwY$WbOU3yjCBeQP$F%xaL#gq79K}7R$zCaMy7t0?E^C_l4aDj#|r4|%n
zET?^CGL{f(W0yAQj@o?UI*}d<7><L5f;6wG;wKl_eX);0Z>uF&Km>TPjINTsJ8DhT
zSDp{913QOszCWW;){OmZaH;5@@8|C!*8EUD{LO?-nS5keZGw)%ly9cb`Iv4I>?f2e
zJ<IOZKJ{2Aa-SB?tHfn?;i?#|nHoKiHAHI`Et!h+ESm&Vh8bE_N*dYzS-2E>61bcN
zlQexk+{vllCF*Ou_#O~0(IKCwV1HS8xa*ZN<lU<)1jyj{T+e0mvq%MtjD;q<B>gs>
zBJS}!p5w3?n((C6;MlEKKQ`ol-GVmqW1%r5f_NjT$9_(!S#Yu?9PB`NmqLxI5>UtM
zetWbZf!s6lCOO88Jlr_!90yIh8e|_e<oUNaAW^bMK>Pm)2t0i+)L|)yAO!H^Iz%sJ
zGbpto2|K<1^|&$FJSZY6$0(-;IRSmQIrOjLUQL{&e(4T;jPvTs4vj(KUX*0l;%|#N
zGi}&JYY%^T$~_tlqW~ry{$dlw6S(zAxh@p+-h-_-Qpv)vrZa4mwl}t2g`TIM`d7Rq
z9`D^x551<9c?!FOAF_Zzu)<OA@^Ih9;cRbfh;F7?&vIlv+ihYXM;CO65RG-Y_(M7x
zM}to?oc48{ve#8{;F(bLRE6QL6+^cX(RqGGh(@E<0Ovt{wuR%j<0G9yDVw_v;j7nt
z;qGkobas<Lce6fUTih4g%kf<rukW9jN%vaKu52nI<Oc?wm&pa_uACW`C1Xd;I@7=2
zT>{;muj7SniiL-}my8fK=2x%tnH7{85$?b78z492&-Hzb@iJn-ko>A7f_cE?WWaiA
zQ$~0(U{K%#>QK~uXfYJ|b#ewsH>d!lmO0K>tlBlzdHMtI&RcKU>D^Vx_6|_X9eCoY
zszkoU#9{!;as)}aisB!}fcrbpY16Gq4(==!@+oGzRn3PQHEs7hTdbr;kAhxoss|ym
zpaUiKnNu;!75C#7h0`1h>OoIeaXQbimIdFJcKk)fRptL~B1lGy4t3AM?7ERFxls6-
z<>ppr0LneNDKB@@f}Z)n41=7l?pjJFmT5WI7Xq(hve9|%(nUEBUFXLcaODhr0`7UK
zWQ7w1(sBFtPB#U$&|s7yr=80HxhjP8pn$bbM3N1drioVP5EtSal08$JErkq0;gM@U
z^=Ea3WEe<y^YFy$^p_hD**+yeliZN<idg|Q^6?c8#o%L{Ihf?SReTBX%fJu9FW%Nj
zb5GlV^u5CV1?YSN@^pCT<*BU}oJvOQS6plj{{Af_7Y5D%o>+SOjskkJ+nTAO8F>ke
zF}$%bydR*&t&O*teoqfi_;!U^HS1_lgP(g3DqOQ4#Ov<*fN@ZcqZ)8<(e9L0e}2vE
zto6ZorJk!(58f(z5GtD%2Kzy93H%afxMu5vGT$Q#rQLxx$m8|{Ds2^CVh<)SaP9Zu
z$Nc=!cZp(OdZJmQI*u47h09ViN^IELwm^%G#)T2ZT!1&1wo9UI4uLZJMVfgF8&JU=
zH<_0xEm!NCKPE{O{1x5XW80fqj5`$7!0Kt!0B`#(?G;qO+zNyCyN0b&d$08h<;C)|
z87aTKL4G2<?F0Q5T4434@0y@(d#dEEcuM7On<4uINJj?BVc1zsMmV8$Ls~w?a|TY#
zqd;SW#raMp)FfUAgN%NGx}A(n-i_c-Sia<e7J1B=hj^h_DFbM(lMUWocmhReg=NSs
z*B3VAC53Q?t@2QE;r?u+8N*%@b#4zxw0>lvc@sk#`_K#NfNRiKMbTwHMQ?aN^Y4sq
z?&M>L1&4dY-9LiVzcOz1R|px8YvAlMA~*vf97pa}y5NmZY_7bfof_m59z_hD17(;&
zCbEUd=zfopqB3DJQyD?y>EB1~5M5J{QK$!n&;*;ouomNyl#euuA+YO17V4BnhS)^=
z^&}e>wci($m@plwAfVyxGusL{1mX$lWqAE$B}Eg%5^|MZ-J;N1;G+*GHCAWU@dJDC
z2KL=ntFvoR|6y<4pb%4WoWOaxP+-^SA$t@q=l9}ojzu&XWs&wJaC;Fg9ZM1^6$<oE
zv|G^s5Ua$hMAuSB_NYeBGp`VNqk!2hjfvrU3_X&UgX{$6<1cYle0teBrJm}Rf`jUL
zbM9f(F1R01%rFU!@!ZM<PTHaH&ky~{PI$e8aU*t{Hl{uyR~WJX_4E?3A^f%xpsRQr
z0@r{etHB`S+MI4&Ay5hh8K9OEz|GetMJR{#6_f1^-yG!~8UKR<W}L8w#(`l>6)g-r
z3|xbZM^PggDbn1Qhygw#hMTN&*oa^lnNv23#p(vP*}<Stq!iIIqy-F}TbkWwm1PJh
zzhW34E?TDYi~pFtC!yy(r~Q&e`7}s3#dvqPFyjx97sO#;9OMDIy2BB~YKHO8LkKjc
z%x|f@eMwcdv)AZtu0WeUl`(c&qB1aS4}gE#O_mjc-ZYHFy<WUK-xtz#;cSDw=_CyP
z0(7&n!6iKVztniG^x6a>9^&y31(f8$ACL33!!)AF;*HpyJ+`4)^e~W(!YYIKR-q05
zQbv6Y<iK!`$2fO+>Ouloa2+sR6!Ar}s<8F9$ie|S_X7~C+8dmQi)W&RWQZrSmDwUC
z4GQ0oJ!7ADrFn#vDmhrH@Giu`qF;kDkk7mpwfWVQxLTLK^=Z*GAhxaqFlK^NML3Vt
zLAYxePb_NvE7QXqPq)!_TdX}HTZok>`SN;QAuHPvzw6%yGNypGC_4^cw}00X5Pmno
z3M&OyKzOa<8ByBeY@F>a!VVeFpUcA`^UoO_q?52y)Q;v#-GFV}Ap?}S+2$$DBX|Fb
z7$pU@KpWe5EQu;#2j`0^dAdY?xMjtP?)c1f>2YG<WYRB52?unFENDr39<{*K#R59J
z55PPTl}VWAwz3su<8cEt&bkuqE*$UZCud#Y*5MLjDe(DQbF*Dr<X08qOu8CH<}bSx
zPLh%@lX=4QmNN8X&&*g46=cn41#als9}X4*kgk9=g-Yi*()%4H^zCS!xX;QtCzAcy
zi3M-6B>egn;*>I|5V|fe>Q%D-?qyLGv{3twvlsr@ysNvGH!3bX_;=k<=Wfx07P)JP
z;`RVS6Qm9!JCvfN;mT%ZcwlQZi~;%lV+M!l@;Q<{&Y_nl-B9a?H6VV$w(BX;#Fw@4
zg#i#hN>Zc}OZwzRY4Emlq>Xk%`4^Gm$4MYpl+ye>hB*TszkB~~?MwMnAzPjwLH@B`
z6WQ2Zy0E~*7`!tvjdv|YNm93Q8!!)s7;lwG{>-PVvaVm6%My}xhE(Pt0Us6{=Z$-P
zh~*tP)93@JC_WQZ5cHI`8R0?yYVcE3_ghX8E(XfFIaV?k?hSEXY{fjs;t|VhJyPO1
zEjO6nOE;-JHumFYAc|ag{xjQIv)vwY2Abe8snN_m#i{Gf4-WA&<`@x2br!Bsze4E6
zXAT7V=-f>oP|r%w4FmF6(JS=H8!&p`10Hwl+B_WDR9BzA-?p%lG%ElOQz(NRx_@pS
zJAE4FAx~Evu0<JEj=WERr0MM09xXH08_ZbQMK5xvKFNC1X3dEEBD{Nln@dKko~ar*
zTd!@Sp@NHc82!HKS0%g#@R5Ug7tjT59M~&fMnBTRDt;9XapvmLAr5}O1#i*&>_$AW
zz@uI`DOv&<JNACn&$=vOIbW*CytQ_A6mp~_R3aK9Z&5DvX?5TnBX}Nj=@aneXKvwd
zJXOiY!go^?J44x-ZLv)gTGOxv*;La|Cc<n*-uDsiGo;hgv3ZO*YTaq5oa20U`U8%-
zr_63Q>PDm-ZTEv6v5Z=*7fBiquv_)-+|;7P72?MbFlVCYpTuYVL$+>b%qEhWTVprD
zDnxp)h}ml5M}0`;?8(awu|oGNQZnXSohU>f(m7N&E_r-Xw31Uvg82aSZN!jCGpaaD
zV^~xgh6Z|4{VDToM%93T;&TZb!sQP{o|F1M0Va|L0imByyG12I<C$(T*V3cXAPms}
zHZDE>4~>g<0a`}cr38DS7UbUfL=B8e?PnzEe3Y=-{Yo2&mt!OosRLTEEtDH<b!z*K
zV;Duzg@HQ*j2J^g6ITgO_lJCp;FazU^J<F&hmXIFS=nGCOQ|vIMWZ<h<6uuKc=$I*
zyHJ6<6X8p$NeJZl{v=9e7uc~iq9>wP5E5}ywy?TRtfMf#2ptj#l4%<lqblJfTE*^F
zz9omS(4QM7o23n~s^F}y1*oEO5~2(#E!9z3UNKorcXI?g<zf^|rHtp5#3tE`*&Bw}
z0%4CYkH6p*D1edh>-)x$Tg!;ueuOa&Ig-wNz$l+hn5xGyLNX)<BiI_|x-{N~ItH`H
z^r){zX9&h2Fsx&erES}!r^^w3_Zu*gbS7-gQXmkOa^5&Ov-qsE`aW%{*tJocZnfU!
zAH_-GWkbt{l<O9RoQr7URVNx|5^C8CIo?G+Asr0I4@JvsBlp?AuoH87DLg1lK(i1n
zqnXUy@$8}uw##tr4DoE*L-Yt2{;n|D{4-UG<~k5iXSlAXS*jOoev&!ubr&KJT?U9)
zzV?ehYGqrJ4i%_{e@Y3ao2INRzj0c)>UlTCU<POoP$lG?l_QdHyOzA2RI-$Aqt1}F
zL}#Ujsu>+Cr#UD95!|0QJ_*zTx-l)16A3@-eoYv_kF>I*22#;8qF~_k<*=B@w4Wg6
z;^%gG>GpbL2rUGC#_!&U<4V`5n<s;la-16GIiJQX#5}O#nPM;@)T#6}27UDpkGnoT
z<UtBrFPc*eT}NUm^=tk-*_j1ZNa@&xDn76@_$`i1UK@4gAYEq`=?B7DQD!3{6_(S7
zpVx1LQag%yq~BnV(%gPwnv03?w24s?NFwF;lhIK77q7uN8h5~Lflt?EYFEgKYWL`|
z<EWiY$s;TdVOMTDpyi$<o-E6rJf&!$K^3pA7xmX1=^DMuGRKG9b0eaXCYaEnjA}l6
zv*C!L(=W5BT0+ftkxcclN8ckNeMtZnm#H>|!`rrH{jaUqHuXDEyj`b}(z)Uv=z*kO
z;RTQf;rqp=+qS;>Tag{juUcI-sG@0Lgad`wfHHZ(WLdndN+NYxnS=2pn$~I|yG|5g
zHotXl1^JKWZYB20@5^0Vbq*DN+`l7xCB_{ZHBt*@o*}eG&o}WDru2f{NFY>cDX&q!
zJ0k<tT_wtCDn|`A$ERLWQ^@?qH7)v6BUbFzKQ*xkJgLdL13phlFZ0i}3F#OCK%s}5
z-_UCw5z4_?!*z2-{W%hJo9C(+890LQ{aISY!=kDb>84q_X0aQB6$3bPQGDRua!3-(
zlA`9oSr4fwh4o-$^@k&~P<fCm2@@A-yz0QZ{x4GocFCUPEzeK6+YQb>jbGgB-VkDR
zm+zYj`RDi>aOJjn$cPTL=R1hVdb_iDzn3fg?(YJe4Hyrf{cQD|i|bZEMPOTqXTOz-
zI`1L<UBEq?YcG)yNc=ZES60$RW>%Fk<{WEya2@fF0!j(bmaV>VzE?owoUYr1`F=?u
z80%;5Hf@>Z(X|!~^k-^FQlzap>qFHB;ePBAPEN!Omi<vVwJGRF2^5Q(_?Xi1WwS8o
z<bAvztd4Jl1v+uJBw>g4S96XnZYCX(7E!+OKG8F&&r2^hd&CN)MR7@f=We2RH7xrQ
z$NklWQ!4hFu0--`z^r6&=Y6%KrTB2Op}z2=lJyf?pBS2B6N`WhQ#^;rhI2i=_l5_J
z7{+%z#&bn2^R1*rJKD?wRMnPkyN^QwaMxE5bG1)+GY|94iV{`sOJJ-ke{?>jiV_zE
zvp|fM<VT?|E2GdZo*)#h@gz#>nzIm(IGcjcat>W}KIDjd6k$|VB&=wK3310Y2dwYx
z%^qwV82Pa!2skKsx7v$BRJ(z6O2T}0DUnV}|E*XmEy|OCRG)n>?Qweoxq?^|ny(j3
z3r&O6Tij%hc<NTrlQ_N1A}|lz_@Zd=E}${Ti`dlh$X6~R7F%;fp`wos(5X{$Mizvo
zOrjB1MhmU-KiYNiHu9d^OFy7CNmj3}PrGXa_Oydey+6cPrw1P*2-I^)YMGu3!^3I9
zYnLS-Qpllv9@nR4CXl=g2U7cS!>%6@w>Ew^lS58!J(+rOdlBA|LMWlXW$J;B9)Fxt
za;Zo59Jh#zD*AAHn*Ui~o1x`5%M42{9JZsa`9U`Scw9f7LMGJPrqsti3_=stSe@PR
zSc7N7MV@o4{vKjGJcoJq7Pi(}Ics8gww5Zy4u~aD^=fE2%GUz)#%XDuLKi&A$WAX@
z>I8MXtYA94k4#NXmYtBKt9eLvb+8OLZ!3WNc(To7#W>t-+%no+bU@s&!KS=$c4d$B
z5OV`HFnlFkUxw}2VUXQ<Ks}<-J2@=o%7$rR)g{<E><2jGc-Go?jV)md{`ToYMZaAs
zs_;$F%{1JB#H)1-sOoN`;AM@t;t3CJGYldDvHQS{yWR+G>Zw_tZ%umS(}X?H#;{IV
z$fddtu+Nk3)DBHp*)s-7X}$pY_lOsMfDqhNp!ssJ*_0YzE%Dhdr?e6vHfLErrq+Uf
zE!=Wh@Tu<hLVfuA8)g?`7x(@9)615*O?lonS3Atvj#^;w>P7W*VuSndJx@8}2!a&K
z$giMS$KpcAha4jGr_x31I{z4}3Cneq-;DUL5*s)Cmy!_`I!LT+;IG;|#X$YL0Un!j
z*VL<x_2Hw_uRjgj5WG(MZc-YnSm<M=h|gu9_2n{kZ$?G}T-+n~mXbqOGKH8@qbSn_
z`ocpe(<oQ5lS7cqm$}Qyd!#?+gQM?47n!I+cQMJy<^UE|@b&rv_$^3<B#4#I`BNP?
zhs8ifdzy_av+j=y*t(rukx^XjXVlrV1LE(UHE3wP%I}#{O~&|Cicey^Xr<Vvv?(7%
z36Z64L<v=^QzY8S?W4V?EY)k)VJ01YdzK^fo-z_E@jpOks*3%Ky6L2xL}WP(Rh_l9
z=LVC3(sd;h9^!Sb9Z7?+mxd(xWhmOUzVJKdUtI=9+$4-ML{80PM0Vvj&i-5)dwC81
zHM%DZm*}+nFTbH8OjhP4Vk&sO{#y9P1g0`7z6y;>(XCSYnS!C|kqtX2W1_Glblz|`
z>Qvo|yzqCc$nEx#5MYB17@GgdzfL#cgC~7Glr1%_3+T7npxJO~Qdh16FSXq8vi=PL
zMCj0qyZws&?ix(|>#dl?w5GA<_0Fd-c;Z|Kekhw$+1z_7C^^HGx|M1)gqN*JU)45j
zp_brBK}cf#oVFMuqFt(CXm0e5bFPu(F<l9V^yT%PFO(6?7O`OdZ?*|hU=oKY?woUN
zWpEJ_NkvF0Pvou}3^dK*!P9Ve?MiU>wav1Br!Azt^^`j{b_-fU;<e6uZ@N49i=)A^
z-i#Je9;V7(_wib;Qiq(HCE{(sHc=8X$^rKvFR<v^IA>`zTu)SeQS_$e%^fo$s_f!L
zBkU+4B#0haLl*fGGmff0zhd=4Lq#kF1(C<+qvaM=Hp8CvSvXZPBt%TVyS|`hN4NoA
z37wX5pvzHDbFe3=q&nzs{XX<EE348mwyYCqxN$!9fN!&3R$PpT-})Y^x*jxZZ<U$7
z>wckHU+whl|5MpHM_0D3X+LJgwr!_k+qP}nwko!@gNj{Y#kOr#l8RGFzMOOK>8`$~
zyKjGc|M849#$NAl&Ua$ZvF2LqsgxMKr)s=E&B8PW#H?fH+Rrc91i#W~*+hXf_g{;<
z^?Oa9<rM0&t)aJx`HE=6fVzB*P@eR#16v8jzzNz&N1k?Wk|p{K?uSw9yPM^BuI{rc
zuztTB+L54A<k8R0q67AP*U-l*mwrQ-X_wYso{dx6>wP?X2)I1`x!z=4RL&=VIY$xN
z3Hj}iq8fwVLRA-)Qj>yUo?KW;<K)w2aV+(-GPWe<0Oou(6Ddc6c`g1DPb-geO$u5L
z*_%C`z#O%V_@qqE-rk<*uQI<tYhDonu?azxa1NfbhF&z;c7>rneoje9GXAY5!XKqB
zf_&nQ^gGG$twcY~`dnch3e0F9e36C1l1an}Ihq=cK6%OmbS22-<-WqjNe-S%QU4@H
zbS1HRW3a7UFU9#LEc?AIYS+;jv*zQG-TEMOtSt>U<}n8O^uol3)z1z0Ykpg=i_-6@
zN87c8qx`AzmXEITr(x9~cO1?id)CaEKlUgl624eXK`58D>9hD31P=AhluakrUN*I&
zZ7n<sPMhMhy;YRQ$c!^|?*d;S^eMV1f&^qO1|KRS%Mb<QJCv-7G355*i=kRW%azX<
zj(l7vjfL8x7)pfr8V+{h^^OvQwY*j{#Qy@0Xuf7hGxThhfGBar<k_tQ)X{FXu*bOv
z{%tYIua3w_f^ydOZ1Y`(6uL)0@}M2JP@im*(Q7PtJc&ox^t;jJ171>MS5mE6S6GLV
z?ku;YwAV(006X<S^ax~hlKgYEQCbA)ivcKLCg}}X6zSt$){dq0!-?oRO!R2Ei2yd)
zS?X4OtrWLp1E;Yz?4|P-cj#+Om-veKuX*a@FJ;(FIM05GDi4@<5f|2|38I}l2J+FE
zN|ZNrGTiJHpZ9)|+qf4nGAAozh)k)A@Y=}_Z$+lFtwW0f6<OgR?{i_b3FqqbIu#B7
z=rr4GkPu0Bz%5x#<w^1hV};)5vR(93y26?^^{!bZ8(@{E!G^AnQjjB=r;}^ffz;U&
zvBe6N6?L94`C@@+RWM34^z_U{HowN9xS{r<gI@|<Z0*2T^%z89*KEP4y)F9~dD#FF
z<Xl09KNx>R478QOTMCV?)Jf7l(S^^SiTPr;aCbF~HKL}RkH}(kNW!=*j3tbi@kD9X
zE4%ygKL>$4)GgsS$U|!>#GWew%J>4#&1ZmnEX=WH93d4r{<-M(>SS8tBrcu3s;c_}
z)Ikj)QX{*hc$i2i+JRnQT)ycCDmZO4G;`qC5reb4I(*3-zaj>X&NI&$Z^hP>SOo}H
zq_Ts7t0fhAEI}vZ!B5ru#2!Wr{e?$tjo!wNeY33oX07AnQ50jHV*$3VFb3Ziq*2vM
z0l}YCWQqF5sR88Z*n_s|$Zu*#FxVNw@({HNdGP@&?YD%KA6vjrB&qL2p;Y0H*BQq6
z2C~}sRulzCwxf;a!$i}exLo^FUL_d;aUpJS!QsJ@^{*KSKOJNBGg)4he$qPp$bjdW
zyWQk%f-iAg3*K$=zc?)Dm<|RpNE4Az$$MI{NRIhjqYUPY<^glmuTMXhg|<5n(_+_`
z_?!YYAE{@!SiN4Y&3ormggW+Bb16<h{d6ZHpkR7nc6^R%x*BUC-KDV3DlU4OuTI%2
zmt;wV-H-WN(X?N7LivCOli{?CrNHgvOWmy5L4GYv0fp2=Q&si^BodtQ@+<P%)?Kar
z^(vZG7?RQ0T~F3VA^1iVX#I&IJx!}(Pd*iBicn2Fc1~-lJHwva{Zr$iKl%XnHwAa*
zXjZoXXV&07>FFv)69@+i%}BCg@z?p4w7#DtF)WiM5F=&>M|NEGII*gpH7(rzumxsa
zLlW{D*a?Xe%Y<YhPCK52op?$CRm<UCk^`@vHnmk|n!}FDUu@X<^|x6SM2!YpXX5tM
zf*EZ#Srt0D&v;~K&~~tIf$@u5pbcwOdk6bcdvf59v_qMskmSwoPL9c5q6CH;X?*!>
zXFhiIjD-lI)|drdlUunUh12F&ouydPu4TOC1Ytc{2Ns1g!>%xF{1;XqHC_A;pPqyD
z@;3YP@s!{&+;0%fq1>lrkp#-_@*i3%)RD@8vD9rBjZExBkc<@}82IIv2Q*t=3o37}
zBRC#4Y9buVsir8g?-e-odF#<s@nBFC5)rZ*v$R$O#j(>v%%&MMMY<V5w6Tjx#-CLp
zb6FF4L*-nF+yncz&<(Us*T5gr+YMJ+F5sYCYdF3z;fxg~#V6~Zp7=<e5y-bw?wta3
z4YH)Rxj&<a=EfKyKQjhRBvZPqiSY)1;e0<lO4w<$JZQtL<%`jlLAF>JO^M7S3crwv
zl{Z4-abaaOR}I@##^qFW4zWfj`^F<HD9S5IdSg$24JWt4sIPN%zGUVV;ZitBOD*#x
z&;?!UUQs6PzX9YtV*C<|bsxG=k2<5bg$ThAg&#l0!la7>7nVoc_7kxAG6~y~L}Uer
zz8z-rbcaKpoSxx(7!tu_UdWbvh^d>HjIuQFLq~}jyU39w<rG@bqK>o8hlNyZ=76(z
z+HRx5Lsp}STMz6m@8hcOcqWc)I|&;*gBeiB^m*@`*#0#`LS}^HX05~zs2QPQ7oIEc
zbg_0Di){9hUmU8D-<ej=Dd;k_M;(u$R%<k?Jt)v9b@vdDY$Jj>lRY>a=(v-Bzld|c
zZG|mJ&`FLQ7Q}Pxcb+eSQiqe}u@gq5nQzgvJqaDLfCthN#QRTEbTcdgb-6kScrLoN
zmAi|TY3Di<==e+GPC)Q?P*|Nx3Qm#*A;oN%5e-oi0&&?!jV$?qJ5jY-#wgpIn&-Vg
zUb9uIe<SDRnTzC==hs{eoL=)bua#uCeaNb{xnymCcu$arShhuQ%Sqk+#9{2J{|I^j
z2|itVO0r!Gf2o9QRW#uiZDzTtxr=K&1=)U?mMKX`!RZx<7anF$Y_coVH0pQZnY!of
zXB^C}hfSc%rJCOz$fxgb8Gny7g@p?LH3}TPcBcddCcv$1Z<Ok3Td>!VVD^<^g&aJi
z-XsmZQj{>9%@L&bg?Efv@cu~X;!DM@M)p@&0vqgD?_Ska_2I6Iz|Dd=HjFuUnw9K<
z`nIk`2k;uyb@wTb7edHm4X^-=pHP)ancdD!{GWi=I(U9mL!H9cFt5$2E{+u}OG#d=
zRriqqetssIU)v~s$++^Rhrs=Q)DLu05qj-Q1>&)cJZcqK(;!)i8J!c!-Sg~NDfby8
zo*RzWn`gxPG1vwT>$^$>@ieLdq=2#JYGGW?_?L?>IJ}lz;KvEEDwu%T(a-X}R8y7f
z8hbuXo1H#acXpUAW~g-5?-G4|m|Gg7zz^>jnzq+7!csA!i-MRVS;6cy4P>7qIz$_A
z9~RCcMf6IQ3%}D@Pb$;&EWl(#7g&R5Xg`fY7hv+HZMEJfNZ`!m_CkbEUYH6~NtV@!
zhZK`@l#YJ&*A3D3+_dc;F>Y6Pg$JD!cG-l<1a=^E>>5N_1EtDMiMAa?34+XV)V(pA
z&BPj8*gOQ+32j3g_2tTOTIA5+0p^;TPws`a{PYmP%MIO1EcLaLyJCmm)8K*8HdKs^
z&TR*MZ`9a@S#<a`gYIq~scy5f(O*4(9m!Cee!2nJLy}Fh?WF2bFFKZ=5R`+qm#?Vb
zor%4-KY7nLGQED?%)vLYi=@o1#38*2<PP&J@6FJTDz=*Fm`TvQR-kp7M|pqlTVdQ|
z=|H>2oXAmFAVaS^PxSGdXAhnUj-4GF+j1>3SSuqXIX`pGk1IHf@Kk?WHFDTvlL&<D
zp2$We<ie3d)kQQ}tDiE93pML?si&#&DV17_-6$l_n{N9+x?nj_my_P;tQi%~1JF-U
zu6z+@eq3xhcbEc~H6$*Lv+1V{qSfUyzq)f-=YCOf1hRbxgN(ODg2LH%>(GG`;~o1>
z$SCgn#5a8Rta9GyAyW*B4agv!zb6ctd-W+d?;KYA%o;9Z4##LdRXIGfO%QF}ROnm8
z?Y7AW|E;P;zfR1$(dfhk{K8%xu|?i|VHm-Rh&wx`JO9<k1{V}eQpvk?Svoz-#UZQD
zI4_8QW8r*mj|5F&10iDeu7t6AaQ5OByCQoVkwJ=;Xkj_(#HHUtnYa2tii<p36!CWD
z6>enAu@b2?)@#!&3q6`kUdHQCV+po?zE>Y@qX0|eQ3M#V<x!WW1nzle%Y}hZJxISR
zM)TYLTT5gTZ?T3VI}fXCrE&DOgR3A;d#rztP4co^`uzFhSLmLLy_ceEE!RPujU{KL
zpN+jaxYaoG^F2LuS}E-jo@dy;9SB5q5mXFE$&nd^kbz3ybMJ=lf}JV(xn`p($U7vP
z1+$HcK}?#$jR>!Luic-hH)4GExIr)G&IlfU<-f>&ylW*?Pef#Q*Mtk!1S-ZaL}R3&
ztD?%k?k3=}J(mF!U#fx#WaZ^?L>DQm_;h7%tSu(fkUY6<*1C~vus*qUk1d0?QyWG<
z2g^^Krfa4lkVX{=;$}ut*z4F=?dIsXf%|8UsA@9_x)>zIro0)r<I)Qu=a0S>1S67N
zTgB5Yzhju)WuTRO1hTEXMnh`uI&yquQitHpN(%kW>Hvm_$FI^v?Nr*$0NOG7rnvko
zQaP+5qGd*W96#{Zok5m|6kcRw(yzwY=p4!IO_+YowWoL2QBNxZ=YF1EURv)r8p%?P
z<wNTsZ#oR`1z%Zs0Eq>kP0WMpc@tjoNnY?3SUf4Uvr~b$A6*$56e%V1OB|23aMmZ#
z_U#*P*@6Lu#k|trtsupM#<h(uMlP*p+eYr};E0U*!O-ZKQ3(ndCiX=`>OoIYl-O0P
zY?*!lm3$gculXvv7d4$NbSbvU7ds>{R3E)Y;zDR`Jx1~K6L`^alm5Kdw>${aLHT~x
zgPTo(j5x|olQERkY5Jaz?TTeYnu<73k&|`b_U}MkCI!_O8flhnMskL%w_9{y#97TL
zrohvX+Yz@0Ny<`*Ie6#&39e7>TMl`3bW2E~lf|!Bu?G<+d;AR`$mYnEpY2{ZkqYX!
zbf2dt0z07`bXjo^vzjz!b)g;_Zyav&@$L9eb;%?xtH|r@;3}EyUj0bto=z1L$C!)i
zq*2<Hi%lVS&V;>m?UbskF2IVmG0#Q5W7KbJpO@)C9fxXaPY)!X)KsbOJB(~wpFt3j
z?a?xNoEVC_QAPxvpqH{xgf&@s_BOnDDK3K5u)WMc)i}m!)`|`=n)=L4%x=yw1G{el
zxdFteqkoA}G0k}lqJ??bzqYv`0j#Q(!JL-I9Q5>TH$=MX8szPY$leLH*G#kYPEmT{
zz*7xQ08*@AzpBuWLm^=uqt$3@h478wVp}{<E^_a~d@Jrdx-f-0aT6ox0Yf;l`baj~
z$Cerqa_z64TX)JMZ?P;1Y`z9MehRW-j|yrOyUT#yQN8ll&Ih1|m@mxyhAtd|%AZev
zgkfxRjQh0&0@@mtpAR$&z@~at(zi6GM0jTvBEnpBc6@GPQg$^awK9?uHb<cvBX*y|
zO*R7rKAAS(puz1#_?NEb(^pg5`a9UQ2w4XZ>Ig3SE!*+f`w3Ikv|a0gPtrWkSzWi2
zs-$ecyYVn%KhDg(&q3_kW)2LO`*U3-4BqUVnFDoaU2twyeqK_DvhP$7Ml)n-;aKLH
z+4M}_lA_zKK!&NdWe$?Ogf%iiTN<A3xr_RtY-db71aBBRm+QMtXHv`K)ZL3SHg~&-
zVAx@7M8~D*P>%1|%ZWuB{bT9?y60)j9m*?%CHHlr!=6})eE2m3MTvh3>WT*Hz}<cu
zz=aq5Ed!Rj2XAhi-lQMyDh&QO*lJb{eab3c>V2r!)71NGuPIKo>+*ht6lj+hZRjVx
z_?#-LDOtayJB9pXb*^REvz>?az)((mOP-19Fh84&A|&mj0|c)*?E*i*Lv+&x-|37$
zJp%cV?oY2`K<rJ?;P?(wiybLJ^YwFlomk?p*}D|2d{7Jhm*ft)HL#2xxa>#ts%gdc
zl&eA32CNo{+VpnD8fl}es3**NjUPW|NNKCht;gw*z&{NfXsKAF2G>eYZbChTF7U_l
zoLnkAtmAt7p@EgDIjl1rKFezdvy{K#FuYf{@5GJK`=@GtReNN~ak*yyH4W!z4+qtQ
z<J<Xkx=#FY3yCw*W-iXcBg61@QSVrI!QNwZifDu6^S20hgHRlMNU2yw18*4ruU^7&
zh_pFkjLNrkID$1lQ4)Cu*|ipCK>E5hgqgJRpy*Jg+EzRfFBj`qS0e?(`@eNGEF>m^
zATIHGYz{WFy=H0$*m76lywMBYw?r4y6|5;HPtzw3!U}parC#J8RtelL<CMJ9EpL1(
zTAKG;h&-&O7pQ^h3h`mmL~VmOc5{h{9GH;XaZmZ$cBPwPriGbquact7U7VPRzm`f>
zfcdjGchhWG%B$5Md-vkXiNpG~p$jeh0eHsmtk|ClV>b#TYR*xII}Y=HhvK#QbV&{W
z7>}Xocy05tx11DyIcI<X82el-$pL;BuT>x6>pT23C`XbzUwSI)7YM=}KhZ?^@(bhy
zBQ%EOx_;%k@~MS4q;POO<nRtU+un3HuTL{4i)vBl@4*fPn!Yj6U061V9CGf~pmAr=
zr{5UN4UB)?;YBYo0N{NF<NG~BI{2eO8$*|w207z_ejP%lUJpVJ=lDyhTS*^_v7QC{
zVPZ4w0CVfnSOx!bh<yk?*($1jRfRk*hhY;yK-HWqZ7^IRB{l!Sb?bK(hGB7Y-qC;?
zk~a}<o;w(C`1)1Ss5WSrPkbK3TA4WOq)mdDgna~_L4ntRw5$8a&ckk1H#MR~Z&&-`
z@YH6ru`|Bv?cNFh#$v0iG^nd8qW{y2=@*Vlcr8)Ub>pFz>sLRgaivd9ft@zpLzSF~
z@M(;0UmD2L)Wa)HmO)TTCft=gv8%46w%r&NWBfVG(0brXE;GZ1stH%maI?oN!AaO%
zFahd-9bJg*!F`RC;VO?bBLI}|^jH<LIrY2FgVoDYk2T>mZfww2iV8T-eM(hEUX>H@
zB@9G_Z^zi-8(O(`T-&jHE1e65ZVr%BOLG$ZM`3KQrd43@Lx5bdVFsz@!DoiYJt|C!
z9`_@Rr@<#Igg2O9d@t4~-zGw5Ja{x8w#0@f@nwHZ4<(d!y;T>fV}nWaxh^m$4r%w3
zr(Z6|>&(nHD4%1yOVT^MBAF6=Jj$=H_Hj)c7_qtKIi3O$7$;}B(PQpcBZPNL8|^!B
zP{S(+BhUurt6%^Dy?-3xCK8wSgihRY0^9bbnTg0LmCpg?Ng?5L&{P1mQa3VwWU1S0
z>>lIG&VUzJ-sipN)Yk9XBW`wU68Zd#M}cGbhXvS9HmoPzB(;YioEH>wd?yy|%w}q@
z9J+5Tl=7i8e*9A*AfFnx^f;Z}1%N&!xbktp$4`Iu-G6{r^=abi*)WAkR6uL$11%C=
z4OK}bi`mf@E>9dor4ZyaBD>CFb5w>cCuz*x&o3@dzGrW=l!@&ra}SKHxMJPAwIHRE
z@TG}*5mgpI<E4CAeOPJK^bbJT^uR1)pNgSYmsz00Btf8l;~G2R-`^gJTz^>h-tq9n
znoOP!#CX93OW-JV>C}obkkDn0u9s0<K<!rp?dS|Jx4uxmPPdU5NdPHfWisGW|CW9Z
zWD$M=B~{*omUCPaV<R+PDsI6}xzLtyrPwb>%I-~ltvu^H!ID7#dHWub%4A#f<uxQ7
zgpy%Jg8**enU^z|j4-N5+LO`y?L;Rw@}yL6H@e4?x7C-frL_oWFWB8<Iw^&xipNzl
z=_az03x_Fr8!AzVHLllij8v6Dl?A2X#_1er6vGaQ&&tG#n2(jN2;@Mcur(ld;1kNR
z0AnqI*h@uyyn2?7#pZ)EL4DBpK`9(+?};6UR}ZKHKku(7g2!)Z^&;MEn4T+O6p)G<
z%iR3C_VGF;vgRjlf~i__IV$3PA*wWJeGq=a1(HgA$pdvNvOEjms7Be#jwDXsR$!uw
zS;TCx4k>(vqDEGGX+sbRNxZ9u$KI3hf0=sUC64L<iISW#9LdR+TnJHEl#AVdiT0Q0
zyGzHs0ep6<`c8xKmZ;N>kCfa>of+0?ir3NY+mkI+Ju5ZOrn)9anLHB!il7p%b_b9Q
z1us6Y*Dpsu_}E)N=8nF|B_&<br@O*#B_4u;4*i9sl;_|4;x6=3bW`gNKr!z@{oG;L
zK3xp+7**hy`14&1b0d%1(Dss%MERLlAFHd!U}LoXdn<GCawhwA4CR7ajUmM3W#tx=
zshu~CqDUEo5k+|gzES!FWrFkkJP_q%ed@3fI$cDKKn(gse?Tiko2lnQJbB+zs~7@Q
z0%e&lMGNnE!v>vygx;{FdcbFYIPs>8%x9#JEga4mx#!X?h8sD&!tlyBGoDa>Lx1#q
zZw8Uw($Eo+=(d88X)}<lMuEMWrhs2BZ>iIPB*4rzdBUtE0qm`ch^kUmdW=v^oHeO6
zPn}uB$)_L|R-tY<U=s}>F{H_-{DJEsSC_447oFxvHlSno%NudZ2tAy5N;ad+E=`eJ
zNaY0qJy`N~nb42QYn@&vP>7t^RuxmHt2K(_^YD?K4(i6~kXth>Ry#rKg#xir)dMIb
zO_Q2ORu~JEx|g4KoL0(3T>!CV4slP&2!i=6;r@0-7_7k_;9(xVaLiZ0n(jtlyLC^}
ze#PJD7??W_DZAsz_?1I~N?`C#_iul3L%xwi?=5rTpY{VwaDBC2S25RKFnC!oK)Y$6
zNFNjh#YyNn;)rrUf;bLYr)I3&rEB}1lm3m^{aZpA{mC*~y*8xqxpWzoUv{Q=3=>>N
zbc>98UNru2-2)_IS5S>w{so0>u(ZgFqNzW!<KnRYDZo)7;zcims8CspW9<9V&8vFK
zSR(523QFkuzNFBE&JI~ZX81Sep%95Ua^&mENcIz_n#z+w*f3Gx-cmnWHA}Hu;n5SR
z?TAX>UlxHz?m>KjF796&na?dt{&wCypW`Rnuv>kugE&T;8S*_7pC3r=J2YTt-l=Xm
z@3!%_zQJn#T+%Ff#X3Px`#!;pN!-?srpE@s-$Y~!e8PIcc`^5kHliZGB0vpyG}JBv
zR~@ATGq4X`#;97gq@u>8?0}ShX0Mz3TBNZ9WceP*`aE#74WaUpYbVwkQfu83(j&s8
zOpFy^!zAxHA7*pAP%xx`j}H(~3iht6Gfp$MmI^m%M~r>}D_#1y_49tTg3z%@O|=Lk
zdd`*Ii})M{9aYjJdYqL3q)o;AJ82nMDsF^Q=T3-ARN&%GQZ1OUBSumPc*H=p7>}LN
zR?gKOWD{_TsXeNt(TtF{aaN@L50tYRWLxc|UIJ?ZGvalm=d!@6C4tATcc?-XenhJ<
z23V=ISb0$+i`-!BO|Z%}w{iM8`p$B~dGVz{#0E(L$bNK#coL#4%(5Q*<79&(%_Wf#
zEJ>rnji{?lvEY*nU^}m`i!G{v{BE=Er4XqXf%~F3=rV?O$zs=N(o-Rh(P8RAz>|Yk
z=6B&JT7rEcAr8BMYeA1b-k;&c>;)>+WN(IDPY9%-NOTb^15?2zH?y~GSESZDMYi^V
zuPt~&59yv=O%;8-?#)xxDgN>0P1<DV)F%gPRLi3p>*4QN$pmixiFMyF%C|^nxJS8N
zu#2hpk*6q5QQf(omc5*igXmPwx*`>KR`sc?E`aS@1&XvDz8_oDZ|VpJWhq*yCeGSh
z)vSjsE9j0YOeJ#yeY_?Qk$4YN-@OZDCS|oLZ>-ij&eUljeWY;C?O`YwUZfPGUea6P
z^lTx)cXV0saw6dD5(q~@y_#|kJGl8%xwfu02Qo;2VF?Z@qHNum$l5uK>W@*TrgMc@
z<u}pI$6Z2j05}H9b96-Q$K!a~cwPp?4r$m$@~#Qr@MpohCt-)4R;tY-*T2{g)^~4Z
zjg3^|-u@^suuEpim&Y=13c@konO^m6McctFV6^p!?P8zxCZDPO{>@0PD)GzdT~4Mn
zE_tH+7m7|tkWr+3nUK)&eEhfIL_vw4cT*NWW%VI+xkXW6R%{3zag#~i^AYs=faXm0
zKd*h~m>SXK=<@l+^dwG#@XeZV<O&?~GGzS##S*e(Dt??$Hf1n{SN|TqB0c+cfKR#T
zv%+}gfcHCD&PJx`>Szg9m>PU=ZqU;xB7YiHpS&kxuUN=l&QNHcNA+|)g-e4;G13eY
z)jUK5F%IpT;>8lAuMHg~ZVwQs6Dmjo;4Z%Zm$BF2;Y-)hBlIqL{wfKuF{WmI;{Y_l
z4**~V(6wt${2*-HsnK61S&4sa*^?Kw6cD01T`1tr`dC`0B7VDc34rv3j@klgz%Jvb
zO3NWqhN*+`JU}+`hE#xM;lok=RTG*6V;Stuko;!LEL|e_BfV<D0LdDY(vaniqGRAR
zfgBC0b<_jNrhxW(7evRRoM}c+j5B9;ZNImnp9%!QjF{c9Y1*X8=+_GE48qO$gU||q
zh9L#UK5G+nlK+$0G*)f5tn0VRO72ReZ`H%KcWNx_2rm2tYFR5P>Fg`lggdw`21as3
ze13(~QnL@h6H9~gi!7gwPxqL#)chZlCHMqeCkl(8%<Y~K5Kkve3)nhhpNEI;zZ)<U
z%OA@rlIH9#Bg^BP+@~GC0S|<8SW?^)JkBohowkwa`M>hqvwx96#ET&Jy>f4J;i;D3
zh#nzfET%2+R)s}rZLHdP{#>wGw`~r)3HnX}7o7N&R_6O-I6rOmwTo2*hN4}K%ovhi
zrOqy|Qe}fU3VmfrYuXSuTLoFE(}iC<9&59Jn&vCo4F}BzBbM$)Nf->*@}n`XKsB`M
z-V8lwUVvS`A8tWb3P`IN#g9?h`dz_0M3P&{av?@=R`Gg67^Yu?VwAhp1Ut8!N?r6W
z?jl(J>)j{AHKxpqd&Lq-%5SjyTUx%7#>~hlixfT-T(3>hP+6{#hIcVZ>5kpC(rF7>
zuQ&z)1PKn<0J3ISpTgLYY`jGlY!=GcfF1Ce>zpLV=1a!du%jC}(US5+Td%7Fx_iSO
z6XI70So@aDp~w}x3#(S;mGMFc49KJ;t0{%Fqcg%Ew}<ypsySHF6FYb79drSpdv^?@
zeBxv7b!`6q+NcGan>4XL*>7dJ8cXY^J7DwETM}<q;1%<cVJHY#?JACdp2Nw3zJ%|G
zA@uwPKtL#u{!Kv4#&>HW>>44a@VIHkHr0jKlrU9PNZZ;L5~&K_Feri~ycyQYi!0GQ
zsJ|v%?e1OeBtN}%!su^l1Q4)zkfH|AP3z(bP~`eD2+EYM7KzEO*4v1kmbv&~B5&=J
z1C*o^WffrIdxwLShlN(M8R_b9W$On8V7|d))J8e?-=s4$6)@px*<T^Hqj{?A8EoFf
zxI&XDwb+Hd_;O(w7T%oh4X5R$IwQ;raBNbXE<i4gPr>U0N(|zig+vXOpZHeWz4c8p
z8hF$b*%4mv?WMon!&9Qd>Z^#OaCQXy<Ji-=7l-NjccXstz7aC5J_YiVBy(adY|_#>
zmkdmIN)iZWUh=%VFYAbt#XCQ<AGVutm_!0j;QsQy_}ynklIsX)=n+a-D9|%rZZG7C
z+AyyhMy2Hl*+ZJRSfOS_pDBdz6jFk*WE8Ogout6bbs&wHh28bL6wREp*j%yf{>&#Q
zRazH~n{rOt7s0ArqLG;*7aYPR+;rO3E+d3phPYdNjRsDym{qU0Efoig`)rm%&{LtK
z&G0WhX$O*Lk7|XN6ME$$rOr1Vxb-DoE`VXfQ-?I_pW9M=S5vq{kkp8i2IumyQ}YN0
zso?&^SQZu@vs4?({R@hy@3@}hw96o7rEWp5jl<`!&V77MW={kwZ+RJ>QFuD(JRz`B
z0#2|9Us2}fODv4dn7L45q4>Xun}%Ri!&ExJ4tSI{%_>kVl3k2bJ@5{lxUxf(XlcC5
zt5AZffy`6GgfJ5WROw2Zz3TmU(R7-4T4M2`>on@$3=EBPdMZ$+(NotQ;fj`|T2a%T
zKVvs%&@~jgw@Y)a2)jXDJCI7DtweZ13w4t$6&9Wwsfnn4E@WFNIh72Pvom^zKeH9|
zNRc_WJ)0oV9)vfW6BwL>*jfmRHbOVyex)!;=4}Y3O~~RF4gg}(f1H=Xp_DeY!I@v&
zG|{h*2jS|juqI)3vmr@^lFS>zSb7}8GlWnIF2}p~i6!$wYDK_o904u-Zb`ESoYI8@
zFvVIR+|VCoT&H?18+2@vPVO{XsgY069haeb<C`SF7_6m?M<$kbly6&lbp(w~IX(C_
z1(NcelnsC`;`Q@Myd?Lj6>5DK7`BO!e^+zCQS$yZCRm&{nQA)tD*MA|ByzS^VCP%;
zC~u@ieJLJx4rP^B{K)MM+a`Egq9EkeiB9vDy?zga1A82VY@nyLQA(v<w1JQ9V^4Hz
zS)f^!VDt!JR~C<*9_?tTeV;fII`${`T#y#5T8YQky(-{{MC(==fZ||YcleVnxpK*X
z0oG!Ck~UmYcH}Do(rW|d?g)z~D3j62<gYhrb3qDoh#G$i-31)Ol~t4#!4wyFF!7j}
zD>(aUUQ!SfYC>UJ5A?GnBIIFeWILpb3)O>$;K=tycn|(BC3o^}5irsHY{R-3?dz+6
zWG(8oE%+LoRfS~)H69S<7E5RWc27~Qr*Xf?tKizT3Ya%&-&p|yWP+b`3A30@J3l70
zzZGzhyrKOvDWJk(LaU(}g=YTDu5*xEXr%FoGH+K{<Oz2|2%oLlV0v3QBGn!{XzjYZ
zGEgO%X)J}5Etd#z`^<F7wnbjF@d|es@>Dr$;j7ekof-f_-Wx)m6I_m2qQrKchNDTO
zeWN*;$?Z+wT#e)iGw=MgTRnWPO@#^)1+4;gGX=-g4yXv<R!s?2lv>pZfrSe5g|sU%
zt{T@)veVSrju3vu_kVT(l5R(sxTU}KiXsuXi#Pqsl11+25=4XyFpsjXm?u^b2O$9`
zigxpZnZ!hMxFgkJo7OnaL50j~5;NHe8uHi;VSA`qN$y5+kWwS5pyp6sV`3E<4PIE?
z8j>4mezL{$ru><2+v8o<U{B*Ay0525&*~j)jzpknD$)r<cHf_;Lq1I{XCkq3Ar<ej
zsu`DDX_jIkB2@xqq1@c@2|tKb7pDp<<>6uef=0;$qQyrm9v#|)3}T(KfLz}Yf}rJi
z5ijSwM4ZrGz#lGCtuEPB&2`Kl;*e$GXYeoHX5=!X=E4IyXMZIk2?4Ks`D}5gxLI-f
zUTk=y$GkB~CMn#+Qmr%Yq+sTfn=$Up4TGzdE&OZ5eI<Za43jT#vFj$pPt)tCR}GRr
zo$^;}eRz=^0b$B%OuJ1g-XLm$IRF*k@Huz7?8-5-eKn>+lPRI8X2_nTYC8?@P?!?V
z>4^bDWzof`K3syvLXd%`{aSt^_B_l^SK?z`a@{R9VwBCH<XL<X9$$BBMzOi2vVm7_
z;QZEN_>3_f9bTj*0$n_2CCn3Xk(aDo3`#GPMTigzt;QJMWHk!Y&13YgKQq!-+2U;4
zVn$shlkU0%?20opsB^5dN^r+BzT;Z*QyHN>;uzh*uDB+_iykw>6g_V(c=5W$idqjh
zv^d#99vju;w^`*(35O9@Vi`vTH!m}|Pzq#fGLTrLArGW;RRO*jl~h|awWw*Y+31yt
z84J2M$=M;Llx?0(Kv@#Sr`oqO9x!Y}fsT2bo0N=kReNQOs<S(#NPfIU-72j?DdbF~
ziz{*t`PoM7T^~f0Ytz&aA|VMK!BQU2l+Qv*$MfIG3`AHZyfTq3c4AXa)G8zTio=ua
z{f&7Tw49`Ha|MBF$?yWjEH!;Fbl_4|yB^E&EhLLNd&DZptO2*uHq!NPCD(LR1=xEl
zF4wLjM`7bwgxcUz)g<G}8oh-eZjo(ID#%aF07~3d*uA2+89(jit=uqOfz}ZbC~%3Y
zOk4IT2uXU1pZn6Km@>t;b<<o(Mpop!_Zepv181+~Vb}%MI=PgE;C&joWM6bvi3%6Z
zC63pmSMy6}_$*7cH1E|5@lYx4t25jIKzz4L)YxSX5hxz#+EL`wO%tv&s$uwz)D7ui
zC8`@2U;Tk-%c~=|^~oh(Igcggl!C!#(^wSG+!TIP)A(m(o55F6+@8WH-DFPgKf2mt
ztFR`|!kjuS$uLBjI~Nly0yE1oKFbnYDx#*EVz10*+S{1sxJ)t)W4dCdHzUqoC@Arn
zr)CUCxDdB_W?l+d;*9yi?IrMwDP1pAO9kx}&nfB-R+U8ToEF5QT;-5hLkn)*Mtf>+
zA#@#-t*p53B*wN<wSJ;Q?(=oUG5a(_7Rl+q0ei4uV1u;3X6o5b6PWdW-m5szgwJn}
z7=OT!Y3T(Wzos5YH;tp7{QgzbK+>wmbeK`Nt@zniaV!sZg3_T;c+DGIW(Qi7rb^{T
z#ZndLR}$}ub)4;}2E0DO^@EgSXm}bW%|iXfRJ?Np{bUB_ck@i`Y@wu|>?}WnWx-(S
zFD3AJB&<<?8J4#movl7C;>1q(n-O1}Mm&E?sFa#`WP;nJ5M;Y6w_dTr8%d;Q#RU~b
zlxzP%_GFUE@VsXj`7LdrDPdeq<Wz~q3tK+~mg-s{t!L~LxH+yZoOp6ATEF?N1p%~n
zA`5N*^ZGPiCY)$`xn?-t`!#z8iMK1psb#qgPtxTU1aEmWo`>xeKfkM4beHA<CjRrL
z!O6URls3i7=$cLD8$2LJu_i^S<O(Wd(n5iId0xkLM4nAaJdRx`GcBFQqfEtuX-9xt
z&O}P?9oWt}<8y)f<MG+-LPTe`lh9-P;<n5U@sEQX8%j;n(69;EFkgVqL3Kz0<Pj%0
zdJA?Q<T1|~m)amXpb3{mvzsggyE#yqFovrDG_df%LvbvOh$6m`XAvxzL#R|QsxhB#
z?}5h9<ZAnxLi5DF*fcYXB1EJiScI~3HI)djX+OfKBWSfbq(M+xNuivrf0j9TRl2=T
zoI-vy`1?<S=MK_^Ae+hT$Ng%|RI9@ZzBZn(R;&tyM$3iOW~)@trU19a<w#CdoaV$*
zR-MG%9JE4d;^ZpPmRU^s2|XpqN#TNolEd=EvxQCqV3Oyu_Cl6R2ZVdhjWBedAj(ba
zPoGe6@&jtCY&fTIcM?R1p)b*zSZI{h#H5;;I^V<(Zr+j^C%ZfFv)m6`d3=n8rJDy6
z5(-(C&UZfHnM9rHcqy`fYSJ)WFJc}dL}Ur8yAvucL9^IcHB2>)uih}MF&j{@z-tmf
zZ)Gf4?PRw>c23~&EFcd*#;z%Xd~=JIxR53-%k*&(6KX9SK+BsRw4>&d?Ny*+%^2Uz
z7WG*VK`l9O{0><OXp9!1oJ&Ai7U=#yQapM#|BG}^&+eB5GX3Vh5O-86Xhvx#C&*`D
zvR%EYbL=M9fS#x!UOoJ2ISF=t+cq#Ot7??~0xJ_Tx-T$%Hu%A%dnmA?Oyx;$?z?I@
zGi^9L2bg>8MPW7f*t73z2VcbH@XYG<PT{rK&!Iat5GIYbt2iruZR=&#xbj)boNXnN
zeI}j8sOHB@cCmJmK;MXoO5&-uLVkq~4v|_KuF?|BlHvJj>EQ$Gj`CGDf`l~fHeDR$
zosk{cE~!|#)C2ZrFwddhehnVa;B0#TJRLt+cp6KDzRjf01Lw<&|4jrT1SX+<DQ_s_
zE~Oc}B_$lh6i;z9yHme6rC1SKk*0=mv^tV8MGY^2T%&C&Yna=!QR04os=K$^f=Tg2
zRaU`42R5kbr&tl;Nu)-<$~Vz06<H7clY1MH0K40_8nS7(^@|EKl}K~Fk#OXzS<13Z
zkPvc|U^T<}3h}~<@iiY#HI)82;cB*f#V*7Jt~!qM;bZpDDjbwOQ8|Qj4+3SGnDA{U
zi9utfv*<&ir7C_zNUHj4gzzwrH?Vy5_P8n46ou7?MM0rD_{Iukz&t5XJt1kr;ZI;z
zDr05NS~b+U5noD)+C}hKY+S1xWKdWxx8p%9t-K2t7kavk$r3x{3|Bdy!wn<lNWGz3
z_AV5#o-F%rd=X|&Mh9{59g9|HX|u9?i9qVwYB>IpSUsBKG_*$PosHi7@;!aYLtY_1
z=j^1KKIEaaQ?v>4wVinqJC%JU@nv%RpQvn-(xSzbGqUu3-4n71#oS}Zpw<Dk^g!Kl
zy69K-c=kEy7L!|fZ;y3HHlv2s7&oKVISSt`p(GhK)2DNKx*ro;$@vh2nuFEHQiI4j
zNL6fU4a|#-43|)_;jz(iml_?9az$m?*TY6%84(n|jiDmnVs)kS;nH9V*n0r^&UCr?
zIp!L9jeuQ1`=>anp37%WJ@FTKns~B#7&7G*b1!2Fhqqg|grxBVc=l?F>%2!`M;E${
zD0rUHJdcvF((t)rhYT!9Nu^M!4@-rYp1A#>d95}TKAl3$e?<i1EoYOmz)J`1d`DKG
zZ^@fcKHd@-lw2<XE-wTqaA~MMzbOLH*ssD%&{j+`g&rQUB<FffKpl?0vc0r;(ga}C
z@#p?9+&6G_Wx|osY6TeXk}Ed@CyA>Vu=qPlI4)=4&X%qaBx5(BIkpI_62hYb`Q+2+
zymrIDU=8#!$kq!<44oa~+a}CWEq$1yq0TCLed*yz8RhSIU`-lWF3mnq>*h@xhv@F`
zLt<$^1n%_j7%5KN0CS%zQFfROIGV>zR`dSJ;cIf1UVq`OnaGS~*6d*DL5M=+G-G07
zz0W={?`;P^Bm=mS^AItuq~f~{`0@=&GqrWRJs4%`qNVNAv-?ee4Zq_VH$CWP(f(Je
zaV}c0vVjy2D1+Ty9lu0b>*P>+(sF)PGbXPidd>_Cv|E8uMq)LIsiWwFlAK|iPC()|
zjl(j0p^_SlB*ib0mL|1qcI?Fq{UjY4aCf1$11C1{Rx5wWGn{-NJLeW-l(y&CjBc#d
zLm1$zFT-e2)@~K6n^ui}i%Ad)DK?;jWK)eubka&;UPL&Qlv9+Dz*>Vw{>8>maJIH$
z0^_kZwE)>!;2!usIXu0{_2LZw`#8ZnLAz&%HG3FulJVE$)x+CYS_+~YG=KNz_b|j-
zvdy}Zdn=;&RJ~>R5UD-dz{|mq<7KX^Vrms-dl@1GW@4%XTBf<c$u+5x0qigF858Z6
zw6nMAxyW9=4HGB^Z4*z?TOez0K{Xr}H}89&*T%HljB1#B)!t5|cK6Wz(&@k5X{Atj
zi!~}JQs#W@Ij@@XldMx?JKjQBSZ0MyxKatwelL=uAd3@;r5;IF8nH4!8ErKVc!A9f
zdPwtN?10$+iQc-X-1DZf^MK^+mNjM{38))^IbeO(9gnD}=f00HMOLr)np$cm7o5(n
zU77aXIwNMUC_+&pc@wdOK9U?Jsbm=<uq6X~%(pF&!Sb6CxYS0X5T}BGOsjHzkJHLy
zIw;s1cFa4+w!d!+RNm&QuMhMMdsb~3q$p9kEcymRyQK_9rV2QDt|gIb%Ea7TzQu3|
zrJR_5$`}dtrn11cEmFaDqYXXzv6Go}aij(ug9eld$IDG=O(F}M{1B-Tf82hC=3On!
zMOxn@<oB*CLETKBT~I<W=akx_YGI9n!K9kcrVv<bml=AJ%NXf}3N@C7JI$&2ajX6P
z70a9Ccu2w$bFrsQhMyBu`*?8Kd~{MWmDyFk=J1267GvT{qr-klDI&$$v+PYn7I-#>
z3b5mnDf6U9m5W4N)AJxaNYaM}=w;^9M+zNbq#HVsK&(}o>r^(T8yJlGxq<SV8Igcg
zcwH5%eyW42TwNJg>mxTL9|<ObV0f<lc{;-|9m5+3>mn~Zdy*jeQg?1Y^Xz;pxU#_)
zKp)R10p#|vE%7G3l{S72-iu5b)3<bqr5iRR8d}`zKpx`+I9^$?IfMSO)(hf}As6w)
zUiXAeq27Zfx=aQ3$ufu+o3fJm7cm+$3X)nPIA)>als_vi!%O!9FfQNr8GU$vF(E|F
zlzzVFt(*X*`Ryq^bXuwL0DVVglC=m7GsU<D=12iCc`EUj*7J_-9Xrjq>*M*-q`1#d
z%QP(1HJ_4(T~3b{DvC)hOs7j039w5DmiGno->13w?SY!|`a4B#Led?F+igG^evG#$
zf4q0|VuQke7E(=V3W|oph{j_AR=sg~sOj33JbFD33+vGGGl_e#Wu-3+)+de}4~cg)
z*i36j^=K{XkphexQ3DW=)r?T^C0lT70m3WbrXPD7bXf~BcidYWX8iGT^9R=BVc(U+
z4DLhd++-H<zs6nBK&O}_voy|{)_q1ptYa$nQL(IC31C(yChvnkyQ(t^(lyC)$TXr(
z2bmvcC5CB@X~ufT5qS}ZdAAQ)a$q%#f9@@tl1E6o#uu>5UDcK5xd2P+qcfq#1*Gt9
z{W|svtMFlK8BZntp1oK0BCtVOzMnRU9EjPiXae!88>~K+PSwmJ@~emj<U#6Ca!S-S
z*O?&jCoH;EI;q}E^X=Eo>iAt7l55L5zUwD-MSeH`R9LZ9gSIHJBLTq%!qkDu*u5~Q
z_2B?7HA@q2iOjwyn?-R{KNhRwFhfZcmqjc*h4S)om$qiB7E^yVhZgW=u;Wj*hSV88
zviKf|>iqfl_H@AXN@t@do<M{Mw^FEASp!<-<N_<p7Mh8%)K!nks7D;;4qt7E`@CRI
zZ|iv-)pt~s3mKJB4M|T%2a9phP-S?mQHV32Ss8$5%D_c~i2Z%h9GY_48;1JqLxwCF
z4E%Y~HDj!mXX0{f!k8`|&IhFfZtzN5-Ncm@u6k5DJ|+@r(-Y1h{L}n>!(~TgNOF1p
zgLDtRx9eH~lKwM<n%)>1kxwuCQE3{F5~Ag2zX}Gn@}boCs}ieYcVVtP`(I}{5p5l%
z(|LxIW-zYu-suI?c3_1}!}@rukgf=*KhH5CU)i<C+)^>Mhh#SQ0kIH>IE~?jpZdfC
zj~`1`l!S9ra#hJs*M+3{&j!nw6fkq<-iCRkJUS^Iz!^@q<h9;+TfQ-Q3``DBt-&NP
z2@H|O<b~|H5xP(8#};ef5w#nDlitDx1%x!ojNYXpx+{BR#t_v?(+|SX$Ra!rC>U`@
zlr8YNAjtuIx`sV1?ekD&$cPU!=U5N?>r=&K2(Q){*EUhGwZUK1jvw&Um>P@AhIj&O
zL&#IduDyga>K^_5F`LW6v9y%uJ&-H7Y4{&m$h?}A!DAQGvGG}?-!`<dPuaSFk_ivQ
z2N<Iv8%L@KMF?0ldtD**HOTcrds-TjK<C?|0uk?f9G32Qn+kFZd1n{)9{@o5oqL=J
z3LY48D@geh3#6)@b5&lI4U$X4Z1X}S?J>?gRB$Vi?jQ}t+<UGAJDcy;O)uO_=Imx1
z4*KrJ{9;UR??I2R2MiLef(Zgt`**n8-9%L66k0Skh>!k2|LN*0{V%@KkRNUoN~R{3
z&Mv<>_e%ZCk8u9;NB@7u(|@>D|1<i3cjEtUI{j}>{@=}p|J}*|#b|gh=2?IrdcRrc
z!>O9!!?EVW?G;E_L|XQr?!xpQwl=DX8&)7ph@n4VeZvvGESJ!w5>M4ckiahDqq^d<
zH1USXPfVHtbiNN}>Hv?ljO^?ur_!Y@G%+7wa2NKJhmjmq1D3KGJ0(pgzqQ1|cOTyc
zoT5M~h;QGJjY4{Hn*0^Pi=D3dL?IHnkqIo0q*o{jO+s>u&Ljf`DUoz0Q-~2EmWnMH
zJOCO7J8-B5ZHWOR_AKU_1s@M*v55+R5;YERBmjOmttS^-y`&l_v6olTCnGtgPe(0i
zfk)`Ch{P8QdXbck#SB#nI0xot*O|u|7&)hn(lz*7wE!xm`pPO)<Jd36SZ9z>J^i1)
zxk_Ch9(g?TdKBu?sg;Eo56F5S|MG+9B5!wzcH$KZiop|I0=?|<4n|B(Bzv}24_(H>
zS1vFf#;<~}opB4pYU5fnVawj-%C?jP#VC1*!@Lcsr*q0yLk>~7<ci<e*b{bV%p38V
zxp<cy+C}(J!<8K6M*+*e`}c*92AKJ12$T=i{%|?}@O*aBSMhW(b=Li(F{)>K<@y;v
zL2Pp)|3G}&EZGY{v}yr8hw}jb(rzoVD-y{O+Cs5r2jw+NH}m8D=lA|Pk23n?dN`gw
zzop=hUDNu`7>Cq0@4&sCYs1IKxMWqlL!LfrWc{W|GqQM33}Q#w!vr3w*HTe&R{hol
zztb0UTM*bf7bmuSD=D}ita~ewTq)QaY4VeSUL8|<OR)h=T-FL!Rl!I}^wPw)`M2Gp
zt33|)4S~pI<S-0$$*4wl+Y*WTQ3^<Scv_pMy7hGUE0f9ZV5d(u3-;Gy*3&I7RkZ{P
z(!e07K>w3XJn2U!{`esNLw+}nhxyZX7zhX$2ongA0SRxyasv1-4X6T8c77cH9{lgt
z^1lbC`T+dqNdMmr+uwm#_#T*l0RPhe4)}K`@!x@F{~q|qJn=hpyKDc?TK%Qd+ckfy
z<-bBHfPROT{d?$NhW5XM0}xjK1pSBpmR^3K|H=0LFEHT;^!)!0R#ud;bTOq@x3p7I
zp?7eycX0l_DDSD|y;;^1zyi)Ie-`O4{k^6CH3uaBB?o|y0rqcN`j0vGcj%Ss(Vwut
zG(qIwC;q=e&;Jk5kGc7GXg=u4pU}VbYtny0|4RDbt>S-AIvwc$WE}rHCjw1`E&C&*
zggmEz^8V6)Wb}VB1^=A`_;5P=%Od>u$O#nv)Z-t6B)?$vPgSV<2jP#%f7Rgcj%mL~
zKK|%izxk*A9-NHGPcHeR*ud;bJb&oxq0gWCd$Ip+Wc7RS8jSy9YxR3@1z0SKKT5tW
zL-3~}dU=8War}EP`}>mOui$@7R)Jpsu>|-%@Rbq{-JkQuKlLkU-JePSJ@DU`A-@MM
z{m;Pvc9O~pruh^0PyPDXO#a95@34OzD+K>#tZe=7uz#JP6b|qIQJa72Hh$0FYWKeb
zalQW|ZU0^E{&ipiB|rWN_)DiP`u;zGn*Rp)FN5-{;Pan=zf=Kv@IQcmb?Lt^tNv=g
zKW4(z58%HnvVQL%<dtKe6F$1L1NyH&1OKJJck90|7ybbN{_`J^!1uphJp2yX9(0`S
h{pbi^>;D1yOBJNSAwG%-g#7W1`B);8`TcS9{{TnvNsRyi

literal 0
HcmV?d00001


From 31856a35b9025fcaad2b528480af1a6757124ee8 Mon Sep 17 00:00:00 2001
From: mistachkin <mistachkin@noemail.net>
Date: Fri, 27 Jul 2012 07:13:25 +0000
Subject: [PATCH 08/36] Add tool to build the core DLL for multiple platforms
 using MSVC.

FossilOrigin-Name: e42f5812f142522852f6dc72430bc7afdd6f2ed3
---
 Makefile.msc            |   7 +
 manifest                |  13 +-
 manifest.uuid           |   2 +-
 tool/build-all-msvc.bat | 331 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 346 insertions(+), 7 deletions(-)
 create mode 100755 tool/build-all-msvc.bat

diff --git a/Makefile.msc b/Makefile.msc
index 03872d7de8..8e1a36cf8c 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -30,6 +30,11 @@ USE_NATIVE_LIBPATHS = 0
 #
 FOR_WINRT = 0
 
+# Set this non-0 to skip attempting to look for and/or link with the Tcl
+# runtime library.
+#
+NO_TCL = 0
+
 # Set this to non-0 to create and use PDBs.
 #
 SYMBOLS = 1
@@ -345,8 +350,10 @@ LDFLAGS = /DEBUG
 !ENDIF
 
 # Start with the Tcl related linker options.
+!IF $(NO_TCL)==0
 LTLIBPATHS = /LIBPATH:$(TCLLIBDIR)
 LTLIBS = $(LIBTCL)
+!ENDIF
 
 # If ICU support is enabled, add the linker options for it.
 !IF $(USE_ICU)!=0
diff --git a/manifest b/manifest
index 3444e28ebb..569844a12f 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Add\stool\sto\sgenerate\sa\sVSIX\spackage\susable\sby\sVisual\sStudio\s2012\sRC.
-D 2012-07-27T02:36:06.349
+C Add\stool\sto\sbuild\sthe\score\sDLL\sfor\smultiple\splatforms\susing\sMSVC.
+D 2012-07-27T07:13:25.700
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 8f6d858bf3df9978ba43df19985146a1173025e4
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc a2a8fcd4104a67e037351323c88e0e4822596926
+F Makefile.msc d598bf4a464d2e9ecbeeea809969c2ac3bf97359
 F Makefile.vxworks 879f034a64062a364b21000266bbd5bc6e0c19b9
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 F VERSION a71848df48082f1d6585d4b0819d530fc455485d
@@ -966,6 +966,7 @@ F test/wherelimit.test 5e9fd41e79bb2b2d588ed999d641d9c965619b31
 F test/win32lock.test b2a539e85ae6b2d78475e016a9636b4451dc7fb9
 F test/zeroblob.test caaecfb4f908f7bc086ed238668049f96774d688
 F test/zerodamage.test 0de750389990b1078bab203c712dc3fefd1d8b82
+F tool/build-all-msvc.bat fe0f031dce6881469b0949283a3cfa8a93032eca x
 F tool/build-shell.sh b64a481901fc9ffe5ca8812a2a9255b6cfb77381
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
 F tool/extract.c 054069d81b095fbdc189a6f5d4466e40380505e2
@@ -1007,7 +1008,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 84163b633f01f35cb47495c05dd2b640159677ff
-P d8da26f1f43610ac83af2a5d0e170be5abaf7aaa
-R e89b8d51f4ab3734c03bdfc7ca67399b
+P 8b90e0c4dbcedaf3e61c5d49452997705be1ef98
+R 352e3b46f2ff977e05b0828462f57f7b
 U mistachkin
-Z ca7c7ef3778a69af10a33d78de2dc884
+Z 1ba4e6125d90314090d1c67374bcfabc
diff --git a/manifest.uuid b/manifest.uuid
index 364fa66bed..73ae6a4e94 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8b90e0c4dbcedaf3e61c5d49452997705be1ef98
\ No newline at end of file
+e42f5812f142522852f6dc72430bc7afdd6f2ed3
\ No newline at end of file
diff --git a/tool/build-all-msvc.bat b/tool/build-all-msvc.bat
new file mode 100755
index 0000000000..c5c10d0905
--- /dev/null
+++ b/tool/build-all-msvc.bat
@@ -0,0 +1,331 @@
+@ECHO OFF
+
+::
+:: build-all-msvc.bat --
+::
+:: Multi-Platform Build Tool for MSVC
+::
+
+SETLOCAL
+
+REM SET __ECHO=ECHO
+REM SET __ECHO2=ECHO
+IF NOT DEFINED _AECHO (SET _AECHO=REM)
+IF NOT DEFINED _CECHO (SET _CECHO=REM)
+IF NOT DEFINED _VECHO (SET _VECHO=REM)
+
+%_AECHO% Running %0 %*
+
+REM SET DFLAGS=/L
+
+%_VECHO% DFlags = '%DFLAGS%'
+
+SET FFLAGS=/V /F /G /H /I /R /Y /Z
+
+%_VECHO% FFlags = '%FFLAGS%'
+
+SET ROOT=%~dp0\..
+SET ROOT=%ROOT:\\=\%
+
+%_VECHO% Root = '%ROOT%'
+
+REM
+REM NOTE: The first and only argument to this batch file should be the output
+REM       directory where the platform-specific binary directories should be
+REM       created.
+REM
+SET BINARYDIRECTORY=%1
+
+IF NOT DEFINED BINARYDIRECTORY (
+  GOTO usage
+)
+
+%_VECHO% BinaryDirectory = '%BINARYDIRECTORY%'
+
+SET DUMMY=%2
+
+IF DEFINED DUMMY (
+  GOTO usage
+)
+
+REM
+REM NOTE: From this point, we need a clean error level.  Reset it now.
+REM
+CALL :fn_ResetErrorLevel
+
+REM
+REM NOTE: Change the current directory to the root of the source tree, saving
+REM       the current directory on the directory stack.
+REM
+%__ECHO2% PUSHD "%ROOT%"
+
+IF ERRORLEVEL 1 (
+  ECHO Could not change directory to "%ROOT%".
+  GOTO errors
+)
+
+REM
+REM NOTE: This batch file requires the ComSpec environment variable to be set,
+REM       typically to something like "C:\Windows\System32\cmd.exe".
+REM
+IF NOT DEFINED ComSpec (
+  ECHO The ComSpec environment variable must be defined.
+  GOTO errors
+)
+
+REM
+REM NOTE: This batch file requires the VcInstallDir environment variable to be
+REM       set.  Tyipcally, this means this batch file needs to be run from an
+REM       MSVC command prompt.
+REM
+IF NOT DEFINED VCINSTALLDIR (
+  ECHO The VCINSTALLDIR environment variable must be defined.
+  GOTO errors
+)
+
+REM
+REM NOTE: If the list of platforms is not already set, use the default list.
+REM
+IF NOT DEFINED PLATFORMS (
+  SET PLATFORMS=x86 x86_amd64 x86_arm
+)
+
+%_VECHO% Platforms = '%PLATFORMS%'
+
+REM
+REM NOTE: Setup environment variables to translate between the MSVC platform
+REM       names and the names to be used for the platform-specific binary
+REM       directories.
+REM
+SET x86_NAME=x86
+SET x86_amd64_NAME=x64
+SET x86_arm_NAME=ARM
+
+%_VECHO% x86_Name = '%x86_NAME%'
+%_VECHO% x86_amd64_Name = '%x86_amd64_NAME%'
+%_VECHO% x86_arm_Name = '%x86_arm_NAME%'
+
+REM
+REM NOTE: Check for the external tools needed during the build process ^(i.e.
+REM       those that do not get compiled as part of the build process itself^)
+REM       along the PATH.
+REM
+FOR %%T IN (gawk.exe tclsh85.exe) DO (
+  SET %%T_PATH=%%~dp$PATH:T
+)
+
+REM
+REM NOTE: Set the TOOLPATH variable to contain all the directories where the
+REM       external tools were found in the search above.
+REM
+SET TOOLPATH=%gawk.exe_PATH%;%tclsh85.exe_PATH%
+
+%_VECHO% ToolPath = '%TOOLPATH%'
+
+REM
+REM NOTE: This is the outer loop.  There should be exactly one iteration per
+REM       platform.
+REM
+FOR %%P IN (%PLATFORMS%) DO (
+  REM
+  REM NOTE: Using the MSVC platform name, lookup the simpler platform name to
+  REM       be used for the name of the platform-specific binary directory via
+  REM       the environment variables setup earlier.
+  REM
+  CALL :fn_SetVariable %%P_NAME PLATFORMNAME
+
+  REM
+  REM NOTE: This is the inner loop.  There should be exactly one iteration.
+  REM       This loop is necessary because the PlatformName environment
+  REM       variable was set above and that value is needed by some of the
+  REM       commands contained in the inner loop.  If these commands were
+  REM       directly contained in the outer loop, the PlatformName environment
+  REM       variable would be stuck with its initial empty value instead.
+  REM
+  FOR /F "tokens=2* delims==" %%D IN ('SET PLATFORMNAME') DO (
+    REM
+    REM NOTE: Attempt to clean the environment of all variables used by MSVC
+    REM       and/or Visual Studio.  This block may need to be updated in the
+    REM       future to account for additional environment variables.
+    REM
+    CALL :fn_UnsetVariable DevEnvDir
+    CALL :fn_UnsetVariable Framework35Version
+    CALL :fn_UnsetVariable FrameworkDir
+    CALL :fn_UnsetVariable FrameworkDir32
+    CALL :fn_UnsetVariable FrameworkVersion
+    CALL :fn_UnsetVariable FrameworkVersion32
+    CALL :fn_UnsetVariable INCLUDE
+    CALL :fn_UnsetVariable LIB
+    CALL :fn_UnsetVariable LIBPATH
+    CALL :fn_UnsetVariable Platform
+    REM CALL :fn_UnsetVariable VCINSTALLDIR
+    CALL :fn_UnsetVariable VSINSTALLDIR
+    CALL :fn_UnsetVariable WindowsSdkDir
+
+    REM
+    REM NOTE: Reset the PATH here to the absolute bare minimum required.
+    REM
+    SET PATH=%TOOLPATH%;%SystemRoot%\System32;%SystemRoot%
+
+    %_VECHO% Path = '%PATH%'
+
+    REM
+    REM NOTE: Launch a nested command shell to perform the following steps:
+    REM
+    REM       1. Setup the MSVC environment for this platform using the
+    REM          official batch file.
+    REM
+    REM       2. Make sure that no stale build output files are present.
+    REM
+    REM       3. Build the "sqlite3.dll" and "sqlite3.lib" binaries for this
+    REM          platform.
+    REM
+    REM       4. Copy the "sqlite3.dll" and "sqlite3.lib" binaries for this
+    REM          platform to the platform-specific directory beneath the
+    REM          binary directory.
+    REM
+    "%ComSpec%" /C (
+      REM
+      REM NOTE: Attempt to setup the MSVC environment for this platform.
+      REM
+      %__ECHO% CALL "%VCINSTALLDIR%\vcvarsall.bat" %%P
+
+      IF ERRORLEVEL 1 (
+        ECHO Failed to call "%VCINSTALLDIR%\vcvarsall.bat" for platform %%P.
+        GOTO errors
+      )
+
+      REM
+      REM NOTE: If this batch file is not running in "what-if" mode, check to
+      REM       be sure we were actually able to setup the MSVC environment as
+      REM       current versions of their official batch file do not set the
+      REM       exit code upon failure.
+      REM
+      IF NOT DEFINED __ECHO (
+        IF NOT DEFINED WindowsSdkDir (
+          ECHO Cannot build, Windows SDK not found for platform %%P.
+          GOTO errors
+        )
+      )
+
+      REM
+      REM NOTE: Invoke NMAKE with the MSVC makefile to clean any stale build
+      REM       output from previous iterations of this loop and/or previous
+      REM       runs of this batch file, etc.
+      REM
+      %__ECHO% nmake -f Makefile.msc clean
+
+      IF ERRORLEVEL 1 (
+        ECHO Failed to clean for platform %%P.
+        GOTO errors
+      )
+
+      REM
+      REM NOTE: Invoke NMAKE with the MSVC makefile to build the "sqlite3.dll"
+      REM       binary.  The x86 compiler will be used to compile the native
+      REM       command line tools needed during the build process itself.
+      REM       Also, disable looking for and/or linking to the native Tcl
+      REM       runtime library.
+      REM
+      %__ECHO% nmake -f Makefile.msc sqlite3.dll "NCC=""%VCINSTALLDIR%\bin\cl.exe""" USE_NATIVE_LIBPATHS=1 NO_TCL=1 %NMAKE_ARGS%
+
+      IF ERRORLEVEL 1 (
+        ECHO Failed to build "sqlite3.dll" for platform %%P.
+        GOTO errors
+      )
+
+      REM
+      REM NOTE: Copy the "sqlite3.dll" file to the platform-specific directory
+      REM       beneath the binary directory.
+      REM
+      %__ECHO% XCOPY sqlite3.dll "%BINARYDIRECTORY%\%%D\" %FFLAGS% %DFLAGS%
+
+      IF ERRORLEVEL 1 (
+        ECHO Failed to copy "sqlite3.dll" to "%BINARYDIRECTORY%\%%D\".
+        GOTO errors
+      )
+
+      REM
+      REM NOTE: Copy the "sqlite3.lib" file to the platform-specific directory
+      REM       beneath the binary directory.
+      REM
+      %__ECHO% XCOPY sqlite3.lib "%BINARYDIRECTORY%\%%D\" %FFLAGS% %DFLAGS%
+
+      IF ERRORLEVEL 1 (
+        ECHO Failed to copy "sqlite3.lib" to "%BINARYDIRECTORY%\%%D\".
+        GOTO errors
+      )
+    )
+  )
+
+  REM
+  REM NOTE: Handle any errors generated during the nested command shell.
+  REM
+  IF ERRORLEVEL 1 (
+    GOTO errors
+  )
+)
+
+REM
+REM NOTE: Restore the saved current directory from the directory stack.
+REM
+%__ECHO2% POPD
+
+IF ERRORLEVEL 1 (
+  ECHO Could not restore directory.
+  GOTO errors
+)
+
+REM
+REM NOTE: If we get to this point, we have succeeded.
+REM
+GOTO no_errors
+
+:fn_ResetErrorLevel
+  VERIFY > NUL
+  GOTO :EOF
+
+:fn_SetErrorLevel
+  VERIFY MAYBE 2> NUL
+  GOTO :EOF
+
+:fn_SetVariable
+  SETLOCAL
+  IF NOT DEFINED %1 GOTO :EOF
+  IF "%2" == "" GOTO :EOF
+  SET __ECHO_CMD=ECHO %%%1%%
+  FOR /F "delims=" %%V IN ('%__ECHO_CMD%') DO (
+    SET VALUE=%%V
+  )
+  ENDLOCAL && SET %2=%VALUE%
+  GOTO :EOF
+
+:fn_UnsetVariable
+  IF NOT "%1" == "" (
+    SET %1=
+    CALL :fn_ResetErrorLevel
+  )
+  GOTO :EOF
+
+:usage
+  ECHO.
+  ECHO Usage: %~nx0 ^<binaryDirectory^>
+  ECHO.
+  GOTO errors
+
+:errors
+  CALL :fn_SetErrorLevel
+  ENDLOCAL
+  ECHO.
+  ECHO Failure, errors were encountered.
+  GOTO end_of_file
+
+:no_errors
+  CALL :fn_ResetErrorLevel
+  ENDLOCAL
+  ECHO.
+  ECHO Success, no errors were encountered.
+  GOTO end_of_file
+
+:end_of_file
+%__ECHO% EXIT /B %ERRORLEVEL%

From fd0ba2aa22f3c78151c3be0f0841abf8a8e2b324 Mon Sep 17 00:00:00 2001
From: mistachkin <mistachkin@noemail.net>
Date: Fri, 27 Jul 2012 08:21:45 +0000
Subject: [PATCH 09/36] Modify the multi-platform build tool for MSVC to
 support the latest RC version.

FossilOrigin-Name: 95b65883bbf476a17f09ff978df4f51af615baab
---
 Makefile.msc            |  6 +++++-
 manifest                | 14 +++++++-------
 manifest.uuid           |  2 +-
 tool/build-all-msvc.bat | 38 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/Makefile.msc b/Makefile.msc
index 8e1a36cf8c..76f368f3e4 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -80,7 +80,9 @@ LD = link.exe
 #           "NCC=""%VCINSTALLDIR%\bin\cl.exe"""
 #           USE_NATIVE_LIBPATHS=1
 #
-!IFNDEF NCC
+!IFDEF NCC
+NCC = $(NCC:\\=\)
+!ELSE
 NCC = $(CC)
 !ENDIF
 
@@ -90,6 +92,7 @@ NCC = $(CC)
 #
 !IFNDEF NCRTLIBPATH
 NCRTLIBPATH = $(VCINSTALLDIR)\lib
+NCRTLIBPATH = $(NCRTLIBPATH:\\=\)
 !ENDIF
 
 # Check for the Platform SDK library path macro.  Othertise, this
@@ -100,6 +103,7 @@ NCRTLIBPATH = $(VCINSTALLDIR)\lib
 #
 !IFNDEF NSDKLIBPATH
 NSDKLIBPATH = $(WINDOWSSDKDIR)\lib
+NSDKLIBPATH = $(NSDKLIBPATH:\\=\)
 !ENDIF
 
 # C compiler and options for use in building executables that
diff --git a/manifest b/manifest
index 569844a12f..d2a58a13a1 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Add\stool\sto\sbuild\sthe\score\sDLL\sfor\smultiple\splatforms\susing\sMSVC.
-D 2012-07-27T07:13:25.700
+C Modify\sthe\smulti-platform\sbuild\stool\sfor\sMSVC\sto\ssupport\sthe\slatest\sRC\sversion.
+D 2012-07-27T08:21:45.506
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 8f6d858bf3df9978ba43df19985146a1173025e4
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc d598bf4a464d2e9ecbeeea809969c2ac3bf97359
+F Makefile.msc 21c3e04a68386c867a362f6332e8c3c15e4bb237
 F Makefile.vxworks 879f034a64062a364b21000266bbd5bc6e0c19b9
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 F VERSION a71848df48082f1d6585d4b0819d530fc455485d
@@ -966,7 +966,7 @@ F test/wherelimit.test 5e9fd41e79bb2b2d588ed999d641d9c965619b31
 F test/win32lock.test b2a539e85ae6b2d78475e016a9636b4451dc7fb9
 F test/zeroblob.test caaecfb4f908f7bc086ed238668049f96774d688
 F test/zerodamage.test 0de750389990b1078bab203c712dc3fefd1d8b82
-F tool/build-all-msvc.bat fe0f031dce6881469b0949283a3cfa8a93032eca x
+F tool/build-all-msvc.bat c739e5376cf8519ea7a9dce7e3f0c45f16a607f9 x
 F tool/build-shell.sh b64a481901fc9ffe5ca8812a2a9255b6cfb77381
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
 F tool/extract.c 054069d81b095fbdc189a6f5d4466e40380505e2
@@ -1008,7 +1008,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 84163b633f01f35cb47495c05dd2b640159677ff
-P 8b90e0c4dbcedaf3e61c5d49452997705be1ef98
-R 352e3b46f2ff977e05b0828462f57f7b
+P e42f5812f142522852f6dc72430bc7afdd6f2ed3
+R 68817282cd6637b6d21e0b351abec1b7
 U mistachkin
-Z 1ba4e6125d90314090d1c67374bcfabc
+Z bf08b5aacb62102aa7b12a64799d345d
diff --git a/manifest.uuid b/manifest.uuid
index 73ae6a4e94..929a6482f4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e42f5812f142522852f6dc72430bc7afdd6f2ed3
\ No newline at end of file
+95b65883bbf476a17f09ff978df4f51af615baab
\ No newline at end of file
diff --git a/tool/build-all-msvc.bat b/tool/build-all-msvc.bat
index c5c10d0905..e62f4c310a 100755
--- a/tool/build-all-msvc.bat
+++ b/tool/build-all-msvc.bat
@@ -122,6 +122,16 @@ SET TOOLPATH=%gawk.exe_PATH%;%tclsh85.exe_PATH%
 
 %_VECHO% ToolPath = '%TOOLPATH%'
 
+REM
+REM NOTE: Check for MSVC 2012 because the Windows SDK directory handling is
+REM       slightly different for that version.
+REM
+IF "%VisualStudioVersion%" == "11.0" (
+  SET SET_NSDKLIBPATH=1
+) ELSE (
+  CALL :fn_UnsetVariable SET_NSDKLIBPATH
+)
+
 REM
 REM NOTE: This is the outer loop.  There should be exactly one iteration per
 REM       platform.
@@ -149,11 +159,13 @@ FOR %%P IN (%PLATFORMS%) DO (
     REM       future to account for additional environment variables.
     REM
     CALL :fn_UnsetVariable DevEnvDir
+    CALL :fn_UnsetVariable ExtensionSdkDir
     CALL :fn_UnsetVariable Framework35Version
     CALL :fn_UnsetVariable FrameworkDir
     CALL :fn_UnsetVariable FrameworkDir32
     CALL :fn_UnsetVariable FrameworkVersion
     CALL :fn_UnsetVariable FrameworkVersion32
+    CALL :fn_UnsetVariable FSHARPINSTALLDIR
     CALL :fn_UnsetVariable INCLUDE
     CALL :fn_UnsetVariable LIB
     CALL :fn_UnsetVariable LIBPATH
@@ -161,6 +173,8 @@ FOR %%P IN (%PLATFORMS%) DO (
     REM CALL :fn_UnsetVariable VCINSTALLDIR
     CALL :fn_UnsetVariable VSINSTALLDIR
     CALL :fn_UnsetVariable WindowsSdkDir
+    CALL :fn_UnsetVariable WindowsSdkDir_35
+    CALL :fn_UnsetVariable WindowsSdkDir_old
 
     REM
     REM NOTE: Reset the PATH here to the absolute bare minimum required.
@@ -208,6 +222,17 @@ FOR %%P IN (%PLATFORMS%) DO (
         )
       )
 
+      REM
+      REM NOTE: When using MSVC 2012, the native SDK path cannot simply use
+      REM       the "lib" sub-directory beneath the location specified in the
+      REM       WindowsSdkDir environment variable because that location does
+      REM       not actually contain the necessary library files for x86.
+      REM
+      IF DEFINED SET_NSDKLIBPATH (
+        CALL :fn_SetVariable WindowsSdkDir NSDKLIBPATH
+        CALL :fn_AppendVariable NSDKLIBPATH lib\win8\um\x86
+      )
+
       REM
       REM NOTE: Invoke NMAKE with the MSVC makefile to clean any stale build
       REM       output from previous iterations of this loop and/or previous
@@ -307,6 +332,19 @@ GOTO no_errors
   )
   GOTO :EOF
 
+:fn_AppendVariable
+  SET __ECHO_CMD=ECHO %%%1%%
+  IF DEFINED %1 (
+    FOR /F "delims=" %%V IN ('%__ECHO_CMD%') DO (
+      SET %1=%%V%~2
+    )
+  ) ELSE (
+    SET %1=%~2
+  )
+  SET __ECHO_CMD=
+  CALL :fn_ResetErrorLevel
+  GOTO :EOF
+
 :usage
   ECHO.
   ECHO Usage: %~nx0 ^<binaryDirectory^>

From f2bc4380b2b6eed936e7cac00180b27a9ca09c1a Mon Sep 17 00:00:00 2001
From: mistachkin <mistachkin@noemail.net>
Date: Fri, 27 Jul 2012 08:33:10 +0000
Subject: [PATCH 10/36] For the clean makefile targets, delete the generated
 VSIX file as well.

FossilOrigin-Name: d575d9619abd03322b73f89882d6da7c0820f285
---
 Makefile.in   |  1 +
 Makefile.msc  |  1 +
 main.mk       |  1 +
 manifest      | 16 ++++++++--------
 manifest.uuid |  2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index df424cb190..db7f88eebf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -941,6 +941,7 @@ clean:
 	rm -f sqlite3.dll sqlite3.lib sqlite3.exp sqlite3.def
 	rm -f sqlite3.c
 	rm -f sqlite3_analyzer$(TEXE) sqlite3_analyzer.c
+	rm -f sqlite-output.vsix
 
 distclean:	clean
 	rm -f config.log config.status libtool Makefile sqlite3.pc
diff --git a/Makefile.msc b/Makefile.msc
index 76f368f3e4..c8142b4517 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1124,6 +1124,7 @@ clean:
 	del /Q sqlite3.dll sqlite3.lib sqlite3.exp sqlite3.def
 	del /Q sqlite3.c
 	del /Q sqlite3_analyzer.exe sqlite3_analyzer.exp sqlite3_analyzer.c
+	del /Q sqlite-output.vsix
 
 #
 # Windows section
diff --git a/main.mk b/main.mk
index 8682961881..408e609b8e 100644
--- a/main.mk
+++ b/main.mk
@@ -616,3 +616,4 @@ clean:
 	rm -f threadtest3 threadtest3.exe
 	rm -f sqlite3.c fts?amal.c tclsqlite3.c
 	rm -f sqlite3_analyzer sqlite3_analyzer.exe sqlite3_analyzer.c
+	rm -f sqlite-output.vsix
diff --git a/manifest b/manifest
index d2a58a13a1..46a0ce0ab8 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Modify\sthe\smulti-platform\sbuild\stool\sfor\sMSVC\sto\ssupport\sthe\slatest\sRC\sversion.
-D 2012-07-27T08:21:45.506
+C For\sthe\sclean\smakefile\stargets,\sdelete\sthe\sgenerated\sVSIX\sfile\sas\swell.
+D 2012-07-27T08:33:10.965
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
-F Makefile.in 8f6d858bf3df9978ba43df19985146a1173025e4
+F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc 21c3e04a68386c867a362f6332e8c3c15e4bb237
+F Makefile.msc 4d7f170e4cef939bec3c90e149ab8241c8e36703
 F Makefile.vxworks 879f034a64062a364b21000266bbd5bc6e0c19b9
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 F VERSION a71848df48082f1d6585d4b0819d530fc455485d
@@ -103,7 +103,7 @@ F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
 F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
-F main.mk d109a9342d1fe135d3900aca9f5563f9480a991d
+F main.mk 72026405046ed5b1f0368943b89c0aa29ad558b6
 F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
 F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
 F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@ -1008,7 +1008,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 84163b633f01f35cb47495c05dd2b640159677ff
-P e42f5812f142522852f6dc72430bc7afdd6f2ed3
-R 68817282cd6637b6d21e0b351abec1b7
+P 95b65883bbf476a17f09ff978df4f51af615baab
+R cce28b8205971983dc12340f78f5f90e
 U mistachkin
-Z bf08b5aacb62102aa7b12a64799d345d
+Z b490b4f938ec6505b50be516f96db421
diff --git a/manifest.uuid b/manifest.uuid
index 929a6482f4..60b8488207 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-95b65883bbf476a17f09ff978df4f51af615baab
\ No newline at end of file
+d575d9619abd03322b73f89882d6da7c0820f285
\ No newline at end of file

From 78496d55ed54dad39abb47ef5cabe3aba963c657 Mon Sep 17 00:00:00 2001
From: mistachkin <mistachkin@noemail.net>
Date: Fri, 27 Jul 2012 22:29:25 +0000
Subject: [PATCH 11/36] Minor adjustments to the multi-platform build tool for
 MSVC.

FossilOrigin-Name: e76b8f7765a91f4306cddb245e731084008f0b8c
---
 manifest                | 12 ++++++------
 manifest.uuid           |  2 +-
 tool/build-all-msvc.bat | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/manifest b/manifest
index 46a0ce0ab8..9d4536e162 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C For\sthe\sclean\smakefile\stargets,\sdelete\sthe\sgenerated\sVSIX\sfile\sas\swell.
-D 2012-07-27T08:33:10.965
+C Minor\sadjustments\sto\sthe\smulti-platform\sbuild\stool\sfor\sMSVC.
+D 2012-07-27T22:29:26.000
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -966,7 +966,7 @@ F test/wherelimit.test 5e9fd41e79bb2b2d588ed999d641d9c965619b31
 F test/win32lock.test b2a539e85ae6b2d78475e016a9636b4451dc7fb9
 F test/zeroblob.test caaecfb4f908f7bc086ed238668049f96774d688
 F test/zerodamage.test 0de750389990b1078bab203c712dc3fefd1d8b82
-F tool/build-all-msvc.bat c739e5376cf8519ea7a9dce7e3f0c45f16a607f9 x
+F tool/build-all-msvc.bat d0a65da7a96b15fabf5e8d9586ff30ebe2279163 x
 F tool/build-shell.sh b64a481901fc9ffe5ca8812a2a9255b6cfb77381
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
 F tool/extract.c 054069d81b095fbdc189a6f5d4466e40380505e2
@@ -1008,7 +1008,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 84163b633f01f35cb47495c05dd2b640159677ff
-P 95b65883bbf476a17f09ff978df4f51af615baab
-R cce28b8205971983dc12340f78f5f90e
+P d575d9619abd03322b73f89882d6da7c0820f285
+R ddae9c94b79aa7fedb3193f520c7c29e
 U mistachkin
-Z b490b4f938ec6505b50be516f96db421
+Z 7226a750f1ba945c71fd0c02712e92d7
diff --git a/manifest.uuid b/manifest.uuid
index 60b8488207..2ebe790acf 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d575d9619abd03322b73f89882d6da7c0820f285
\ No newline at end of file
+e76b8f7765a91f4306cddb245e731084008f0b8c
\ No newline at end of file
diff --git a/tool/build-all-msvc.bat b/tool/build-all-msvc.bat
index e62f4c310a..e7832284ee 100755
--- a/tool/build-all-msvc.bat
+++ b/tool/build-all-msvc.bat
@@ -181,8 +181,6 @@ FOR %%P IN (%PLATFORMS%) DO (
     REM
     SET PATH=%TOOLPATH%;%SystemRoot%\System32;%SystemRoot%
 
-    %_VECHO% Path = '%PATH%'
-
     REM
     REM NOTE: Launch a nested command shell to perform the following steps:
     REM
@@ -238,11 +236,13 @@ FOR %%P IN (%PLATFORMS%) DO (
       REM       output from previous iterations of this loop and/or previous
       REM       runs of this batch file, etc.
       REM
-      %__ECHO% nmake -f Makefile.msc clean
+      IF NOT DEFINED NOCLEAN (
+        %__ECHO% nmake -f Makefile.msc clean
 
-      IF ERRORLEVEL 1 (
-        ECHO Failed to clean for platform %%P.
-        GOTO errors
+        IF ERRORLEVEL 1 (
+          ECHO Failed to clean for platform %%P.
+          GOTO errors
+        )
       )
 
       REM

From 0b5ae7299319466ae56339c9a0511528b3454956 Mon Sep 17 00:00:00 2001
From: mistachkin <mistachkin@noemail.net>
Date: Fri, 27 Jul 2012 23:03:47 +0000
Subject: [PATCH 12/36] Improve consistency in handling of build outputs and
 native library paths in the multi-platform build tool for MSVC.

FossilOrigin-Name: e71f2de2cc7c4ef5ee31da81b6615886f6e601e7
---
 Makefile.msc            |  6 ++++--
 manifest                | 14 +++++++-------
 manifest.uuid           |  2 +-
 tool/build-all-msvc.bat | 19 +++++++++++++++----
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/Makefile.msc b/Makefile.msc
index c8142b4517..a7daea756d 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -92,9 +92,10 @@ NCC = $(CC)
 #
 !IFNDEF NCRTLIBPATH
 NCRTLIBPATH = $(VCINSTALLDIR)\lib
-NCRTLIBPATH = $(NCRTLIBPATH:\\=\)
 !ENDIF
 
+NCRTLIBPATH = $(NCRTLIBPATH:\\=\)
+
 # Check for the Platform SDK library path macro.  Othertise, this
 # value will default to the 'lib' directory underneath the Windows
 # SDK installation directory (the environment variable used appears
@@ -103,9 +104,10 @@ NCRTLIBPATH = $(NCRTLIBPATH:\\=\)
 #
 !IFNDEF NSDKLIBPATH
 NSDKLIBPATH = $(WINDOWSSDKDIR)\lib
-NSDKLIBPATH = $(NSDKLIBPATH:\\=\)
 !ENDIF
 
+NSDKLIBPATH = $(NSDKLIBPATH:\\=\)
+
 # C compiler and options for use in building executables that
 # will run on the platform that is doing the build.
 #
diff --git a/manifest b/manifest
index 9d4536e162..acf282d786 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Minor\sadjustments\sto\sthe\smulti-platform\sbuild\stool\sfor\sMSVC.
-D 2012-07-27T22:29:26.000
+C Improve\sconsistency\sin\shandling\sof\sbuild\soutputs\sand\snative\slibrary\spaths\sin\sthe\smulti-platform\sbuild\stool\sfor\sMSVC.
+D 2012-07-27T23:03:47.862
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc 4d7f170e4cef939bec3c90e149ab8241c8e36703
+F Makefile.msc c1293ece66e237b545eae4484e3e81571fb5f47c
 F Makefile.vxworks 879f034a64062a364b21000266bbd5bc6e0c19b9
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 F VERSION a71848df48082f1d6585d4b0819d530fc455485d
@@ -966,7 +966,7 @@ F test/wherelimit.test 5e9fd41e79bb2b2d588ed999d641d9c965619b31
 F test/win32lock.test b2a539e85ae6b2d78475e016a9636b4451dc7fb9
 F test/zeroblob.test caaecfb4f908f7bc086ed238668049f96774d688
 F test/zerodamage.test 0de750389990b1078bab203c712dc3fefd1d8b82
-F tool/build-all-msvc.bat d0a65da7a96b15fabf5e8d9586ff30ebe2279163 x
+F tool/build-all-msvc.bat f8e272fc74c48e7697f4744aacce1ee4df5edb20 x
 F tool/build-shell.sh b64a481901fc9ffe5ca8812a2a9255b6cfb77381
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
 F tool/extract.c 054069d81b095fbdc189a6f5d4466e40380505e2
@@ -1008,7 +1008,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 84163b633f01f35cb47495c05dd2b640159677ff
-P d575d9619abd03322b73f89882d6da7c0820f285
-R ddae9c94b79aa7fedb3193f520c7c29e
+P e76b8f7765a91f4306cddb245e731084008f0b8c
+R cb74972be2d529442347b1af34814a0a
 U mistachkin
-Z 7226a750f1ba945c71fd0c02712e92d7
+Z 1c22abf12838e6e39c724ae138286b68
diff --git a/manifest.uuid b/manifest.uuid
index 2ebe790acf..4ee6e83bc6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e76b8f7765a91f4306cddb245e731084008f0b8c
\ No newline at end of file
+e71f2de2cc7c4ef5ee31da81b6615886f6e601e7
\ No newline at end of file
diff --git a/tool/build-all-msvc.bat b/tool/build-all-msvc.bat
index e7832284ee..bc6dbf2ad8 100755
--- a/tool/build-all-msvc.bat
+++ b/tool/build-all-msvc.bat
@@ -225,16 +225,20 @@ FOR %%P IN (%PLATFORMS%) DO (
       REM       the "lib" sub-directory beneath the location specified in the
       REM       WindowsSdkDir environment variable because that location does
       REM       not actually contain the necessary library files for x86.
+      REM       This must be done for each iteration because it relies upon
+      REM       the WindowsSdkDir environment variable being set by the batch
+      REM       file used to setup the MSVC environment.
       REM
       IF DEFINED SET_NSDKLIBPATH (
         CALL :fn_SetVariable WindowsSdkDir NSDKLIBPATH
-        CALL :fn_AppendVariable NSDKLIBPATH lib\win8\um\x86
+        CALL :fn_AppendVariable NSDKLIBPATH \lib\win8\um\x86
       )
 
       REM
-      REM NOTE: Invoke NMAKE with the MSVC makefile to clean any stale build
-      REM       output from previous iterations of this loop and/or previous
-      REM       runs of this batch file, etc.
+      REM NOTE: Unless prevented from doing so, invoke NMAKE with the MSVC
+      REM       makefile to clean any stale build output from previous
+      REM       iterations of this loop and/or previous runs of this batch
+      REM       file, etc.
       REM
       IF NOT DEFINED NOCLEAN (
         %__ECHO% nmake -f Makefile.msc clean
@@ -243,6 +247,13 @@ FOR %%P IN (%PLATFORMS%) DO (
           ECHO Failed to clean for platform %%P.
           GOTO errors
         )
+      ) ELSE (
+        REM
+        REM NOTE: Even when the cleaning step has been disabled, we still need
+        REM       to remove the build output for the files we are specifically
+        REM       wanting to build for each platform.
+        REM
+        %__ECHO% DEL /Q sqlite3.dll sqlite3.lib
       )
 
       REM

From 6809c96df33bf03d22700b62dcc27b7d753834b1 Mon Sep 17 00:00:00 2001
From: dan <dan@noemail.net>
Date: Mon, 30 Jul 2012 14:53:54 +0000
Subject: [PATCH 13/36] Replace a few sqlite3_malloc()+memset() sequences with
 calls to sqlite3MallocZero().

FossilOrigin-Name: 305b6667265353b858b79bfea1745e64ff3bb7d3
---
 manifest        | 24 ++++++++++++------------
 manifest.uuid   |  2 +-
 src/analyze.c   |  3 +--
 src/backup.c    |  3 +--
 src/bitvec.c    |  3 +--
 src/hash.c      |  3 +--
 src/pcache1.c   |  6 ++----
 src/vdbetrace.c |  3 +--
 8 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/manifest b/manifest
index acf282d786..6d26290011 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improve\sconsistency\sin\shandling\sof\sbuild\soutputs\sand\snative\slibrary\spaths\sin\sthe\smulti-platform\sbuild\stool\sfor\sMSVC.
-D 2012-07-27T23:03:47.862
+C Replace\sa\sfew\ssqlite3_malloc()+memset()\ssequences\swith\scalls\sto\ssqlite3MallocZero().
+D 2012-07-30T14:53:54.464
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -117,11 +117,11 @@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
 F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
 F src/alter.c 149cc80d9257971b0bff34e58fb2263e01998289
-F src/analyze.c 70c46504c0d2543ea5cdca01140b2cd3e1d886e7
+F src/analyze.c a4790912e504c8ddac273445e7aba39bbce50881
 F src/attach.c 577bf5675b0c50495fc28549f2fcbdb1bac71143
 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
-F src/backup.c 5524df36810668b3b5a6de2d7e3910b98e721e33
-F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
+F src/backup.c 5b31b24d6814b11de763debf342c8cd0a15a4910
+F src/bitvec.c 26675fe8e431dc555e6f2d0e11e651d172234aa1
 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
 F src/btree.c f0b71054103cb77eb5e782088c16998ec4f06624
 F src/btree.h 48a013f8964f12d944d90e4700df47b72dd6d923
@@ -137,7 +137,7 @@ F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c 657212460bf5cfd3ae607d12ea62092844c227b5
 F src/func.c 18dfedfb857e100b05755a1b12e88b389f957879
 F src/global.c 4cfdca5cb0edd33c4d021baec4ede958cb2c793b
-F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
+F src/hash.c 1f35276f9664dd150451b463805a952892227c73
 F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
 F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
 F src/insert.c 770ed633830fb49d73d90c3fdf20b703973e1e84
@@ -169,7 +169,7 @@ F src/pager.h 8b8c9bc065a3c66769df8724dfdf492ee1aab3c5
 F src/parse.y f29df90bd3adc64b33114ab1de9fb7768fcf2099
 F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
 F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c
-F src/pcache1.c 2234d84f9c003d800a57f00f8535c91667fa4f6c
+F src/pcache1.c 9fd22671c270b35131ef480bbc00392b8b5f8ab9
 F src/pragma.c 97f9357f0e7e5fb46a2519f14539550aa07db49f
 F src/prepare.c 33291b83cca285718048d219c67b8298501fa3a5
 F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f
@@ -245,7 +245,7 @@ F src/vdbeaux.c dce80038c3c41f2680e5ab4dd0f7e0d8b7ff9071
 F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
 F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
 F src/vdbesort.c 628b2bc0cc82cae0e9946f70c5c81986e9fba91f
-F src/vdbetrace.c 79059ebd17b3c8545fab2a24253713e77e4ab392
+F src/vdbetrace.c 8bd5da325fc90f28464335e4cc4ad1407fe30835
 F src/vtab.c bb8ea3a26608bb1357538a5d2fc72beba6638998
 F src/wal.c 9294df6f96aae5909ae1a9b733fd1e1b4736978b
 F src/wal.h 29c197540b19044e6cd73487017e5e47a1d3dac6
@@ -1008,7 +1008,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 84163b633f01f35cb47495c05dd2b640159677ff
-P e76b8f7765a91f4306cddb245e731084008f0b8c
-R cb74972be2d529442347b1af34814a0a
-U mistachkin
-Z 1c22abf12838e6e39c724ae138286b68
+P e71f2de2cc7c4ef5ee31da81b6615886f6e601e7
+R a7495b0145c88ec6647f7c425289b3e1
+U dan
+Z 82b9855bd1443e957263d9bd8f18cf53
diff --git a/manifest.uuid b/manifest.uuid
index 4ee6e83bc6..eeb9e4e8c7 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e71f2de2cc7c4ef5ee31da81b6615886f6e601e7
\ No newline at end of file
+305b6667265353b858b79bfea1745e64ff3bb7d3
\ No newline at end of file
diff --git a/src/analyze.c b/src/analyze.c
index 4dfc331bef..810ed54d85 100644
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -256,12 +256,11 @@ static void stat3Init(
   nRow = (tRowcnt)sqlite3_value_int64(argv[0]);
   mxSample = sqlite3_value_int(argv[1]);
   n = sizeof(*p) + sizeof(p->a[0])*mxSample;
-  p = sqlite3_malloc( n );
+  p = sqlite3MallocZero( n );
   if( p==0 ){
     sqlite3_result_error_nomem(context);
     return;
   }
-  memset(p, 0, n);
   p->a = (struct Stat3Sample*)&p[1];
   p->nRow = nRow;
   p->mxSample = mxSample;
diff --git a/src/backup.c b/src/backup.c
index 527ecb5744..4881215e96 100644
--- a/src/backup.c
+++ b/src/backup.c
@@ -164,7 +164,7 @@ sqlite3_backup *sqlite3_backup_init(
     ** EVIDENCE-OF: R-64852-21591 The sqlite3_backup object is created by a
     ** call to sqlite3_backup_init() and is destroyed by a call to
     ** sqlite3_backup_finish(). */
-    p = (sqlite3_backup *)sqlite3_malloc(sizeof(sqlite3_backup));
+    p = (sqlite3_backup *)sqlite3MallocZero(sizeof(sqlite3_backup));
     if( !p ){
       sqlite3Error(pDestDb, SQLITE_NOMEM, 0);
     }
@@ -172,7 +172,6 @@ sqlite3_backup *sqlite3_backup_init(
 
   /* If the allocation succeeded, populate the new object. */
   if( p ){
-    memset(p, 0, sizeof(sqlite3_backup));
     p->pSrc = findBtree(pDestDb, pSrcDb, zSrcDb);
     p->pDest = findBtree(pDestDb, pDestDb, zDestDb);
     p->pDestDb = pDestDb;
diff --git a/src/bitvec.c b/src/bitvec.c
index 47d33ea840..8d805a6fe5 100644
--- a/src/bitvec.c
+++ b/src/bitvec.c
@@ -340,10 +340,9 @@ int sqlite3BitvecBuiltinTest(int sz, int *aOp){
   /* Allocate the Bitvec to be tested and a linear array of
   ** bits to act as the reference */
   pBitvec = sqlite3BitvecCreate( sz );
-  pV = sqlite3_malloc( (sz+7)/8 + 1 );
+  pV = sqlite3MallocZero( (sz+7)/8 + 1 );
   pTmpSpace = sqlite3_malloc(BITVEC_SZ);
   if( pBitvec==0 || pV==0 || pTmpSpace==0  ) goto bitvec_end;
-  memset(pV, 0, (sz+7)/8 + 1);
 
   /* NULL pBitvec tests */
   sqlite3BitvecSet(0, 1);
diff --git a/src/hash.c b/src/hash.c
index d4daf92a6f..8d5a706564 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -116,14 +116,13 @@ static int rehash(Hash *pH, unsigned int new_size){
   ** allocation as a benign.
   */
   sqlite3BeginBenignMalloc();
-  new_ht = (struct _ht *)sqlite3Malloc( new_size*sizeof(struct _ht) );
+  new_ht = (struct _ht *)sqlite3MallocZero( new_size*sizeof(struct _ht) );
   sqlite3EndBenignMalloc();
 
   if( new_ht==0 ) return 0;
   sqlite3_free(pH->ht);
   pH->ht = new_ht;
   pH->htsize = new_size = sqlite3MallocSize(new_ht)/sizeof(struct _ht);
-  memset(new_ht, 0, new_size*sizeof(struct _ht));
   for(elem=pH->first, pH->first=0; elem; elem = next_elem){
     unsigned int h = strHash(elem->pKey, elem->nKey) % new_size;
     next_elem = elem->next;
diff --git a/src/pcache1.c b/src/pcache1.c
index c41b49e6c8..4147d2eff5 100644
--- a/src/pcache1.c
+++ b/src/pcache1.c
@@ -396,11 +396,10 @@ static int pcache1ResizeHash(PCache1 *p){
 
   pcache1LeaveMutex(p->pGroup);
   if( p->nHash ){ sqlite3BeginBenignMalloc(); }
-  apNew = (PgHdr1 **)sqlite3_malloc(sizeof(PgHdr1 *)*nNew);
+  apNew = (PgHdr1 **)sqlite3MallocZero(sizeof(PgHdr1 *)*nNew);
   if( p->nHash ){ sqlite3EndBenignMalloc(); }
   pcache1EnterMutex(p->pGroup);
   if( apNew ){
-    memset(apNew, 0, sizeof(PgHdr1 *)*nNew);
     for(i=0; i<p->nHash; i++){
       PgHdr1 *pPage;
       PgHdr1 *pNext = p->apHash[i];
@@ -584,9 +583,8 @@ static sqlite3_pcache *pcache1Create(int szPage, int szExtra, int bPurgeable){
   assert( szExtra < 300 );
 
   sz = sizeof(PCache1) + sizeof(PGroup)*separateCache;
-  pCache = (PCache1 *)sqlite3_malloc(sz);
+  pCache = (PCache1 *)sqlite3MallocZero(sz);
   if( pCache ){
-    memset(pCache, 0, sz);
     if( separateCache ){
       pGroup = (PGroup*)&pCache[1];
       pGroup->mxPinned = 10;
diff --git a/src/vdbetrace.c b/src/vdbetrace.c
index c71a7c41a4..35825c8736 100644
--- a/src/vdbetrace.c
+++ b/src/vdbetrace.c
@@ -169,9 +169,8 @@ void sqlite3ExplainBegin(Vdbe *pVdbe){
   if( pVdbe ){
     Explain *p;
     sqlite3BeginBenignMalloc();
-    p = sqlite3_malloc( sizeof(Explain) );
+    p = (Explain *)sqlite3MallocZero( sizeof(Explain) );
     if( p ){
-      memset(p, 0, sizeof(*p));
       p->pVdbe = pVdbe;
       sqlite3_free(pVdbe->pExplain);
       pVdbe->pExplain = p;

From 391b36472ae14d581ff560a0dd840007b346c42c Mon Sep 17 00:00:00 2001
From: mistachkin <mistachkin@noemail.net>
Date: Tue, 31 Jul 2012 00:43:31 +0000
Subject: [PATCH 14/36] Modify metadata for the VSIX package and add tooling
 support for PDBs.

FossilOrigin-Name: 12cbf6a9343ffb24065f77f679e50b67bc2e43f9
---
 manifest                |  18 ++++----
 manifest.uuid           |   2 +-
 tool/build-all-msvc.bat |  16 ++++++-
 tool/mkvsix.tcl         |  98 +++++++++++++++++++++++++++++++---------
 tool/win/sqlite.vsix    | Bin 34247 -> 32783 bytes
 5 files changed, 101 insertions(+), 33 deletions(-)

diff --git a/manifest b/manifest
index 6d26290011..9181eaf941 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Replace\sa\sfew\ssqlite3_malloc()+memset()\ssequences\swith\scalls\sto\ssqlite3MallocZero().
-D 2012-07-30T14:53:54.464
+C Modify\smetadata\sfor\sthe\sVSIX\spackage\sand\sadd\stooling\ssupport\sfor\sPDBs.
+D 2012-07-31T00:43:31.954
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -966,7 +966,7 @@ F test/wherelimit.test 5e9fd41e79bb2b2d588ed999d641d9c965619b31
 F test/win32lock.test b2a539e85ae6b2d78475e016a9636b4451dc7fb9
 F test/zeroblob.test caaecfb4f908f7bc086ed238668049f96774d688
 F test/zerodamage.test 0de750389990b1078bab203c712dc3fefd1d8b82
-F tool/build-all-msvc.bat f8e272fc74c48e7697f4744aacce1ee4df5edb20 x
+F tool/build-all-msvc.bat 1a18aa39983ae7354d834bc55a850a54fc007576 x
 F tool/build-shell.sh b64a481901fc9ffe5ca8812a2a9255b6cfb77381
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
 F tool/extract.c 054069d81b095fbdc189a6f5d4466e40380505e2
@@ -983,7 +983,7 @@ F tool/mksqlite3c-noext.tcl 8bce31074e4cbe631bb7676526a048335f4c9f02
 F tool/mksqlite3c.tcl 589c7f44e990be1b8443cfe4808dce392b0327fa
 F tool/mksqlite3h.tcl 78013ad79a5e492e5f764f3c7a8ef834255061f8
 F tool/mksqlite3internalh.tcl 3dca7bb5374cee003379b8cbac73714f610ef795
-F tool/mkvsix.tcl 75fb1b601d69ead76340fa15bf9813874fed240b
+F tool/mkvsix.tcl ce2ad5da880752426e2597382f3bf1279d5646b3
 F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
 F tool/omittest.tcl 4665982e95a6e5c1bd806cf7bc3dea95be422d77
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@ -1007,8 +1007,8 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-F tool/win/sqlite.vsix 84163b633f01f35cb47495c05dd2b640159677ff
-P e71f2de2cc7c4ef5ee31da81b6615886f6e601e7
-R a7495b0145c88ec6647f7c425289b3e1
-U dan
-Z 82b9855bd1443e957263d9bd8f18cf53
+F tool/win/sqlite.vsix a8778c835bbfe8d9d2066c144542c245a29ac525
+P 305b6667265353b858b79bfea1745e64ff3bb7d3
+R bd2d8408dc9dbcc7a27c7ffc1e947c79
+U mistachkin
+Z 91e5f70404ea58b1f716b323c3d5addd
diff --git a/manifest.uuid b/manifest.uuid
index eeb9e4e8c7..eda8eaf007 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-305b6667265353b858b79bfea1745e64ff3bb7d3
\ No newline at end of file
+12cbf6a9343ffb24065f77f679e50b67bc2e43f9
\ No newline at end of file
diff --git a/tool/build-all-msvc.bat b/tool/build-all-msvc.bat
index bc6dbf2ad8..a2d7dae3a3 100755
--- a/tool/build-all-msvc.bat
+++ b/tool/build-all-msvc.bat
@@ -253,7 +253,7 @@ FOR %%P IN (%PLATFORMS%) DO (
         REM       to remove the build output for the files we are specifically
         REM       wanting to build for each platform.
         REM
-        %__ECHO% DEL /Q sqlite3.dll sqlite3.lib
+        %__ECHO% DEL /Q sqlite3.dll sqlite3.lib sqlite3.pdb
       )
 
       REM
@@ -291,6 +291,20 @@ FOR %%P IN (%PLATFORMS%) DO (
         ECHO Failed to copy "sqlite3.lib" to "%BINARYDIRECTORY%\%%D\".
         GOTO errors
       )
+
+      REM
+      REM NOTE: Copy the "sqlite3.pdb" file to the platform-specific directory
+      REM       beneath the binary directory unless we are prevented from doing
+      REM       so.
+      REM
+      IF NOT DEFINED NOSYMBOLS (
+        %__ECHO% XCOPY sqlite3.pdb "%BINARYDIRECTORY%\%%D\" %FFLAGS% %DFLAGS%
+
+        IF ERRORLEVEL 1 (
+          ECHO Failed to copy "sqlite3.pdb" to "%BINARYDIRECTORY%\%%D\".
+          GOTO errors
+        )
+      )
     )
   )
 
diff --git a/tool/mkvsix.tcl b/tool/mkvsix.tcl
index a5a569d475..3a570b650a 100644
--- a/tool/mkvsix.tcl
+++ b/tool/mkvsix.tcl
@@ -147,6 +147,19 @@ if {![file exists $sourceDirectory] || \
 
 ###############################################################################
 
+#
+# NOTE: Evaluate the user-specific customizations file, if it exists.
+#
+set userFile [file join $path [appendArgs \
+    $rootName . $tcl_platform(user) .tcl]]
+
+if {[file exists $userFile] && \
+    [file isfile $userFile]} then {
+  source $userFile
+}
+
+###############################################################################
+
 set templateFile [file join $path win sqlite.vsix]
 
 if {![file exists $templateFile] || \
@@ -220,7 +233,7 @@ if {![info exists unzip]} then {
 #       in the source directory.  This script assumes that the header file has
 #       already been generated by the build process.
 #
-set pattern {^#define\s+?SQLITE_VERSION\s+?"(.*?)"$}
+set pattern {^#define\s+SQLITE_VERSION\s+"(.*)"$}
 set data [readFile [file join $sourceDirectory sqlite3.h]]
 
 if {![regexp -line -- $pattern $data dummy version]} then {
@@ -233,32 +246,62 @@ if {![regexp -line -- $pattern $data dummy version]} then {
 #
 # NOTE: Setup the master file list data, including the necessary flags.
 #
-set fileNames(source) [list "" "" "" \
-    [file join $sourceDirectory sqlite3.h] \
-    [file join $binaryDirectory <platform> sqlite3.lib] \
-    [file join $binaryDirectory <platform> sqlite3.dll]]
+if {![info exists fileNames(source)]} then {
+  set fileNames(source) [list "" "" "" \
+      [file join $sourceDirectory sqlite3.h] \
+      [file join $binaryDirectory <platform> sqlite3.lib] \
+      [file join $binaryDirectory <platform> sqlite3.dll]]
 
-set fileNames(destination) [list \
-    [file join $stagingDirectory extension.vsixmanifest] \
-    [file join $stagingDirectory SDKManifest.xml] \
-    [file join $stagingDirectory DesignTime CommonConfiguration \
-        <platform> SQLite.WinRT.props] \
-    [file join $stagingDirectory DesignTime CommonConfiguration \
-        <platform> sqlite3.h] \
-    [file join $stagingDirectory DesignTime CommonConfiguration \
-        <platform> sqlite3.lib] \
-    [file join $stagingDirectory Redist CommonConfiguration \
-        <platform> sqlite3.dll]]
+  if {![info exists no(symbols)]} then {
+    lappend fileNames(source) \
+        [file join $binaryDirectory <platform> sqlite3.pdb]
+  }
+}
 
-set fileNames(neutral) [list 1 1 1 1 0 0]
-set fileNames(subst) [list 1 1 1 0 0 0]
+if {![info exists fileNames(destination)]} then {
+  set fileNames(destination) [list \
+      [file join $stagingDirectory extension.vsixmanifest] \
+      [file join $stagingDirectory SDKManifest.xml] \
+      [file join $stagingDirectory DesignTime CommonConfiguration \
+          <platform> SQLite.WinRT.props] \
+      [file join $stagingDirectory DesignTime CommonConfiguration \
+          <platform> sqlite3.h] \
+      [file join $stagingDirectory DesignTime CommonConfiguration \
+          <platform> sqlite3.lib] \
+      [file join $stagingDirectory Redist CommonConfiguration \
+          <platform> sqlite3.dll]]
+
+  if {![info exists no(symbols)]} then {
+    lappend fileNames(destination) \
+        [file join $stagingDirectory Redist CommonConfiguration \
+            <platform> sqlite3.pdb]
+  }
+}
+
+if {![info exists fileNames(neutral)]} then {
+  set fileNames(neutral) [list 1 1 1 1 0 0]
+
+  if {![info exists no(symbols)]} then {
+    lappend fileNames(neutral) 0
+  }
+}
+
+if {![info exists fileNames(subst)]} then {
+  set fileNames(subst) [list 1 1 1 0 0 0]
+
+  if {![info exists no(symbols)]} then {
+    lappend fileNames(subst) 0
+  }
+}
 
 ###############################################################################
 
 #
 # NOTE: Setup the list of platforms supported by this script.
 #
-set platformNames [list ARM x64 x86]
+if {![info exists platformNames]} then {
+  set platformNames [list ARM x64 x86]
+}
 
 ###############################################################################
 
@@ -302,15 +345,26 @@ foreach sourceFileName $fileNames(source) \
   #       platform will be processed for it individually.
   #
   foreach platformName [expr {$isNeutral ? [list neutral] : $platformNames}] {
+    #
+    # NOTE: Use the actual platform name in the destination file name.
+    #
+    set newDestinationFileName [replacePlatform $destinationFileName \
+        $platformName]
+
     #
     # NOTE: Does the source file need to be copied to the destination file?
     #
     if {[string length $sourceFileName] > 0} then {
       #
-      # NOTE: Copy the source file to the destination file verbatim.
+      # NOTE: First, make sure the destination directory exists.
+      #
+      file mkdir [file dirname $newDestinationFileName]
+
+      #
+      # NOTE: Then, copy the source file to the destination file verbatim.
       #
       file copy [replacePlatform $sourceFileName $platformName] \
-          [replacePlatform $destinationFileName $platformName]
+          $newDestinationFileName
     }
 
     #
@@ -322,7 +376,7 @@ foreach sourceFileName $fileNames(source) \
       # NOTE: Perform any dynamic replacements contained in the destination
       #       file and then re-write it in-place.
       #
-      substFile [replacePlatform $destinationFileName $platformName]
+      substFile $newDestinationFileName
     }
   }
 }
diff --git a/tool/win/sqlite.vsix b/tool/win/sqlite.vsix
index 16f7b57cd03cf43fd1c77761a25b98929305eb39..57830edeac907e93d95a82e0207b120b1de03cba 100644
GIT binary patch
delta 435
zcmX@!&D7t(G@)VR!FP<C4VgpAMMM}F7&sWJI{!J?-(IKj1;|TeoV>1DtbW2>zh(!4
z*7vi&$eLBJUC@~+6`kXeEiC+Dxk*K@!IsH7*00|v{rILAdNJ<Y6YKPIbDplspYnrY
zn}^k;>j$TbEbv|xAg^?D*RLYIqp$L;BJ%<ro38n)JLO!E3azmd<8?8r_Po%zqVuTs
ztGjW0M~s87PRolnS#fU1gMQD>hmP0lMNTd*erCqAdmZ<i-BKEloPY2xJh!>#%yZ^>
z*ESk*9elU<hIH7K$o-L%%UH7>2ybF!-nGd;Zd%gGl$B+U`}{tfjq8!`Z;Q<4*|<4#
zwTu+2y?U<7`<b2pjRTIx$km>@w3TPxi|3nN?RQ5W*&V_c+PXjX=R@uQZ)O$|1}0#D
z%-yV2`;?JUeX>Bk!DPJ#j>&uL{TNqIY*YeroF+##sxf6TO>SyTV|u|d`Bh^Cqv~Ym
zrWmHzVv`p(nQGWGU<*|S27U$=VEBT70ub-3oGjid%XWUFx#-5c$yTj4O!uoMSF}3v
RaWQZ)h_Em)Jgo*P1pt7nvNHex

delta 1344
zcmeBgU^?E-G@*e}d19jyvty9&##BxwaV`cB5cK=u0A@f5kP`U{GZXy)Z)O(UN?0l^
z%=9;BF-4TSLKJz&p_;=EG%qMMC9}8$$s{i{MbdCZ69e_R<dJxy8bD_v=|p!Xs#^T+
zMNwN1ayZCuB0$?X7#{cha<J!ovMq*@fkB>$fq@?=8tmfjo0ylGmRek*SCN|&I`M86
zlc7NCd+yqHfvU{wVqOzpg}Df_yzTGW+c!H>_JrEYlx?eZYrm(3udbLrbIzQfMa!<=
z7j>&)WGyk9`u*fwkp$!A7xRK5i|TGqTvY$RruM4z;zmujefxxxS`JEYtq){fQuNWz
zm2IN6kbK5-@0%J5DJ}CBzxHf&)DVn0H&sc1?fQ}o{fgBQ2@iQi5_V2(IGJyp9=VY9
zZkMU61GD0mBjyuUzc0EoWl7fWX$e7QE7s^u5iFc>q3dcCYe)P|m;NP=Rm#gx_Z(m4
zP~14Le$K}9zJ#RW>8Erz*Jo{Cy~^v*@|B@|W^dh0E((fN*8kjB>h<y2^NL@#6^mkZ
z!<M%sAMvez@u!Z@N^Mt3cag1AQ;)3cb>?>ms+$F-O;r7r9o~9FQZ9I5@(H;$eCsck
zwMp)@x}9P==aJQ%Oh0DvrQiD`zBFvoEt(T1)DrT}s$byl-N(-52J=r=U3~lB_xL0J
z&G)N5FfuAnzEESJ42p9u1_fXoFfcGONH9Fu`$S_;=2=D<ec{2n$?IzL8JACN)SApu
z>&N&8$e8#+X!7J*jmg_<Bm|ThRKS`U7zBXyYNpBeYZR41sRP;6524S&ro!k6E+A7C
z(KNpSYt{oL7i7%~m|uc5!{`l@)`9r}-i%E443qPiB=}%XPyjkXmwEEz+BBxstdqU#
zA{bvxUQ!psv`&07Q@v@u2m`L112X{RhsG*+K0<cJhahR)v%rvn(HodI!kqy#7&Esa
z8_cx~Zt}!H(aHTaydtxkwZUdW=?y=&shyp?p+<gkTn!)BePrbrF%|Ia8^nGn{Xp&j
zC``dRWvXFb09u3*8w^u^fOW#?3mJ#tIwO&FhM-5q2FG7uoiI8;=omZ<>=|(7Z&(<B
tVrN?Q<oJ47Hnml!Ehl78ZmPFolCPb7px%*Bh(U;<2Uvuu)&W&90034<q2&Mo


From 50afa2a012490d70e4a30a590dbb30178bd37ba3 Mon Sep 17 00:00:00 2001
From: mistachkin <mistachkin@noemail.net>
Date: Tue, 31 Jul 2012 08:15:56 +0000
Subject: [PATCH 15/36] Make the list of platforms dynamic in the SDK manifest
 inside the VSIX package.

FossilOrigin-Name: 22b72e499d2aeba42d0531ae58f87ff023787f47
---
 manifest             |  14 +++++++-------
 manifest.uuid        |   2 +-
 tool/mkvsix.tcl      |   2 +-
 tool/win/sqlite.vsix | Bin 32783 -> 32790 bytes
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 9181eaf941..5a918f64c6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Modify\smetadata\sfor\sthe\sVSIX\spackage\sand\sadd\stooling\ssupport\sfor\sPDBs.
-D 2012-07-31T00:43:31.954
+C Make\sthe\slist\sof\splatforms\sdynamic\sin\sthe\sSDK\smanifest\sinside\sthe\sVSIX\spackage.
+D 2012-07-31T08:15:56.966
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -983,7 +983,7 @@ F tool/mksqlite3c-noext.tcl 8bce31074e4cbe631bb7676526a048335f4c9f02
 F tool/mksqlite3c.tcl 589c7f44e990be1b8443cfe4808dce392b0327fa
 F tool/mksqlite3h.tcl 78013ad79a5e492e5f764f3c7a8ef834255061f8
 F tool/mksqlite3internalh.tcl 3dca7bb5374cee003379b8cbac73714f610ef795
-F tool/mkvsix.tcl ce2ad5da880752426e2597382f3bf1279d5646b3
+F tool/mkvsix.tcl 153187ce9f1911bc2d0caa7af9856d7b8b805e27
 F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
 F tool/omittest.tcl 4665982e95a6e5c1bd806cf7bc3dea95be422d77
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@ -1007,8 +1007,8 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-F tool/win/sqlite.vsix a8778c835bbfe8d9d2066c144542c245a29ac525
-P 305b6667265353b858b79bfea1745e64ff3bb7d3
-R bd2d8408dc9dbcc7a27c7ffc1e947c79
+F tool/win/sqlite.vsix 60c6a9864cd8dfa221215e9ef651781440f056fc
+P 12cbf6a9343ffb24065f77f679e50b67bc2e43f9
+R 7df148b047b8c83dabfec0a3d080b59e
 U mistachkin
-Z 91e5f70404ea58b1f716b323c3d5addd
+Z 610dc29b5bd32d7ba5eb2f794e90effb
diff --git a/manifest.uuid b/manifest.uuid
index eda8eaf007..c248519372 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-12cbf6a9343ffb24065f77f679e50b67bc2e43f9
\ No newline at end of file
+22b72e499d2aeba42d0531ae58f87ff023787f47
\ No newline at end of file
diff --git a/tool/mkvsix.tcl b/tool/mkvsix.tcl
index 3a570b650a..506ab7334d 100644
--- a/tool/mkvsix.tcl
+++ b/tool/mkvsix.tcl
@@ -300,7 +300,7 @@ if {![info exists fileNames(subst)]} then {
 # NOTE: Setup the list of platforms supported by this script.
 #
 if {![info exists platformNames]} then {
-  set platformNames [list ARM x64 x86]
+  set platformNames [list x86 x64 ARM]
 }
 
 ###############################################################################
diff --git a/tool/win/sqlite.vsix b/tool/win/sqlite.vsix
index 57830edeac907e93d95a82e0207b120b1de03cba..9dd5c814085d0efb83f5a7e628d96a3bcf9d6123 100644
GIT binary patch
delta 344
zcmV-e0jK_tfC83)0<g$=f1nBfKtNBsUi$z50B!*Q01p5F08>OuO<`_nW@U49E_iKh
zRgle2!$1s#@0I!vs})B`;D(@~s#+=`HT<Ot2jCDAr#0HF7q3I$?b#Fv^l0nzcxEQk
zkH)BXV2@-IeG(mO1-7IL?IzK!)JLaUO)tiy$r25$(93wF)B?RTf5qo@(LkcJyA=wk
znpi!cy<h8|xMix^QkF%7W{->hn3Nc<Y)y&Yiny~l?z%4WZ>Fb+H}N-wHqY|GUof~^
z&zv&|ejSd3U`3q|n>kr2&;sv}1vs#kzX@k4mQ0>%iSqdhU;N>aco585=ZM9ptr2tv
zeqQ=SUosQ_XP}yKAh``LOKBMb@%Tz;)j_C4LJLhF*Q=-VXWjP}{}va9FSFlzU<3`I
q3I9MqPrF|G0001PlT3dw1%wGoO!Sk1e?0-_lfQpT2JCwP0001=ot)$V

delta 345
zcmV-f0jB<zfC7(z0<g$=e|m}jKtJ2ADD(gT0AT?D01p5F08>OuO<`_nW@U49E_iKh
zRgm3IgFq04@0;`;HhZn0iD?>JY)ESp6Y!@rc#SZ$lPo*y>>~K~E>+Q9&g461&Yb0{
zZ<P1|wn#dX*TIz(pi8PyA0pYh`f@JC>TWt&Zc#yk)=eiuY|t82e|$a`4MZ|~Nzj3)
ziN!1G-ChpFGgH-;Zd){{&bZ)@Nr~Y>*A&U4bLKV-yRHlDyBa9sL--A$&a-^X=L4SB
zu`vq4?!DL>R@7O)S(A1JYTy&H0Ry_SPhOT{$z-W^LB3A#&0dTjkA_)m46(Cms~j2y
zKPPP@@0p4JGf>4`9Ugtk(zOhp=;yOVKf77PyHpNUg}+_-;R{ep0|b+ye;Bg@dqe~c
rdWrr(KijS-^Z)<=VUtsTFa^)CHx;pyh<`l+-;>6FN(SY7000001~HtQ


From dfbfbffd13495a0de833a9eea49c07cab3018a95 Mon Sep 17 00:00:00 2001
From: mistachkin <mistachkin@noemail.net>
Date: Wed, 1 Aug 2012 20:20:27 +0000
Subject: [PATCH 16/36] Fix typos of function names sqlite3_result_error_toobig
 and sqlite3_result_error_nomem in the documentation. No changes to code.

FossilOrigin-Name: bec97c98130f057321f3db1436a24377c3c64f81
---
 manifest        | 12 ++++++------
 manifest.uuid   |  2 +-
 src/sqlite.h.in |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/manifest b/manifest
index 5a918f64c6..78dc00c12b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sthe\slist\sof\splatforms\sdynamic\sin\sthe\sSDK\smanifest\sinside\sthe\sVSIX\spackage.
-D 2012-07-31T08:15:56.966
+C Fix\stypos\sof\sfunction\snames\ssqlite3_result_error_toobig\sand\ssqlite3_result_error_nomem\sin\sthe\sdocumentation.\sNo\schanges\sto\scode.
+D 2012-08-01T20:20:27.300
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -178,7 +178,7 @@ F src/resolve.c b3c70ab28cac60de33684c9aa9e5138dcf71d6dd
 F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
 F src/select.c a365da6d7a6d7d8a10ad60ca71837ab5e9369466
 F src/shell.c 076e1c90d594644f36027c8ecff9a392cf2d3a06
-F src/sqlite.h.in 310ae7e538883fa1619ab0638c775ce11ad43015
+F src/sqlite.h.in 3e8035bc406b1571a5cc8ea46bcc831201676f1a
 F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
 F src/sqliteInt.h ed41801550b0b8fb8217fcfd2e362118062b30c0
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
@@ -1008,7 +1008,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 60c6a9864cd8dfa221215e9ef651781440f056fc
-P 12cbf6a9343ffb24065f77f679e50b67bc2e43f9
-R 7df148b047b8c83dabfec0a3d080b59e
+P 22b72e499d2aeba42d0531ae58f87ff023787f47
+R 7a9ae759b6585bddd1352351a6c5ae73
 U mistachkin
-Z 610dc29b5bd32d7ba5eb2f794e90effb
+Z 2e386fb6f10594ee697cff75e8a92cd8
diff --git a/manifest.uuid b/manifest.uuid
index c248519372..766d2967de 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-22b72e499d2aeba42d0531ae58f87ff023787f47
\ No newline at end of file
+bec97c98130f057321f3db1436a24377c3c64f81
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 69ea6d15d7..aa60f80b22 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -4152,11 +4152,11 @@ typedef void (*sqlite3_destructor_type)(void*);
 ** the error code is SQLITE_ERROR.  ^A subsequent call to sqlite3_result_error()
 ** or sqlite3_result_error16() resets the error code to SQLITE_ERROR.
 **
-** ^The sqlite3_result_toobig() interface causes SQLite to throw an error
-** indicating that a string or BLOB is too long to represent.
+** ^The sqlite3_result_error_toobig() interface causes SQLite to throw an
+** error indicating that a string or BLOB is too long to represent.
 **
-** ^The sqlite3_result_nomem() interface causes SQLite to throw an error
-** indicating that a memory allocation failed.
+** ^The sqlite3_result_error_nomem() interface causes SQLite to throw an
+** error indicating that a memory allocation failed.
 **
 ** ^The sqlite3_result_int() interface sets the return value
 ** of the application-defined function to be the 32-bit signed integer

From a36421ab061fdfb8beed08b035d9c7fff75f27ef Mon Sep 17 00:00:00 2001
From: mistachkin <mistachkin@noemail.net>
Date: Fri, 3 Aug 2012 10:00:56 +0000
Subject: [PATCH 17/36] Correct comment about WinRT compiler define.  No
 changes to code.

FossilOrigin-Name: 335e91e599555d9f4e42f90576d1676c381314f4
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/os.h      |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 78dc00c12b..5d32d1deb2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\stypos\sof\sfunction\snames\ssqlite3_result_error_toobig\sand\ssqlite3_result_error_nomem\sin\sthe\sdocumentation.\sNo\schanges\sto\scode.
-D 2012-08-01T20:20:27.300
+C Correct\scomment\sabout\sWinRT\scompiler\sdefine.\s\sNo\schanges\sto\scode.
+D 2012-08-03T10:00:56.291
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -160,7 +160,7 @@ F src/mutex_unix.c c3a4e00f96ba068a8dbef34084465979aaf369cc
 F src/mutex_w32.c 32a9b3841e2d757355f0012b860b1bc5e01eafa0
 F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
 F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c
-F src/os.h c2ebd26a68a4223fe170b003852b97d9e7211498
+F src/os.h 027491c77d2404c0a678bb3fb06286f331eb9b57
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_unix.c d7c96b5d140f550f07345870112fae5d7ef99757
 F src/os_win.c e3d3d3e26b65a35d4293d753137a58510bd3299b
@@ -1008,7 +1008,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 60c6a9864cd8dfa221215e9ef651781440f056fc
-P 22b72e499d2aeba42d0531ae58f87ff023787f47
-R 7a9ae759b6585bddd1352351a6c5ae73
+P bec97c98130f057321f3db1436a24377c3c64f81
+R 9ab8bb2549750bb239d2842c9dc60680
 U mistachkin
-Z 2e386fb6f10594ee697cff75e8a92cd8
+Z b6a365cc856116cf33aff81d6af1be2b
diff --git a/manifest.uuid b/manifest.uuid
index 766d2967de..3024e988e4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bec97c98130f057321f3db1436a24377c3c64f81
\ No newline at end of file
+335e91e599555d9f4e42f90576d1676c381314f4
\ No newline at end of file
diff --git a/src/os.h b/src/os.h
index 37d08fc254..1ec7d4ba11 100644
--- a/src/os.h
+++ b/src/os.h
@@ -92,8 +92,8 @@
 #endif
 
 /*
-** Determine if we are dealing with WindowsRT (Metro) as this has a different and
-** incompatible API from win32.
+** Determine if we are dealing with WinRT, which provides only a subset of
+** the full Win32 API.
 */
 #if !defined(SQLITE_OS_WINRT)
 # define SQLITE_OS_WINRT 0

From e2e2ab3a2d9f29aecf1ccac661ccddda892a6162 Mon Sep 17 00:00:00 2001
From: mistachkin <mistachkin@noemail.net>
Date: Mon, 6 Aug 2012 10:51:55 +0000
Subject: [PATCH 18/36] Update description strings in the VSIX package.

FossilOrigin-Name: 541e9310a7b88e0b40c6530947803527f28e51de
---
 manifest             |  12 ++++++------
 manifest.uuid        |   2 +-
 tool/win/sqlite.vsix | Bin 32790 -> 32802 bytes
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/manifest b/manifest
index 5d32d1deb2..830c9c3fb7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Correct\scomment\sabout\sWinRT\scompiler\sdefine.\s\sNo\schanges\sto\scode.
-D 2012-08-03T10:00:56.291
+C Update\sdescription\sstrings\sin\sthe\sVSIX\spackage.
+D 2012-08-06T10:51:55.331
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -1007,8 +1007,8 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-F tool/win/sqlite.vsix 60c6a9864cd8dfa221215e9ef651781440f056fc
-P bec97c98130f057321f3db1436a24377c3c64f81
-R 9ab8bb2549750bb239d2842c9dc60680
+F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
+P 335e91e599555d9f4e42f90576d1676c381314f4
+R eadc6c87ec15f9db6747eb42f404a18d
 U mistachkin
-Z b6a365cc856116cf33aff81d6af1be2b
+Z 9bc32025e8412eea1e17719cbb9188be
diff --git a/manifest.uuid b/manifest.uuid
index 3024e988e4..f7027c4945 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-335e91e599555d9f4e42f90576d1676c381314f4
\ No newline at end of file
+541e9310a7b88e0b40c6530947803527f28e51de
\ No newline at end of file
diff --git a/tool/win/sqlite.vsix b/tool/win/sqlite.vsix
index 9dd5c814085d0efb83f5a7e628d96a3bcf9d6123..4bdfda5c7df1cbd70227f33bb4b2200a7b77c25e 100644
GIT binary patch
delta 879
zcmV-#1CacdfC8d`0<d%f4GbOzLGE*3KTiSx0I8FK0#XFhBl#$k*8*dI>EHcY$K~$?
zZqZgNAvsLQo;}PGn64H^hb8&m9j+sVS^~qIuueer*{*eH3~ukRrqLc<IuDYtaBYD5
zm2jykQzy8CD}~(ahJ{A&sskW&mAB{#j9z&3Ti_)!=(;h~G1x)KlxMlKjM`E$5Zg;Z
zhC&#?Px7uiD|NN<*hL?I0DH6n^Ugp6k_@^VTVNm{TS<&m7#`{L3~z{8+iJ$>nTng0
zE@-sxRok{{_+h%sb-q%C%R{>4+GOfqr$fc}WJq$}Ii~PRARi&dRqFA((-s~>BZqM8
z7^F||?P;IvG-97+;yjIQ>0Zf@sUFZf-0GZcppl9HlsBBI{pMkRs&cs&EuXZpRi-+#
zKbm@4Yih@}4AH2GMns*S^yoQOVHD{MK>mZi6=Js9dP&_u;%uvv;qFM-z-Y{_sc>b?
zgY;eG!+u2x%yQSr5Z@TLKohm`!ex%WBHrm@a*)`^4NIMJI=lXqK!i*MFH>AcDV4gD
z!hWJ(LJpEzzwZP#Ju9BO5&v6wyY2sKPwmS*Wf`}wLLiQ}&|5IyHuO66De`id$g+QJ
zQh8mDDGmWM_2N~My+5<)1mJWH5*`LYWd>Jj0s#O3c$3w6E`PQBG*vhNhmbg}(Pq7P
z9RhF9CX@({w!X1vW-|S(jrsugNH)=D(WzEo3o6m>65U93a<0|%YCM`O(ZCA5j7Lf>
z&^wcV-R3nUI(=B7fU1bqBifQ$uQrVptU-6|JyY2fvdn8V{}fT6H`|_B6T^+IDA9Wn
zcM->J+eZG~bZ->#F8+bgW@$D!4OaX0%sGSLw?TY(A2xHclA{Igkp(!grN0ZZH5N>s
zDv7fB3Sa&4kbO9qHqH@?UpGe3892Q3iN0ng{>wl)<6<9N7Sb>T;^~dhs-sYjgg)vn
zu2;{OFS=_m{;e<!-%v{f1e2kE7_$O<$N~)v9tJ_~b6-DC0ssK1lh=JW2DS;u|G;yT
z6n;Db?UPY{Sph1OtA1Po@RJCCK0^{720>*8S84(Q004La000jFBme*a00000AOHXW
z!+8JzQ$$NmVQy(=Wpi{ccx`M703ZMW0000102lx}NN5MabCZdGJOT2P#(zo%_<H~V
F005!+lNta3

delta 842
zcmV-Q1GW63fC83)0<d%f4VswxK)Q9l(MkdU0H2eA0#XFxBOfJ`*8*dI^zVMH<MMX`
zw`i-C6gf=Do;}PGn64H^hb8$w9Ij&twIqf)VV!{L*{*eH3~ukRrqLc<IuAR-Or3ZS
z0Tgnt8y50DKnFnR&fB6VFnZz9Z-JM{pzFp^$Gd}&DbI3e8MUQiAhwrd7z$wkKgqk!
zSL$lzvCBRH_Gkm<oq+~_gbccST3{d`TS<;oDm<3cS9n9r+Ez10&s5y3bU~wihuXGH
z!w=J4sq>X8TprRT*Ctc{1|3d(Plkl^&M}2o68Q)*u2PTRowo288gat0Pmn&rx2HYX
zX~v#q;yjIQ>0V*TR1fF_ZgoyJ(8$Dp${Wtqe)BL(xm=5uPukdjDpQ@=yQZGjn%Z$K
zqcduv5mBd}9zDk@jAA(hkpG}>g_y0jUZ^`roM?42(p?cYFdDOKDqI=!Abl6nuwPLE
zv)nZ@x;Mrx&_qSN2$`d=h<9q39EA08!*WjX&aOWt5Ft~+%k0)sK&9>kAah)}HoSx!
zgtUI&$#_;gcO(8Wx7>Ey|5cpYAM>=zxOEi*alD1zg88<g*Gr!wFNcXN`!^<)H|0oi
zNSLV?Z;|Z%0kiD{;B*b33I9MqPrF|G0001PliGPMe>ME23J2g25~nrVtQW6C;O*HI
z2=r*{^LS<^(~riecVLfX6MYgLYX!EX3hgG*t<*=ST1_v;qsbBttkBDNq|^evGsWk1
z(LkcJyA=wknpi!cy<h8|xMix^QkF%7W{->hn3Nc<Y)y&Yiny~l?z%4WZ>Fb+H}N-w
zHqY|GXkRe6ThE*`2!0)ogJ4CS51TnzDbND%kOerfmA?sRDV9v0YKijs3Sa!;ka!Tx
zTIYzxr>zlm27X@pL|-x!|7W0@ak&jHOKBMb@%Tz;)j_C4LJLhF*Q=-VXWjP}{}va9
zFHlPZ1e2|Q7_$z0$N~+TnEF7vb-vL`0ssJ?ljD6i28b0zHJodcAbvan=#yQ3Spg-J
zw|-m!>ys3JJ|Cb7|3E-byI%VM003?Q000jFBme*a00000AOHXWzLRl(9tMO7N=)=_
Ula+rw0p^p^e@X`IdjJ3c0Jd9(Bme*a


From 428c218c90cce7bbff210a19ee01ecdc01511076 Mon Sep 17 00:00:00 2001
From: dan <dan@noemail.net>
Date: Mon, 6 Aug 2012 18:50:11 +0000
Subject: [PATCH 19/36] When reusing pages as part of creating a new index,
 allocate the leaves from each free-list trunk page in ascending order,
 instead of trying to maximize localization for each individual allocation.
 This increases the chance that pages will be written to disk in ascending
 order by a large CREATE INDEX statement, improving overall performance.

FossilOrigin-Name: d045f8b2d44e388d8c4549ff02d4ca7eff4e2038
---
 manifest         | 27 ++++++++---------
 manifest.uuid    |  2 +-
 src/analyze.c    |  2 +-
 src/btree.c      | 17 +++++++++--
 src/btree.h      |  8 +++++-
 src/btreeInt.h   |  1 +
 src/build.c      |  6 ++--
 src/sqliteInt.h  |  2 ++
 src/test_vfs.c   |  3 +-
 src/vdbe.c       |  7 ++++-
 test/index5.test | 75 ++++++++++++++++++++++++++++++++++++++++++++++++
 11 files changed, 125 insertions(+), 25 deletions(-)
 create mode 100644 test/index5.test

diff --git a/manifest b/manifest
index 7722412b09..34d8efeb55 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\ssorter-coalesce-writes\sbranch\swith\slatest\strunk\schanges.
-D 2012-08-06T18:10:09.480
+C When\sreusing\spages\sas\spart\sof\screating\sa\snew\sindex,\sallocate\sthe\sleaves\sfrom\seach\sfree-list\strunk\spage\sin\sascending\sorder,\sinstead\sof\strying\sto\smaximize\slocalization\sfor\seach\sindividual\sallocation.\sThis\sincreases\sthe\schance\sthat\spages\swill\sbe\swritten\sto\sdisk\sin\sascending\sorder\sby\sa\slarge\sCREATE\sINDEX\sstatement,\simproving\soverall\sperformance.
+D 2012-08-06T18:50:11.492
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -117,16 +117,16 @@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
 F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
 F src/alter.c 149cc80d9257971b0bff34e58fb2263e01998289
-F src/analyze.c a4790912e504c8ddac273445e7aba39bbce50881
+F src/analyze.c 7553068d21e32a57fc33ab6b2393fc8c1ba41410
 F src/attach.c 577bf5675b0c50495fc28549f2fcbdb1bac71143
 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c 5b31b24d6814b11de763debf342c8cd0a15a4910
 F src/bitvec.c 26675fe8e431dc555e6f2d0e11e651d172234aa1
 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
-F src/btree.c f0b71054103cb77eb5e782088c16998ec4f06624
-F src/btree.h 48a013f8964f12d944d90e4700df47b72dd6d923
-F src/btreeInt.h 38a639c0542c29fe8331a221c4aed0cb8686249e
-F src/build.c 47c4506afe4bcb4ed1f4b5357582d1cb3402f8ad
+F src/btree.c 1d366468b6f30234d76bf1da43e038d6f3ba2c9c
+F src/btree.h 4aee02e879211bfcfd3f551769578d2e940ab6c2
+F src/btreeInt.h 4e5c2bd0f9b36b2a815a6d84f771a61a65830621
+F src/build.c 0f6b40ad6211dcaba6159d0f9a297f0704f22142
 F src/callback.c 0cb4228cdcd827dcc5def98fb099edcc9142dbcd
 F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
 F src/ctime.c 500d019da966631ad957c37705642be87524463b
@@ -180,7 +180,7 @@ F src/select.c a365da6d7a6d7d8a10ad60ca71837ab5e9369466
 F src/shell.c 076e1c90d594644f36027c8ecff9a392cf2d3a06
 F src/sqlite.h.in 3e8035bc406b1571a5cc8ea46bcc831201676f1a
 F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
-F src/sqliteInt.h ed41801550b0b8fb8217fcfd2e362118062b30c0
+F src/sqliteInt.h c8169801f8bbfdf5873cc6fa45cb5df720c04db4
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@ -227,7 +227,7 @@ F src/test_superlock.c 2b97936ca127d13962c3605dbc9a4ef269c424cd
 F src/test_syscall.c a992d8c80ea91fbf21fb2dd570db40e77dd7e6ae
 F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa
 F src/test_thread.c e286f2173563f2a1747c24bcda6b9d030bf4f4e4
-F src/test_vfs.c da6d0d982b11756c94c1760196355d33d03ff745
+F src/test_vfs.c c6260ef238c1142c8f8bd402db02216afd182ae3
 F src/test_vfstrace.c 6b28adb2a0e8ecd0f2e3581482e1f658b11b4067
 F src/test_wholenumber.c 3d2b9ed1505c40ad5c5ca2ad16ae7a289d6cc251
 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
@@ -237,7 +237,7 @@ F src/update.c d3076782c887c10e882996550345da9c4c9f9dea
 F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
 F src/util.c 0af2e515dc0dabacec931bca39525f6c3f1c5455
 F src/vacuum.c 587a52bb8833d7ac15af8916f25437e2575028bd
-F src/vdbe.c f5ad3c06dc3fe647097065829c013f3f1b9eadca
+F src/vdbe.c 75da79cdcd58481825a06f045bc2f5ea3966eeae
 F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
 F src/vdbeInt.h 986b6b11a13c517337355009e5438703ba5b0a40
 F src/vdbeapi.c 88ea823bbcb4320f5a6607f39cd7c2d3cc4c26b1
@@ -531,6 +531,7 @@ F test/index.test b5429732b3b983fa810e3ac867d7ca85dae35097
 F test/index2.test ee83c6b5e3173a3d7137140d945d9a5d4fdfb9d6
 F test/index3.test 423a25c789fc8cc51aaf2a4370bbdde2d9e9eed7
 F test/index4.test 1e299862024012e0165531cce251572f7f084d15
+F test/index5.test edc8c64ca78bee140c21ce3836820fadf47906bb
 F test/indexedby.test be501e381b82b2f8ab406309ba7aac46e221f4ad
 F test/indexfault.test 31d4ab9a7d2f6e9616933eb079722362a883eb1d
 F test/init.test 15c823093fdabbf7b531fe22cf037134d09587a7
@@ -1008,7 +1009,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P f4b3fded231231ef15bde98d2a996b4e16415d4c 541e9310a7b88e0b40c6530947803527f28e51de
-R 29178e6d938c0a18dd53fdfdd0d9db73
+P 214f8cda1727e0eee51605be487d4cf4f2dfb6db
+R 3158683ecf6a85f9d8794482d2318bc6
 U dan
-Z ebf9b1cca66bb54b576393e824c02bfc
+Z 52fb98b324ddd516442d0480eabbc4d5
diff --git a/manifest.uuid b/manifest.uuid
index 5a544c351b..c85d23ae1e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-214f8cda1727e0eee51605be487d4cf4f2dfb6db
\ No newline at end of file
+d045f8b2d44e388d8c4549ff02d4ca7eff4e2038
\ No newline at end of file
diff --git a/src/analyze.c b/src/analyze.c
index 810ed54d85..632fdc1ac1 100644
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -176,7 +176,7 @@ static void openStatTable(
           "CREATE TABLE %Q.%s(%s)", pDb->zName, zTab, aTable[i].zCols
       );
       aRoot[i] = pParse->regRoot;
-      aCreateTbl[i] = 1;
+      aCreateTbl[i] = OPFLAG_P2ISREG;
     }else{
       /* The table already exists. If zWhere is not NULL, delete all entries 
       ** associated with the table zWhere. If zWhere is NULL, delete the
diff --git a/src/btree.c b/src/btree.c
index c16eca5f64..7f1fd7e148 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -5926,7 +5926,8 @@ static int balance_nonroot(
   MemPage *pParent,               /* Parent page of siblings being balanced */
   int iParentIdx,                 /* Index of "the page" in pParent */
   u8 *aOvflSpace,                 /* page-size bytes of space for parent ovfl */
-  int isRoot                      /* True if pParent is a root-page */
+  int isRoot,                     /* True if pParent is a root-page */
+  int bBulk                       /* True if this call is part of a bulk load */
 ){
   BtShared *pBt;               /* The whole database */
   int nCell = 0;               /* Number of cells in apCell[] */
@@ -6257,7 +6258,7 @@ static int balance_nonroot(
       if( rc ) goto balance_cleanup;
     }else{
       assert( i>0 );
-      rc = allocateBtreePage(pBt, &pNew, &pgno, pgno, 0);
+      rc = allocateBtreePage(pBt, &pNew, &pgno, (bBulk ? 1 : pgno), 0);
       if( rc ) goto balance_cleanup;
       apNew[i] = pNew;
       nNew++;
@@ -6707,7 +6708,7 @@ static int balance(BtCursor *pCur){
           ** pSpace buffer passed to the latter call to balance_nonroot().
           */
           u8 *pSpace = sqlite3PageMalloc(pCur->pBt->pageSize);
-          rc = balance_nonroot(pParent, iIdx, pSpace, iPage==1);
+          rc = balance_nonroot(pParent, iIdx, pSpace, iPage==1, pCur->hints);
           if( pFree ){
             /* If pFree is not NULL, it points to the pSpace buffer used 
             ** by a previous call to balance_nonroot(). Its contents are
@@ -8294,3 +8295,13 @@ int sqlite3BtreeSetVersion(Btree *pBtree, int iVersion){
   pBt->btsFlags &= ~BTS_NO_WAL;
   return rc;
 }
+
+/*
+** set the mask of hint flags for cursor pCsr. Currently the only valid
+** values are 0 and BTREE_BULKLOAD.
+*/
+void sqlite3BtreeCursorHints(BtCursor *pCsr, unsigned int mask){
+  assert( mask==BTREE_BULKLOAD || mask==0 );
+  pCsr->hints = mask;
+}
+
diff --git a/src/btree.h b/src/btree.h
index 9832001b7f..95897d5662 100644
--- a/src/btree.h
+++ b/src/btree.h
@@ -135,6 +135,12 @@ int sqlite3BtreeUpdateMeta(Btree*, int idx, u32 value);
 #define BTREE_USER_VERSION        6
 #define BTREE_INCR_VACUUM         7
 
+/*
+** Values that may be OR'd together to form the second argument of an
+** sqlite3BtreeCursorHints() call.
+*/
+#define BTREE_BULKLOAD 0x00000001
+
 int sqlite3BtreeCursor(
   Btree*,                              /* BTree containing table to open */
   int iTable,                          /* Index of root page */
@@ -178,8 +184,8 @@ struct Pager *sqlite3BtreePager(Btree*);
 int sqlite3BtreePutData(BtCursor*, u32 offset, u32 amt, void*);
 void sqlite3BtreeCacheOverflow(BtCursor *);
 void sqlite3BtreeClearCursor(BtCursor *);
-
 int sqlite3BtreeSetVersion(Btree *pBt, int iVersion);
+void sqlite3BtreeCursorHints(BtCursor *, unsigned int mask);
 
 #ifndef NDEBUG
 int sqlite3BtreeCursorIsValid(BtCursor*);
diff --git a/src/btreeInt.h b/src/btreeInt.h
index 0d21497966..b157decec7 100644
--- a/src/btreeInt.h
+++ b/src/btreeInt.h
@@ -510,6 +510,7 @@ struct BtCursor {
 #ifndef SQLITE_OMIT_INCRBLOB
   u8 isIncrblobHandle;      /* True if this cursor is an incr. io handle */
 #endif
+  u8 hints;                             /* As configured by CursorSetHints() */
   i16 iPage;                            /* Index of current page in apPage */
   u16 aiIdx[BTCURSOR_MAX_DEPTH];        /* Current index in apPage[i] */
   MemPage *apPage[BTCURSOR_MAX_DEPTH];  /* Pages from root to current page */
diff --git a/src/build.c b/src/build.c
index 9f13b7b11c..776ffa4db3 100644
--- a/src/build.c
+++ b/src/build.c
@@ -1581,7 +1581,7 @@ void sqlite3EndTable(
 
       assert(pParse->nTab==1);
       sqlite3VdbeAddOp3(v, OP_OpenWrite, 1, pParse->regRoot, iDb);
-      sqlite3VdbeChangeP5(v, 1);
+      sqlite3VdbeChangeP5(v, OPFLAG_P2ISREG);
       pParse->nTab = 2;
       sqlite3SelectDestInit(&dest, SRT_Table, 1);
       sqlite3Select(pParse, pSelect, &dest);
@@ -2397,9 +2397,7 @@ static void sqlite3RefillIndex(Parse *pParse, Index *pIndex, int memRootPage){
   pKey = sqlite3IndexKeyinfo(pParse, pIndex);
   sqlite3VdbeAddOp4(v, OP_OpenWrite, iIdx, tnum, iDb, 
                     (char *)pKey, P4_KEYINFO_HANDOFF);
-  if( memRootPage>=0 ){
-    sqlite3VdbeChangeP5(v, 1);
-  }
+  sqlite3VdbeChangeP5(v, OPFLAG_BULKCSR|((memRootPage>=0)?OPFLAG_P2ISREG:0));
 
 #ifndef SQLITE_OMIT_MERGE_SORT
   /* Open the sorter cursor if we are to use one. */
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index c525ebd16f..b3cdb2363c 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -2317,6 +2317,8 @@ struct AuthContext {
 #define OPFLAG_CLEARCACHE    0x20    /* Clear pseudo-table cache in OP_Column */
 #define OPFLAG_LENGTHARG     0x40    /* OP_Column only used for length() */
 #define OPFLAG_TYPEOFARG     0x80    /* OP_Column only used for typeof() */
+#define OPFLAG_BULKCSR       0x01    /* OP_Open** used to open bulk cursor */
+#define OPFLAG_P2ISREG       0x02    /* P2 to OP_Open** is a register number */
 
 /*
  * Each trigger present in the database schema is stored as an instance of
diff --git a/src/test_vfs.c b/src/test_vfs.c
index fd2aa9fb07..93c556b56e 100644
--- a/src/test_vfs.c
+++ b/src/test_vfs.c
@@ -361,7 +361,8 @@ static int tvfsWrite(
 
   if( p->pScript && p->mask&TESTVFS_WRITE_MASK ){
     tvfsExecTcl(p, "xWrite", 
-        Tcl_NewStringObj(pFd->zFilename, -1), pFd->pShmId, 0
+        Tcl_NewStringObj(pFd->zFilename, -1), pFd->pShmId, 
+        Tcl_NewWideIntObj(iOfst)
     );
     tvfsResultCode(p, &rc);
   }
diff --git a/src/vdbe.c b/src/vdbe.c
index 19c0255b8f..12e7325143 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -3120,6 +3120,9 @@ case OP_OpenWrite: {
   VdbeCursor *pCur;
   Db *pDb;
 
+  assert( (pOp->p5&(OPFLAG_P2ISREG|OPFLAG_BULKCSR))==pOp->p5 );
+  assert( pOp->opcode==OP_OpenWrite || pOp->p5==0 );
+
   if( p->expired ){
     rc = SQLITE_ABORT;
     break;
@@ -3143,7 +3146,7 @@ case OP_OpenWrite: {
   }else{
     wrFlag = 0;
   }
-  if( pOp->p5 ){
+  if( pOp->p5 & OPFLAG_P2ISREG ){
     assert( p2>0 );
     assert( p2<=p->nMem );
     pIn2 = &aMem[p2];
@@ -3174,6 +3177,8 @@ case OP_OpenWrite: {
   pCur->isOrdered = 1;
   rc = sqlite3BtreeCursor(pX, p2, wrFlag, pKeyInfo, pCur->pCursor);
   pCur->pKeyInfo = pKeyInfo;
+  assert( OPFLAG_BULKCSR==BTREE_BULKLOAD );
+  sqlite3BtreeCursorHints(pCur->pCursor, (pOp->p5 & OPFLAG_BULKCSR));
 
   /* Since it performs no memory allocation or IO, the only value that
   ** sqlite3BtreeCursor() may return is SQLITE_OK. */
diff --git a/test/index5.test b/test/index5.test
new file mode 100644
index 0000000000..c8e94b3985
--- /dev/null
+++ b/test/index5.test
@@ -0,0 +1,75 @@
+# 2012 August 6
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+#
+
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+set ::testprefix index5
+
+do_test 1.1 {
+  execsql {
+    PRAGMA page_size = 1024;
+    CREATE TABLE t1(x);
+    BEGIN;
+  }
+  for {set i 0} {$i < 100000} {incr i} {
+    execsql { INSERT INTO t1 VALUES(randstr(100,100)) }
+  }
+  execsql COMMIT
+  execsql { 
+    CREATE INDEX i1 ON t1(x);
+    DROP INDEX I1;
+    PRAGMA main.page_size;
+  }
+} {1024}
+
+db close
+testvfs tvfs
+tvfs filter xWrite
+tvfs script write_cb
+proc write_cb {xCall file handle iOfst} {
+  if {[file tail $file]=="test.db"} {
+    lappend ::write_list [expr $iOfst/1024]
+  }
+  puts "$xCall $file $args"
+}
+
+do_test 1.2 {
+  sqlite3 db test.db -vfs tvfs
+  set ::write_list [list]
+  execsql { CREATE INDEX i1 ON t1(x) }
+} {}
+
+do_test 1.3 {
+  set nForward 0
+  set nBackward 0
+  set nNoncont 0
+  set iPrev [lindex $::write_list 0]
+  for {set i 1} {$i < [llength $::write_list]} {incr i} {
+    set iNext [lindex $::write_list $i]
+    if {$iNext==($iPrev+1)} {
+      incr nForward
+    } elseif {$iNext==($iPrev-1)} { 
+      incr nBackward 
+    } else {
+      incr nNoncont
+    }
+    set iPrev $iNext
+  }
+
+  expr {$nForward > $nBackward}
+} {1}
+db close
+tvfs delete
+
+finish_test
+

From 243be2b0e11bab0da1cf198555d5f0efcbeaaddb Mon Sep 17 00:00:00 2001
From: dan <dan@noemail.net>
Date: Mon, 6 Aug 2012 19:12:17 +0000
Subject: [PATCH 20/36] Fix a crash that could follow an OOM condition.

FossilOrigin-Name: 2e5741f774248abc678b50711c43e38ca30c9091
---
 manifest       | 12 ++++++------
 manifest.uuid  |  2 +-
 src/vdbesort.c |  5 +++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 34d8efeb55..39fe08007e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\sreusing\spages\sas\spart\sof\screating\sa\snew\sindex,\sallocate\sthe\sleaves\sfrom\seach\sfree-list\strunk\spage\sin\sascending\sorder,\sinstead\sof\strying\sto\smaximize\slocalization\sfor\seach\sindividual\sallocation.\sThis\sincreases\sthe\schance\sthat\spages\swill\sbe\swritten\sto\sdisk\sin\sascending\sorder\sby\sa\slarge\sCREATE\sINDEX\sstatement,\simproving\soverall\sperformance.
-D 2012-08-06T18:50:11.492
+C Fix\sa\scrash\sthat\scould\sfollow\san\sOOM\scondition.
+D 2012-08-06T19:12:17.500
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -244,7 +244,7 @@ F src/vdbeapi.c 88ea823bbcb4320f5a6607f39cd7c2d3cc4c26b1
 F src/vdbeaux.c dce80038c3c41f2680e5ab4dd0f7e0d8b7ff9071
 F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
 F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
-F src/vdbesort.c ad3078561072cc3faaf8084b5d7d3cd6affb5f42
+F src/vdbesort.c 1de867bfa04a54c217bfe467f43206c801912921
 F src/vdbetrace.c 8bd5da325fc90f28464335e4cc4ad1407fe30835
 F src/vtab.c bb8ea3a26608bb1357538a5d2fc72beba6638998
 F src/wal.c 9294df6f96aae5909ae1a9b733fd1e1b4736978b
@@ -1009,7 +1009,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P 214f8cda1727e0eee51605be487d4cf4f2dfb6db
-R 3158683ecf6a85f9d8794482d2318bc6
+P d045f8b2d44e388d8c4549ff02d4ca7eff4e2038
+R 271a84ad323420f7636b49c9d4c7979c
 U dan
-Z 52fb98b324ddd516442d0480eabbc4d5
+Z da2600161cd5536c31009989e6b616b4
diff --git a/manifest.uuid b/manifest.uuid
index c85d23ae1e..5e7b941fbe 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d045f8b2d44e388d8c4549ff02d4ca7eff4e2038
\ No newline at end of file
+2e5741f774248abc678b50711c43e38ca30c9091
\ No newline at end of file
diff --git a/src/vdbesort.c b/src/vdbesort.c
index 1fcf0ddd27..7433e3e08c 100644
--- a/src/vdbesort.c
+++ b/src/vdbesort.c
@@ -919,8 +919,9 @@ int sqlite3VdbeSorterRewind(sqlite3 *db, const VdbeCursor *pCsr, int *pbEof){
         rc = vdbeSorterOpenTempFile(db, &pTemp2);
       }
 
-      rc = fileWriterInit(db, pTemp2, &writer, iWrite2);
-
+      if( rc==SQLITE_OK ){
+        rc = fileWriterInit(db, pTemp2, &writer, iWrite2);
+      }
       if( rc==SQLITE_OK ){
         rc = fileWriterWriteVarint(&writer, nWrite);
       }

From ab8c4cf3b85d49ec5fb9522a163eda4b80507462 Mon Sep 17 00:00:00 2001
From: mistachkin <mistachkin@noemail.net>
Date: Mon, 6 Aug 2012 22:29:26 +0000
Subject: [PATCH 21/36] Modify VSIX package generation tool to put the PDB
 files in the Debug directory.

FossilOrigin-Name: 9d0720833fd52b25e62aca9ab4cf1e234fd792aa
---
 manifest        | 14 +++++++-------
 manifest.uuid   |  2 +-
 tool/mkvsix.tcl |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 45bf47c50d..2d53fb160d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sthe\ssorter-coalesce-writes\sbranch\sinto\sthe\strunk.\sThis\simproves\sCREATE\sINDEX\sperformance\son\ssome\splatforms.
-D 2012-08-06T19:28:20.956
+C Modify\sVSIX\spackage\sgeneration\stool\sto\sput\sthe\sPDB\sfiles\sin\sthe\sDebug\sdirectory.
+D 2012-08-06T22:29:26.747
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -984,7 +984,7 @@ F tool/mksqlite3c-noext.tcl 8bce31074e4cbe631bb7676526a048335f4c9f02
 F tool/mksqlite3c.tcl 589c7f44e990be1b8443cfe4808dce392b0327fa
 F tool/mksqlite3h.tcl 78013ad79a5e492e5f764f3c7a8ef834255061f8
 F tool/mksqlite3internalh.tcl 3dca7bb5374cee003379b8cbac73714f610ef795
-F tool/mkvsix.tcl 153187ce9f1911bc2d0caa7af9856d7b8b805e27
+F tool/mkvsix.tcl 19b2ab9ea16445953a76568a5bbe4cb864f92dfe
 F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
 F tool/omittest.tcl 4665982e95a6e5c1bd806cf7bc3dea95be422d77
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@ -1009,7 +1009,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P 541e9310a7b88e0b40c6530947803527f28e51de 2e5741f774248abc678b50711c43e38ca30c9091
-R 9ea05a2580296dc700acf20c4ae23876
-U dan
-Z ec36f3ad854c62e55cc3fc27576cdc7b
+P e1e9cb08b011e67b767091e42225f22ec862fa64
+R e7789c6a450315035c3cc54a03a15b19
+U mistachkin
+Z 84444372179c1835c9283e74796447ef
diff --git a/manifest.uuid b/manifest.uuid
index 5a53d65817..01045ed8f6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e1e9cb08b011e67b767091e42225f22ec862fa64
\ No newline at end of file
+9d0720833fd52b25e62aca9ab4cf1e234fd792aa
\ No newline at end of file
diff --git a/tool/mkvsix.tcl b/tool/mkvsix.tcl
index 506ab7334d..a7517786c5 100644
--- a/tool/mkvsix.tcl
+++ b/tool/mkvsix.tcl
@@ -273,7 +273,7 @@ if {![info exists fileNames(destination)]} then {
 
   if {![info exists no(symbols)]} then {
     lappend fileNames(destination) \
-        [file join $stagingDirectory Redist CommonConfiguration \
+        [file join $stagingDirectory Redist Debug \
             <platform> sqlite3.pdb]
   }
 }

From 809badc93aa6377b2ba3b2b24ce105a8b6f787d1 Mon Sep 17 00:00:00 2001
From: dan <dan@noemail.net>
Date: Tue, 7 Aug 2012 13:55:41 +0000
Subject: [PATCH 22/36] Fix a bug in walthread.test causing intermittent
 failures.

FossilOrigin-Name: a192a718d513002b58ad585fcb3d8b9b49b4b123
---
 manifest            | 14 +++++++-------
 manifest.uuid       |  2 +-
 test/walthread.test |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/manifest b/manifest
index 2d53fb160d..b9b6913d70 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Modify\sVSIX\spackage\sgeneration\stool\sto\sput\sthe\sPDB\sfiles\sin\sthe\sDebug\sdirectory.
-D 2012-08-06T22:29:26.747
+C Fix\sa\sbug\sin\swalthread.test\scausing\sintermittent\sfailures.
+D 2012-08-07T13:55:41.483
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -949,7 +949,7 @@ F test/walpersist.test 8c6b7e3ec1ba91b5e4dc4e0921d6d3f87cd356a6
 F test/walro.test f183c0003060a64793f9bfafef4c479418ed7fa8
 F test/walshared.test 6dda2293880c300baf5d791c307f653094585761
 F test/walslow.test e7be6d9888f83aa5d3d3c7c08aa9b5c28b93609a
-F test/walthread.test a2ed5270eb695284d4ad27d252517bdc3317ee2a
+F test/walthread.test de8dbaf6d9e41481c460ba31ca61e163d7348f8e
 F test/where.test 4c9f69987ed2aa0173fa930f2b41ab9879478cd8
 F test/where2.test 43d4becaf5a5df854e6c21d624a1cb84c6904554
 F test/where3.test 667e75642102c97a00bf9b23d3cb267db321d006
@@ -1009,7 +1009,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P e1e9cb08b011e67b767091e42225f22ec862fa64
-R e7789c6a450315035c3cc54a03a15b19
-U mistachkin
-Z 84444372179c1835c9283e74796447ef
+P 9d0720833fd52b25e62aca9ab4cf1e234fd792aa
+R 949e37e42acb7f9147b680b8c86a82df
+U dan
+Z 621c379326eb2bebdae5065332685c50
diff --git a/manifest.uuid b/manifest.uuid
index 01045ed8f6..31d968f67c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9d0720833fd52b25e62aca9ab4cf1e234fd792aa
\ No newline at end of file
+a192a718d513002b58ad585fcb3d8b9b49b4b123
\ No newline at end of file
diff --git a/test/walthread.test b/test/walthread.test
index cbd6371857..6249ce11af 100644
--- a/test/walthread.test
+++ b/test/walthread.test
@@ -277,8 +277,8 @@ do_thread_test2 walthread-1 -seconds $seconds(walthread-1) -init {
   proc write_transaction {} {
     db eval {
       BEGIN;
-        INSERT INTO t1 VALUES(randomblob(100));
-        INSERT INTO t1 VALUES(randomblob(100));
+        INSERT INTO t1 VALUES(randomblob(101 + $::E(pid)));
+        INSERT INTO t1 VALUES(randomblob(101 + $::E(pid)));
         INSERT INTO t1 SELECT md5sum(x) FROM t1;
       COMMIT;
     }

From 81f0740e59f0af3ac75fa27029208d39ccd90b87 Mon Sep 17 00:00:00 2001
From: dan <dan@noemail.net>
Date: Tue, 7 Aug 2012 14:18:18 +0000
Subject: [PATCH 23/36] Do not run test script spellfix.test if
 SQLITE_OMIT_VIRTUAL_TABLE is defined. Fix walro.test so that it works if
 DEFAULT_AUTOVACUUM is defined.

FossilOrigin-Name: 26428b459b45d0fa9fcad7eb5e58bd60b04a0f83
---
 manifest           | 14 +++++++-------
 manifest.uuid      |  2 +-
 test/spellfix.test |  2 ++
 test/walro.test    |  2 ++
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index b9b6913d70..9a30337452 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbug\sin\swalthread.test\scausing\sintermittent\sfailures.
-D 2012-08-07T13:55:41.483
+C Do\snot\srun\stest\sscript\sspellfix.test\sif\sSQLITE_OMIT_VIRTUAL_TABLE\sis\sdefined.\sFix\swalro.test\sso\sthat\sit\sworks\sif\sDEFAULT_AUTOVACUUM\sis\sdefined.
+D 2012-08-07T14:18:18.405
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -717,7 +717,7 @@ F test/speed3.test d32043614c08c53eafdc80f33191d5bd9b920523
 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
-F test/spellfix.test 936be6f7ba1c4d096adb280c68b32f4848af8d2e
+F test/spellfix.test 5af977d1a1a9e3801ed4239ee4dea92d70a53d35
 F test/sqllimits1.test b1aae27cc98eceb845e7f7adf918561256e31298
 F test/stat.test 08e8185b3fd5b010c90d7ad82b9dd4ea1cbf14b0
 F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9
@@ -946,7 +946,7 @@ F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 F test/walmode.test 4022fe03ae6e830583672caa101f046438a0473c
 F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
 F test/walpersist.test 8c6b7e3ec1ba91b5e4dc4e0921d6d3f87cd356a6
-F test/walro.test f183c0003060a64793f9bfafef4c479418ed7fa8
+F test/walro.test a31deb621033442a76c3a61e44929250d06f81b1
 F test/walshared.test 6dda2293880c300baf5d791c307f653094585761
 F test/walslow.test e7be6d9888f83aa5d3d3c7c08aa9b5c28b93609a
 F test/walthread.test de8dbaf6d9e41481c460ba31ca61e163d7348f8e
@@ -1009,7 +1009,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P 9d0720833fd52b25e62aca9ab4cf1e234fd792aa
-R 949e37e42acb7f9147b680b8c86a82df
+P a192a718d513002b58ad585fcb3d8b9b49b4b123
+R 3c99e2c9fab7d765db4c9bc2b2b98c3c
 U dan
-Z 621c379326eb2bebdae5065332685c50
+Z c2d7ea3513555d2c297d13781c66bc21
diff --git a/manifest.uuid b/manifest.uuid
index 31d968f67c..34bb15cac7 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a192a718d513002b58ad585fcb3d8b9b49b4b123
\ No newline at end of file
+26428b459b45d0fa9fcad7eb5e58bd60b04a0f83
\ No newline at end of file
diff --git a/test/spellfix.test b/test/spellfix.test
index 7459ca2cd6..14a4cd722e 100644
--- a/test/spellfix.test
+++ b/test/spellfix.test
@@ -14,6 +14,8 @@ set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 set testprefix spellfix
 
+ifcapable !vtab { finish_test ; return }
+
 register_spellfix_module db
 
 set vocab {
diff --git a/test/walro.test b/test/walro.test
index 81e3e62ee9..465ce838c2 100644
--- a/test/walro.test
+++ b/test/walro.test
@@ -56,6 +56,7 @@ do_multiclient_test tn {
   do_test 1.1.1 {
     code2 { sqlite3 db2 test.db }
     sql2 { 
+      PRAGMA auto_vacuum = 0;
       PRAGMA journal_mode = WAL;
       CREATE TABLE t1(x, y);
       INSERT INTO t1 VALUES('a', 'b');
@@ -268,6 +269,7 @@ do_multiclient_test tn {
     tv filter {}
     code1 { sqlite3 db test.db }
     csql1 { 
+      PRAGMA auto_vacuum = 0;
       PRAGMA journal_mode = WAL;
       BEGIN;
         CREATE TABLE t2(x, y);

From 38d073040d57c8598ca2e5cc5fda2a1d8e9ab01e Mon Sep 17 00:00:00 2001
From: dan <dan@noemail.net>
Date: Tue, 7 Aug 2012 15:19:27 +0000
Subject: [PATCH 24/36] Fix a bug in hash.c introduced by [305b66672653].

FossilOrigin-Name: 17cb5e951e419b1221ae4595d20059d90a361a39
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/hash.c    |  9 +++++++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 9a30337452..d1e82d468a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\srun\stest\sscript\sspellfix.test\sif\sSQLITE_OMIT_VIRTUAL_TABLE\sis\sdefined.\sFix\swalro.test\sso\sthat\sit\sworks\sif\sDEFAULT_AUTOVACUUM\sis\sdefined.
-D 2012-08-07T14:18:18.405
+C Fix\sa\sbug\sin\shash.c\sintroduced\sby\s[305b66672653].
+D 2012-08-07T15:19:27.578
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -137,7 +137,7 @@ F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c 657212460bf5cfd3ae607d12ea62092844c227b5
 F src/func.c 18dfedfb857e100b05755a1b12e88b389f957879
 F src/global.c 4cfdca5cb0edd33c4d021baec4ede958cb2c793b
-F src/hash.c 1f35276f9664dd150451b463805a952892227c73
+F src/hash.c a4031441741932da9e7a65bee2b36b5d0e81c073
 F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
 F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
 F src/insert.c 770ed633830fb49d73d90c3fdf20b703973e1e84
@@ -1009,7 +1009,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P a192a718d513002b58ad585fcb3d8b9b49b4b123
-R 3c99e2c9fab7d765db4c9bc2b2b98c3c
+P 26428b459b45d0fa9fcad7eb5e58bd60b04a0f83
+R 91c2befabc2142729ab9b898a169b7b2
 U dan
-Z c2d7ea3513555d2c297d13781c66bc21
+Z 74786c71a4a2788ff8896e58e602bf71
diff --git a/manifest.uuid b/manifest.uuid
index 34bb15cac7..3a22a25201 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-26428b459b45d0fa9fcad7eb5e58bd60b04a0f83
\ No newline at end of file
+17cb5e951e419b1221ae4595d20059d90a361a39
\ No newline at end of file
diff --git a/src/hash.c b/src/hash.c
index 8d5a706564..d7625d3913 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -113,16 +113,21 @@ static int rehash(Hash *pH, unsigned int new_size){
 
   /* The inability to allocates space for a larger hash table is
   ** a performance hit but it is not a fatal error.  So mark the
-  ** allocation as a benign.
+  ** allocation as a benign. Use sqlite3Malloc()/memset(0) instead of 
+  ** sqlite3MallocZero() to make the allocation, as sqlite3MallocZero()
+  ** only zeroes the requested number of bytes whereas this module will
+  ** use the actual amount of space allocated for the hash table (which
+  ** may be larger than the requested amount).
   */
   sqlite3BeginBenignMalloc();
-  new_ht = (struct _ht *)sqlite3MallocZero( new_size*sizeof(struct _ht) );
+  new_ht = (struct _ht *)sqlite3Malloc( new_size*sizeof(struct _ht) );
   sqlite3EndBenignMalloc();
 
   if( new_ht==0 ) return 0;
   sqlite3_free(pH->ht);
   pH->ht = new_ht;
   pH->htsize = new_size = sqlite3MallocSize(new_ht)/sizeof(struct _ht);
+  memset(new_ht, 0, new_size*sizeof(struct _ht));
   for(elem=pH->first, pH->first=0; elem; elem = next_elem){
     unsigned int h = strHash(elem->pKey, elem->nKey) % new_size;
     next_elem = elem->next;

From 2aba5d96f431f5a8b43c40a0c8bc4a67cf5b702f Mon Sep 17 00:00:00 2001
From: dan <dan@noemail.net>
Date: Tue, 7 Aug 2012 17:41:50 +0000
Subject: [PATCH 25/36] Add extra tests for secure-delete mode.

FossilOrigin-Name: e380cd3ce34d509e184081ecccf27fda11ce1da7
---
 manifest               | 13 +++---
 manifest.uuid          |  2 +-
 test/permutations.test |  2 +-
 test/securedel2.test   | 94 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 103 insertions(+), 8 deletions(-)
 create mode 100644 test/securedel2.test

diff --git a/manifest b/manifest
index d1e82d468a..46bc3095bf 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbug\sin\shash.c\sintroduced\sby\s[305b66672653].
-D 2012-08-07T15:19:27.578
+C Add\sextra\stests\sfor\ssecure-delete\smode.
+D 2012-08-07T17:41:50.005
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -642,7 +642,7 @@ F test/pageropt.test 9191867ed19a2b3db6c42d1b36b6fbc657cd1ab0
 F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
 F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
 F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
-F test/permutations.test 2af90e00cea9e7e7c0a6b16d34727cb5bbae14dd
+F test/permutations.test d12fabf8abdb71b79eb6c3ef3be5e875fe790071
 F test/pragma.test a62f73293b0f0d79b0c87f8dd32d46fe53b0bd17
 F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
 F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
@@ -676,6 +676,7 @@ F test/schema3.test 1bc1008e1f8cb5654b248c55f27249366eb7ed38
 F test/schema4.test e6a66e20cc69f0e306667c08be7fda3d11707dc5
 F test/schema5.test 0103e4c0313b3725b5ae5600bdca53006ab53db3
 F test/securedel.test 87a2561151af1f1e349071a89fdd77059f50113c
+F test/securedel2.test 8e92bfb6559744f31e18d5c88a7076ae1deea0a8
 F test/select1.test deba017eed9daa5af33de868676c997e7eebb931
 F test/select2.test 352480e0e9c66eda9c3044e412abdf5be0215b56
 F test/select3.test 2ce595f8fb8e2ac10071d3b4e424cadd4634a054
@@ -1009,7 +1010,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P 26428b459b45d0fa9fcad7eb5e58bd60b04a0f83
-R 91c2befabc2142729ab9b898a169b7b2
+P 17cb5e951e419b1221ae4595d20059d90a361a39
+R 2919015ca9831fb481e06469c7639f64
 U dan
-Z 74786c71a4a2788ff8896e58e602bf71
+Z af24cb62793571f094423bbb394787f8
diff --git a/manifest.uuid b/manifest.uuid
index 3a22a25201..a2792cb79e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-17cb5e951e419b1221ae4595d20059d90a361a39
\ No newline at end of file
+e380cd3ce34d509e184081ecccf27fda11ce1da7
\ No newline at end of file
diff --git a/test/permutations.test b/test/permutations.test
index 4370d8691d..c41c447a53 100644
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -111,7 +111,7 @@ set allquicktests [test_set $alltests -exclude {
   thread003.test thread004.test thread005.test trans2.test vacuum3.test 
   incrvacuum_ioerr.test autovacuum_crash.test btree8.test shared_err.test
   vtab_err.test walslow.test walcrash.test walcrash3.test
-  walthread.test rtree3.test indexfault.test 
+  walthread.test rtree3.test indexfault.test securedel2.test
 }]
 if {[info exists ::env(QUICKTEST_INCLUDE)]} {
   set allquicktests [concat $allquicktests $::env(QUICKTEST_INCLUDE)]
diff --git a/test/securedel2.test b/test/securedel2.test
new file mode 100644
index 0000000000..7183f17cff
--- /dev/null
+++ b/test/securedel2.test
@@ -0,0 +1,94 @@
+# 2012 August 7
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#*************************************************************************
+#
+# Tests for the secure_delete pragma.
+#
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+set ::testprefix securedel2
+
+# Generate 1000 pseudo-random 64-bit blobs.
+#
+for {set i 1} {$i <= 1000} {incr i} {
+  set aBlob($i) [string range [db one {SELECT quote(randomblob(8))}] 2 end-1]
+}
+
+proc detect_blob_prepare {zFile} {
+  set nByte [file size $zFile]
+  set ::detect_blob_data [hexio_read $zFile 0 $nByte]
+}
+
+proc detect_blob {zFile iBlob} {
+  if {$zFile != ""} { detect_blob_prepare $zFile }
+  string match "*$::aBlob($iBlob)*" $::detect_blob_data
+}
+
+do_test 1.1 {
+  execsql { PRAGMA secure_delete = 1 }
+  execsql { CREATE TABLE t1(x, y) }
+  for {set i 1} {$i <= 1000} {incr i} {
+    set x "X'[string repeat $aBlob($i) 1]'"
+    set y "X'[string repeat $aBlob($i) 500]'"
+    execsql "INSERT INTO t1 VALUES($x, $y)"
+  }
+} {}
+
+do_test         1.2   { detect_blob test.db 1 } {1}
+
+forcecopy test.db test.db.bak
+do_execsql_test 1.3.1 { PRAGMA secure_delete = 0 } {0}
+do_execsql_test 1.3.2 { DELETE FROM t1 WHERE rowid = 1 }
+do_test         1.3.3 { detect_blob test.db 1 } {1}
+
+db close
+forcecopy test.db.bak test.db
+sqlite3 db test.db
+do_execsql_test 1.4.1 { PRAGMA secure_delete = 1 } {1}
+do_execsql_test 1.4.2 { DELETE FROM t1 WHERE rowid = 1 }
+do_test         1.4.3 { detect_blob test.db 1 } {0}
+
+do_execsql_test 1.5.1 { DELETE FROM t1 WHERE rowid>850 } {}
+do_test 1.5.2 { 
+  set n 0
+  detect_blob_prepare test.db
+  for {set i 851} {$i <= 1000} {incr i 5} {
+    incr n [detect_blob {} $i]
+  }
+  set n
+} {0}
+
+db close
+sqlite3 db test.db
+do_test 1.6.1 { 
+  execsql {
+    PRAGMA cache_size = 200;
+    PRAGMA secure_delete = 1;
+    CREATE TABLE t2(x);
+    SELECT * FROM t1;
+  }
+  for {set i 100} {$i < 5000} {incr i} {
+    execsql { INSERT INTO t2 VALUES(randomblob($i)) }
+  }
+  execsql { DELETE FROM t1 }
+} {}
+
+do_test 1.6.2 { 
+  set n 0
+  detect_blob_prepare test.db
+  for {set i 2} {$i <= 850} {incr i 5} {
+    incr n [detect_blob {} $i]
+  }
+  set n
+} {0}
+
+finish_test
+

From 07f547923ec911eaa3890db70f31d146b6b2053b Mon Sep 17 00:00:00 2001
From: drh <drh@noemail.net>
Date: Tue, 7 Aug 2012 22:53:01 +0000
Subject: [PATCH 26/36] Simplifications to the sorter to support full-coverage
 testing.

FossilOrigin-Name: de804f4c90f02ca98991da185ed5e28bdd319e92
---
 manifest       |  14 +++----
 manifest.uuid  |   2 +-
 src/vdbesort.c | 104 +++++++++++++++++++------------------------------
 3 files changed, 49 insertions(+), 71 deletions(-)

diff --git a/manifest b/manifest
index 46bc3095bf..792599b37a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sextra\stests\sfor\ssecure-delete\smode.
-D 2012-08-07T17:41:50.005
+C Simplifications\sto\sthe\ssorter\sto\ssupport\sfull-coverage\stesting.
+D 2012-08-07T22:53:01.615
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -244,7 +244,7 @@ F src/vdbeapi.c 88ea823bbcb4320f5a6607f39cd7c2d3cc4c26b1
 F src/vdbeaux.c dce80038c3c41f2680e5ab4dd0f7e0d8b7ff9071
 F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
 F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
-F src/vdbesort.c 4897215f0a0c4e731aa5ac5fc0317b62a4919e79
+F src/vdbesort.c bd5ce83f9314bfb632c8c653e9e81db31928a753
 F src/vdbetrace.c 8bd5da325fc90f28464335e4cc4ad1407fe30835
 F src/vtab.c bb8ea3a26608bb1357538a5d2fc72beba6638998
 F src/wal.c 9294df6f96aae5909ae1a9b733fd1e1b4736978b
@@ -1010,7 +1010,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P 17cb5e951e419b1221ae4595d20059d90a361a39
-R 2919015ca9831fb481e06469c7639f64
-U dan
-Z af24cb62793571f094423bbb394787f8
+P e380cd3ce34d509e184081ecccf27fda11ce1da7
+R 01110266752aaa08ec8ada6a46e26710
+U drh
+Z df7269861f33304988982e4a40d635e7
diff --git a/manifest.uuid b/manifest.uuid
index a2792cb79e..487875b94f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e380cd3ce34d509e184081ecccf27fda11ce1da7
\ No newline at end of file
+de804f4c90f02ca98991da185ed5e28bdd319e92
\ No newline at end of file
diff --git a/src/vdbesort.c b/src/vdbesort.c
index 6ec30954aa..63288cfa6b 100644
--- a/src/vdbesort.c
+++ b/src/vdbesort.c
@@ -125,11 +125,13 @@ struct VdbeSorterIter {
 };
 
 /*
-** An instance of this structure is used to separate the stream of records
+** An instance of this structure is used to organize the stream of records
 ** being written to files by the merge-sort code into aligned, page-sized
-** blocks.
+** blocks.  Doing all I/O in aligned page-sized blocks helps I/O to go
+** faster on many operating systems.
 */
 struct FileWriter {
+  int eFWErr;                     /* Non-zero if in an error state */
   u8 *aBuffer;                    /* Pointer to write buffer */
   int nBuffer;                    /* Size of write buffer in bytes */
   int iBufStart;                  /* First byte of buffer to write */
@@ -264,15 +266,13 @@ static int vdbeSorterIterVarint(sqlite3 *db, VdbeSorterIter *p, u64 *pnOut){
   if( iBuf && (p->nBuffer-iBuf)>=9 ){
     p->iReadOff += sqlite3GetVarint(&p->aBuffer[iBuf], pnOut);
   }else{
-    u8 aVarint[9];
-    int i;
-    for(i=0; i<sizeof(aVarint); i++){
-      u8 *a;
-      int rc = vdbeSorterIterRead(db, p, 1, &a);
+    u8 aVarint[16], *a;
+    int i = 0, rc;
+    do{
+      rc = vdbeSorterIterRead(db, p, 1, &a);
       if( rc ) return rc;
-      aVarint[i] = *a;
-      if( (aVarint[i] & 0x80)==0 ) break;
-    }
+      aVarint[(i++)&0xf] = a[0];
+    }while( (a[0]&0x80)!=0 );
     sqlite3GetVarint(aVarint, pnOut);
   }
 
@@ -614,7 +614,7 @@ static int vdbeSorterSort(const VdbeCursor *pCsr){
 /*
 ** Initialize a file-writer object.
 */
-static int fileWriterInit(
+static void fileWriterInit(
   sqlite3 *db,                    /* Database (for malloc) */
   sqlite3_file *pFile,            /* File to write to */
   FileWriter *p,                  /* Object to populate */
@@ -624,22 +624,23 @@ static int fileWriterInit(
 
   memset(p, 0, sizeof(FileWriter));
   p->aBuffer = (u8 *)sqlite3DbMallocRaw(db, nBuf);
-  if( !p->aBuffer ) return SQLITE_NOMEM;
-
-  p->iBufEnd = p->iBufStart = (iStart % nBuf);
-  p->iWriteOff = iStart - p->iBufStart;
-  p->nBuffer = nBuf;
-  p->pFile = pFile;
-  return SQLITE_OK;
+  if( !p->aBuffer ){
+    p->eFWErr = SQLITE_NOMEM;
+  }else{
+    p->iBufEnd = p->iBufStart = (iStart % nBuf);
+    p->iWriteOff = iStart - p->iBufStart;
+    p->nBuffer = nBuf;
+    p->pFile = pFile;
+  }
 }
 
 /*
 ** Write nData bytes of data to the file-write object. Return SQLITE_OK
 ** if successful, or an SQLite error code if an error occurs.
 */
-static int fileWriterWrite(FileWriter *p, u8 *pData, int nData){
+static void fileWriterWrite(FileWriter *p, u8 *pData, int nData){
   int nRem = nData;
-  while( nRem>0 ){
+  while( nRem>0 && p->eFWErr==0 ){
     int nCopy = nRem;
     if( nCopy>(p->nBuffer - p->iBufEnd) ){
       nCopy = p->nBuffer - p->iBufEnd;
@@ -648,11 +649,10 @@ static int fileWriterWrite(FileWriter *p, u8 *pData, int nData){
     memcpy(&p->aBuffer[p->iBufEnd], &pData[nData-nRem], nCopy);
     p->iBufEnd += nCopy;
     if( p->iBufEnd==p->nBuffer ){
-      int rc = sqlite3OsWrite(p->pFile, 
+      p->eFWErr = sqlite3OsWrite(p->pFile, 
           &p->aBuffer[p->iBufStart], p->iBufEnd - p->iBufStart, 
           p->iWriteOff + p->iBufStart
       );
-      if( rc!=SQLITE_OK ) return rc;
       p->iBufStart = p->iBufEnd = 0;
       p->iWriteOff += p->nBuffer;
     }
@@ -660,8 +660,6 @@ static int fileWriterWrite(FileWriter *p, u8 *pData, int nData){
 
     nRem -= nCopy;
   }
-
-  return SQLITE_OK;
 }
 
 /*
@@ -674,15 +672,16 @@ static int fileWriterWrite(FileWriter *p, u8 *pData, int nData){
 ** last byte written to the file.
 */
 static int fileWriterFinish(sqlite3 *db, FileWriter *p, i64 *piEof){
-  int rc = SQLITE_OK;
-  if( p->aBuffer && p->iBufEnd>p->iBufStart ){
-    rc = sqlite3OsWrite(p->pFile, 
+  int rc;
+  if( p->eFWErr==0 && ALWAYS(p->aBuffer) && p->iBufEnd>p->iBufStart ){
+    p->eFWErr = sqlite3OsWrite(p->pFile, 
         &p->aBuffer[p->iBufStart], p->iBufEnd - p->iBufStart, 
         p->iWriteOff + p->iBufStart
     );
   }
   *piEof = (p->iWriteOff + p->iBufEnd);
   sqlite3DbFree(db, p->aBuffer);
+  rc = p->eFWErr;
   memset(p, 0, sizeof(FileWriter));
   return rc;
 }
@@ -691,11 +690,11 @@ static int fileWriterFinish(sqlite3 *db, FileWriter *p, i64 *piEof){
 ** Write value iVal encoded as a varint to the file-write object. Return 
 ** SQLITE_OK if successful, or an SQLite error code if an error occurs.
 */
-static int fileWriterWriteVarint(FileWriter *p, u64 iVal){
+static void fileWriterWriteVarint(FileWriter *p, u64 iVal){
   int nByte; 
   u8 aByte[10];
   nByte = sqlite3PutVarint(aByte, iVal);
-  return fileWriterWrite(p, aByte, nByte);
+  fileWriterWrite(p, aByte, nByte);
 }
 
 /*
@@ -713,7 +712,6 @@ static int fileWriterWriteVarint(FileWriter *p, u64 iVal){
 */
 static int vdbeSorterListToPMA(sqlite3 *db, const VdbeCursor *pCsr){
   int rc = SQLITE_OK;             /* Return code */
-  int rc2;                        /* fileWriterFinish return code */
   VdbeSorter *pSorter = pCsr->pSorter;
   FileWriter writer;
 
@@ -734,33 +732,23 @@ static int vdbeSorterListToPMA(sqlite3 *db, const VdbeCursor *pCsr){
     assert( pSorter->nPMA==0 );
   }
 
-  if( rc==SQLITE_OK ){
-    rc = fileWriterInit(db, pSorter->pTemp1, &writer, pSorter->iWriteOff);
-  }
-
   if( rc==SQLITE_OK ){
     SorterRecord *p;
     SorterRecord *pNext = 0;
 
-
+    fileWriterInit(db, pSorter->pTemp1, &writer, pSorter->iWriteOff);
     pSorter->nPMA++;
-    rc = fileWriterWriteVarint(&writer, pSorter->nInMemory);
-    for(p=pSorter->pRecord; rc==SQLITE_OK && p; p=pNext){
+    fileWriterWriteVarint(&writer, pSorter->nInMemory);
+    for(p=pSorter->pRecord; p; p=pNext){
       pNext = p->pNext;
-      rc = fileWriterWriteVarint(&writer, p->nVal);
-      if( rc==SQLITE_OK ){
-        rc = fileWriterWrite(&writer, p->pVal, p->nVal);
-      }
-
+      fileWriterWriteVarint(&writer, p->nVal);
+      fileWriterWrite(&writer, p->pVal, p->nVal);
       sqlite3DbFree(db, p);
     }
-
     pSorter->pRecord = p;
+    rc = fileWriterFinish(db, &writer, &pSorter->iWriteOff);
   }
 
-  rc2 = fileWriterFinish(db, &writer, &pSorter->iWriteOff);
-  if( rc==SQLITE_OK ) rc = rc2;
-
   return rc;
 }
 
@@ -920,31 +908,21 @@ int sqlite3VdbeSorterRewind(sqlite3 *db, const VdbeCursor *pCsr, int *pbEof){
         rc = vdbeSorterOpenTempFile(db, &pTemp2);
       }
 
-      if( rc==SQLITE_OK ){
-        rc = fileWriterInit(db, pTemp2, &writer, iWrite2);
-      }
-      if( rc==SQLITE_OK ){
-        rc = fileWriterWriteVarint(&writer, nWrite);
-      }
-
       if( rc==SQLITE_OK ){
         int bEof = 0;
+        fileWriterInit(db, pTemp2, &writer, iWrite2);
+        fileWriterWriteVarint(&writer, nWrite);
         while( rc==SQLITE_OK && bEof==0 ){
           VdbeSorterIter *pIter = &pSorter->aIter[ pSorter->aTree[1] ];
           assert( pIter->pFile );
 
-          rc = fileWriterWriteVarint(&writer, pIter->nKey);
-          if( rc==SQLITE_OK ){
-            rc = fileWriterWrite(&writer, pIter->aKey, pIter->nKey);
-          }
-          if( rc==SQLITE_OK ){
-            rc = sqlite3VdbeSorterNext(db, pCsr, &bEof);
-          }
+          fileWriterWriteVarint(&writer, pIter->nKey);
+          fileWriterWrite(&writer, pIter->aKey, pIter->nKey);
+          rc = sqlite3VdbeSorterNext(db, pCsr, &bEof);
         }
+        rc2 = fileWriterFinish(db, &writer, &iWrite2);
+        if( rc==SQLITE_OK ) rc = rc2;
       }
-
-      rc2 = fileWriterFinish(db, &writer, &iWrite2);
-      if( rc==SQLITE_OK ) rc = rc2;
     }
 
     if( pSorter->nPMA<=SORTER_MAX_MERGE_COUNT ){

From acf239b589f783dff3cd5d1f74a42361bef79366 Mon Sep 17 00:00:00 2001
From: dan <dan@noemail.net>
Date: Wed, 8 Aug 2012 10:14:10 +0000
Subject: [PATCH 27/36] Change to securedel2.test so that it works even if
 SQLITE_DEFAULT_AUTOVACUUM=1 is defined.

FossilOrigin-Name: 1e6f5ea48174e3cb59e6d9fe1293fd87bd9c78f5
---
 manifest             | 14 +++++++-------
 manifest.uuid        |  2 +-
 test/securedel2.test |  1 +
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index 792599b37a..aa43477458 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Simplifications\sto\sthe\ssorter\sto\ssupport\sfull-coverage\stesting.
-D 2012-08-07T22:53:01.615
+C Change\sto\ssecuredel2.test\sso\sthat\sit\sworks\seven\sif\sSQLITE_DEFAULT_AUTOVACUUM=1\sis\sdefined.
+D 2012-08-08T10:14:10.004
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -676,7 +676,7 @@ F test/schema3.test 1bc1008e1f8cb5654b248c55f27249366eb7ed38
 F test/schema4.test e6a66e20cc69f0e306667c08be7fda3d11707dc5
 F test/schema5.test 0103e4c0313b3725b5ae5600bdca53006ab53db3
 F test/securedel.test 87a2561151af1f1e349071a89fdd77059f50113c
-F test/securedel2.test 8e92bfb6559744f31e18d5c88a7076ae1deea0a8
+F test/securedel2.test f13a916155f790a6b9de835049641b14ef312986
 F test/select1.test deba017eed9daa5af33de868676c997e7eebb931
 F test/select2.test 352480e0e9c66eda9c3044e412abdf5be0215b56
 F test/select3.test 2ce595f8fb8e2ac10071d3b4e424cadd4634a054
@@ -1010,7 +1010,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P e380cd3ce34d509e184081ecccf27fda11ce1da7
-R 01110266752aaa08ec8ada6a46e26710
-U drh
-Z df7269861f33304988982e4a40d635e7
+P de804f4c90f02ca98991da185ed5e28bdd319e92
+R cd5e84682b160ed0910b107d04268a4b
+U dan
+Z f570770213d0b1556a06e6e2542482b4
diff --git a/manifest.uuid b/manifest.uuid
index 487875b94f..ea7fce0f85 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-de804f4c90f02ca98991da185ed5e28bdd319e92
\ No newline at end of file
+1e6f5ea48174e3cb59e6d9fe1293fd87bd9c78f5
\ No newline at end of file
diff --git a/test/securedel2.test b/test/securedel2.test
index 7183f17cff..b20f4f9212 100644
--- a/test/securedel2.test
+++ b/test/securedel2.test
@@ -34,6 +34,7 @@ proc detect_blob {zFile iBlob} {
 
 do_test 1.1 {
   execsql { PRAGMA secure_delete = 1 }
+  execsql { PRAGMA auto_vacuum = 0 }
   execsql { CREATE TABLE t1(x, y) }
   for {set i 1} {$i <= 1000} {incr i} {
     set x "X'[string repeat $aBlob($i) 1]'"

From f64cc4996227e98e071fb422dfa92b33a5939ed0 Mon Sep 17 00:00:00 2001
From: dan <dan@noemail.net>
Date: Wed, 8 Aug 2012 11:55:15 +0000
Subject: [PATCH 28/36] When building a b-tree as part of a CREATE INDEX or
 REINDEX statement, attempt to pack keys into pages as tightly as possible.

FossilOrigin-Name: efea62b96c6a242c8ac2bdad70e50c87aee5e871
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/btree.c   |  4 +++-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index aa43477458..307d5ac4b0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sto\ssecuredel2.test\sso\sthat\sit\sworks\seven\sif\sSQLITE_DEFAULT_AUTOVACUUM=1\sis\sdefined.
-D 2012-08-08T10:14:10.004
+C When\sbuilding\sa\sb-tree\sas\spart\sof\sa\sCREATE\sINDEX\sor\sREINDEX\sstatement,\sattempt\sto\spack\skeys\sinto\spages\sas\stightly\sas\spossible.
+D 2012-08-08T11:55:15.269
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -123,7 +123,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c 5b31b24d6814b11de763debf342c8cd0a15a4910
 F src/bitvec.c 26675fe8e431dc555e6f2d0e11e651d172234aa1
 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
-F src/btree.c 1d366468b6f30234d76bf1da43e038d6f3ba2c9c
+F src/btree.c 3a2dbf6f1b377790bed9cf1bb141f622d7b8f5eb
 F src/btree.h 4aee02e879211bfcfd3f551769578d2e940ab6c2
 F src/btreeInt.h 4e5c2bd0f9b36b2a815a6d84f771a61a65830621
 F src/build.c 0f6b40ad6211dcaba6159d0f9a297f0704f22142
@@ -1010,7 +1010,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P de804f4c90f02ca98991da185ed5e28bdd319e92
-R cd5e84682b160ed0910b107d04268a4b
+P 1e6f5ea48174e3cb59e6d9fe1293fd87bd9c78f5
+R 5b5871247315ef7c9328782279895eef
 U dan
-Z f570770213d0b1556a06e6e2542482b4
+Z 279d19e350facc9c855651c896638780
diff --git a/manifest.uuid b/manifest.uuid
index ea7fce0f85..a9618bf357 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1e6f5ea48174e3cb59e6d9fe1293fd87bd9c78f5
\ No newline at end of file
+efea62b96c6a242c8ac2bdad70e50c87aee5e871
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 7f1fd7e148..3097dd692d 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -6211,7 +6211,9 @@ static int balance_nonroot(
     d = r + 1 - leafData;
     assert( d<nMaxCells );
     assert( r<nMaxCells );
-    while( szRight==0 || szRight+szCell[d]+2<=szLeft-(szCell[r]+2) ){
+    while( szRight==0 
+       || (!bBulk && szRight+szCell[d]+2<=szLeft-(szCell[r]+2)) 
+    ){
       szRight += szCell[d] + 2;
       szLeft -= szCell[r] + 2;
       cntNew[i-1]--;

From 7d6885ae8a00bcefb9d1ff224bc65138c36bc399 Mon Sep 17 00:00:00 2001
From: dan <dan@noemail.net>
Date: Wed, 8 Aug 2012 14:04:56 +0000
Subject: [PATCH 29/36] When populating an index b-tree as part of a CREATE
 INDEX or REINDEX statement, distribute cells between up to three siblings in
 balance_nonroot() instead of four. This produces identical database files,
 but is slightly faster.

FossilOrigin-Name: b0d31e779ecf01c5a235443c05f488b177ac3045
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/btree.c   |  9 +++++----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/manifest b/manifest
index 307d5ac4b0..1c10c1b24f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\sbuilding\sa\sb-tree\sas\spart\sof\sa\sCREATE\sINDEX\sor\sREINDEX\sstatement,\sattempt\sto\spack\skeys\sinto\spages\sas\stightly\sas\spossible.
-D 2012-08-08T11:55:15.269
+C When\spopulating\san\sindex\sb-tree\sas\spart\sof\sa\sCREATE\sINDEX\sor\sREINDEX\sstatement,\sdistribute\scells\sbetween\sup\sto\sthree\ssiblings\sin\sbalance_nonroot()\sinstead\sof\sfour.\sThis\sproduces\sidentical\sdatabase\sfiles,\sbut\sis\sslightly\sfaster.
+D 2012-08-08T14:04:56.819
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -123,7 +123,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c 5b31b24d6814b11de763debf342c8cd0a15a4910
 F src/bitvec.c 26675fe8e431dc555e6f2d0e11e651d172234aa1
 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
-F src/btree.c 3a2dbf6f1b377790bed9cf1bb141f622d7b8f5eb
+F src/btree.c fe84910555e103013455e21571ac8bbed23c5c50
 F src/btree.h 4aee02e879211bfcfd3f551769578d2e940ab6c2
 F src/btreeInt.h 4e5c2bd0f9b36b2a815a6d84f771a61a65830621
 F src/build.c 0f6b40ad6211dcaba6159d0f9a297f0704f22142
@@ -1010,7 +1010,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P 1e6f5ea48174e3cb59e6d9fe1293fd87bd9c78f5
-R 5b5871247315ef7c9328782279895eef
+P efea62b96c6a242c8ac2bdad70e50c87aee5e871
+R 086d244755cccfb12a359b31e2d04664
 U dan
-Z 279d19e350facc9c855651c896638780
+Z 4b1b34d0b355564b0b946417aa1a7b3d
diff --git a/manifest.uuid b/manifest.uuid
index a9618bf357..8e784bd38e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-efea62b96c6a242c8ac2bdad70e50c87aee5e871
\ No newline at end of file
+b0d31e779ecf01c5a235443c05f488b177ac3045
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 3097dd692d..6b5dd683a5 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -5991,18 +5991,19 @@ static int balance_nonroot(
   i = pParent->nOverflow + pParent->nCell;
   if( i<2 ){
     nxDiv = 0;
-    nOld = i+1;
   }else{
-    nOld = 3;
+    assert( bBulk==0 || bBulk==1 );
     if( iParentIdx==0 ){                 
       nxDiv = 0;
     }else if( iParentIdx==i ){
-      nxDiv = i-2;
+      nxDiv = i-2+bBulk;
     }else{
+      assert( bBulk==0 );
       nxDiv = iParentIdx-1;
     }
-    i = 2;
+    i = 2-bBulk;
   }
+  nOld = i+1;
   if( (i+nxDiv-pParent->nOverflow)==pParent->nCell ){
     pRight = &pParent->aData[pParent->hdrOffset+8];
   }else{

From a0aa13b67764090b15e8555dd050df76e98715cf Mon Sep 17 00:00:00 2001
From: mistachkin <mistachkin@noemail.net>
Date: Mon, 13 Aug 2012 22:05:22 +0000
Subject: [PATCH 30/36] Refer to the WaitForSingleObjectEx and SetFilePointerEx
 Win32 functions only for platforms where they are going to be used.

FossilOrigin-Name: 9888ce9294c09749f5c958f965f949561867fea0
---
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 src/os_win.c  |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/manifest b/manifest
index 1c10c1b24f..029a64c6c1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\spopulating\san\sindex\sb-tree\sas\spart\sof\sa\sCREATE\sINDEX\sor\sREINDEX\sstatement,\sdistribute\scells\sbetween\sup\sto\sthree\ssiblings\sin\sbalance_nonroot()\sinstead\sof\sfour.\sThis\sproduces\sidentical\sdatabase\sfiles,\sbut\sis\sslightly\sfaster.
-D 2012-08-08T14:04:56.819
+C Refer\sto\sthe\sWaitForSingleObjectEx\sand\sSetFilePointerEx\sWin32\sfunctions\sonly\sfor\splatforms\swhere\sthey\sare\sgoing\sto\sbe\sused.
+D 2012-08-13T22:05:22.296
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -163,7 +163,7 @@ F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c
 F src/os.h 027491c77d2404c0a678bb3fb06286f331eb9b57
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_unix.c d7c96b5d140f550f07345870112fae5d7ef99757
-F src/os_win.c e3d3d3e26b65a35d4293d753137a58510bd3299b
+F src/os_win.c 5de2e293ce912be89edcd8b1f97d25a05201d705
 F src/pager.c e381c118b77dc22021a1a59d3fec24815e91df78
 F src/pager.h 8b8c9bc065a3c66769df8724dfdf492ee1aab3c5
 F src/parse.y f29df90bd3adc64b33114ab1de9fb7768fcf2099
@@ -1010,7 +1010,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P efea62b96c6a242c8ac2bdad70e50c87aee5e871
-R 086d244755cccfb12a359b31e2d04664
-U dan
-Z 4b1b34d0b355564b0b946417aa1a7b3d
+P b0d31e779ecf01c5a235443c05f488b177ac3045
+R e108fe40c60912ec60f26ef742628f98
+U mistachkin
+Z a85518ddd930e1856fb03005c1a29498
diff --git a/manifest.uuid b/manifest.uuid
index 8e784bd38e..daa011d39a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b0d31e779ecf01c5a235443c05f488b177ac3045
\ No newline at end of file
+9888ce9294c09749f5c958f965f949561867fea0
\ No newline at end of file
diff --git a/src/os_win.c b/src/os_win.c
index 8509e9272d..a533453197 100644
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -702,7 +702,7 @@ static struct win_syscall {
 #define osWaitForSingleObject ((DWORD(WINAPI*)(HANDLE, \
         DWORD))aSyscall[60].pCurrent)
 
-#if !SQLITE_OS_WINCE
+#if SQLITE_OS_WINRT
   { "WaitForSingleObjectEx",   (SYSCALL)WaitForSingleObjectEx,   0 },
 #else
   { "WaitForSingleObjectEx",   (SYSCALL)0,                       0 },
@@ -711,7 +711,7 @@ static struct win_syscall {
 #define osWaitForSingleObjectEx ((DWORD(WINAPI*)(HANDLE,DWORD, \
         BOOL))aSyscall[61].pCurrent)
 
-#if !SQLITE_OS_WINCE
+#if SQLITE_OS_WINRT
   { "SetFilePointerEx",        (SYSCALL)SetFilePointerEx,        0 },
 #else
   { "SetFilePointerEx",        (SYSCALL)0,                       0 },

From 1700b1c65cc286ab292c3c44158da902eb273742 Mon Sep 17 00:00:00 2001
From: mistachkin <mistachkin@noemail.net>
Date: Tue, 14 Aug 2012 01:45:12 +0000
Subject: [PATCH 31/36] Refer to the file mapping Win32 API functions only when
 absolutely necessary.

FossilOrigin-Name: 1de2237d005fa1a1e1d034820d17daf64a860f81
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/os_win.c  | 13 +++++++++----
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/manifest b/manifest
index 029a64c6c1..6206e360d2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Refer\sto\sthe\sWaitForSingleObjectEx\sand\sSetFilePointerEx\sWin32\sfunctions\sonly\sfor\splatforms\swhere\sthey\sare\sgoing\sto\sbe\sused.
-D 2012-08-13T22:05:22.296
+C Refer\sto\sthe\sfile\smapping\sWin32\sAPI\sfunctions\sonly\swhen\sabsolutely\snecessary.
+D 2012-08-14T01:45:12.276
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -163,7 +163,7 @@ F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c
 F src/os.h 027491c77d2404c0a678bb3fb06286f331eb9b57
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_unix.c d7c96b5d140f550f07345870112fae5d7ef99757
-F src/os_win.c 5de2e293ce912be89edcd8b1f97d25a05201d705
+F src/os_win.c 370c6f3399e3cd9f14343fb7dc4b2bbe8619d3bf
 F src/pager.c e381c118b77dc22021a1a59d3fec24815e91df78
 F src/pager.h 8b8c9bc065a3c66769df8724dfdf492ee1aab3c5
 F src/parse.y f29df90bd3adc64b33114ab1de9fb7768fcf2099
@@ -1010,7 +1010,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P b0d31e779ecf01c5a235443c05f488b177ac3045
-R e108fe40c60912ec60f26ef742628f98
+P 9888ce9294c09749f5c958f965f949561867fea0
+R a98aa246c40b02fe38a0fee800dd8927
 U mistachkin
-Z a85518ddd930e1856fb03005c1a29498
+Z 9b5874d2d03bd5e6df37f953a18d9b36
diff --git a/manifest.uuid b/manifest.uuid
index daa011d39a..0feb2de849 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9888ce9294c09749f5c958f965f949561867fea0
\ No newline at end of file
+1de2237d005fa1a1e1d034820d17daf64a860f81
\ No newline at end of file
diff --git a/src/os_win.c b/src/os_win.c
index a533453197..2cbd2cee54 100644
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -288,7 +288,8 @@ static struct win_syscall {
 #define osCreateFileW ((HANDLE(WINAPI*)(LPCWSTR,DWORD,DWORD, \
         LPSECURITY_ATTRIBUTES,DWORD,DWORD,HANDLE))aSyscall[5].pCurrent)
 
-#if !SQLITE_OS_WINRT && defined(SQLITE_WIN32_HAS_WIDE)
+#if SQLITE_OS_WINCE || (!SQLITE_OS_WINRT && defined(SQLITE_WIN32_HAS_WIDE) && \
+        !defined(SQLITE_OMIT_WAL))
   { "CreateFileMappingW",      (SYSCALL)CreateFileMappingW,      0 },
 #else
   { "CreateFileMappingW",      (SYSCALL)0,                       0 },
@@ -600,7 +601,7 @@ static struct win_syscall {
         LPOVERLAPPED))aSyscall[45].pCurrent)
 #endif
 
-#if !SQLITE_OS_WINRT
+#if SQLITE_OS_WINCE || (!SQLITE_OS_WINRT && !defined(SQLITE_OMIT_WAL))
   { "MapViewOfFile",           (SYSCALL)MapViewOfFile,           0 },
 #else
   { "MapViewOfFile",           (SYSCALL)0,                       0 },
@@ -670,7 +671,11 @@ static struct win_syscall {
 #define osUnlockFileEx ((BOOL(WINAPI*)(HANDLE,DWORD,DWORD,DWORD, \
         LPOVERLAPPED))aSyscall[55].pCurrent)
 
+#if SQLITE_OS_WINCE || !defined(SQLITE_OMIT_WAL)
   { "UnmapViewOfFile",         (SYSCALL)UnmapViewOfFile,         0 },
+#else
+  { "UnmapViewOfFile",         (SYSCALL)0,                       0 },
+#endif
 
 #define osUnmapViewOfFile ((BOOL(WINAPI*)(LPCVOID))aSyscall[56].pCurrent)
 
@@ -729,7 +734,7 @@ static struct win_syscall {
 #define osGetFileInformationByHandleEx ((BOOL(WINAPI*)(HANDLE, \
         FILE_INFO_BY_HANDLE_CLASS,LPVOID,DWORD))aSyscall[63].pCurrent)
 
-#if SQLITE_OS_WINRT
+#if SQLITE_OS_WINRT && !defined(SQLITE_OMIT_WAL)
   { "MapViewOfFileFromApp",    (SYSCALL)MapViewOfFileFromApp,    0 },
 #else
   { "MapViewOfFileFromApp",    (SYSCALL)0,                       0 },
@@ -793,7 +798,7 @@ static struct win_syscall {
 
 #define osGetProcessHeap ((HANDLE(WINAPI*)(VOID))aSyscall[71].pCurrent)
 
-#if SQLITE_OS_WINRT
+#if SQLITE_OS_WINRT && !defined(SQLITE_OMIT_WAL)
   { "CreateFileMappingFromApp", (SYSCALL)CreateFileMappingFromApp, 0 },
 #else
   { "CreateFileMappingFromApp", (SYSCALL)0,                      0 },

From c16eb6934d8f457e7ce044fc804ed92de88e66ed Mon Sep 17 00:00:00 2001
From: drh <drh@noemail.net>
Date: Tue, 14 Aug 2012 17:29:27 +0000
Subject: [PATCH 32/36] Update the spellfix virtual table to the latest
 development code.

FossilOrigin-Name: 6954fef006431d153de6e63e362b8d260ebeb1c6
---
 manifest            |  16 +-
 manifest.uuid       |   2 +-
 src/test_spellfix.c | 746 ++++++++++++--------------------------------
 test/spellfix.test  |   7 +-
 4 files changed, 204 insertions(+), 567 deletions(-)

diff --git a/manifest b/manifest
index 6206e360d2..42bcaa0a49 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Refer\sto\sthe\sfile\smapping\sWin32\sAPI\sfunctions\sonly\swhen\sabsolutely\snecessary.
-D 2012-08-14T01:45:12.276
+C Update\sthe\sspellfix\svirtual\stable\sto\sthe\slatest\sdevelopment\scode.
+D 2012-08-14T17:29:27.517
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -221,7 +221,7 @@ F src/test_quota.h 8761e463b25e75ebc078bd67d70e39b9c817a0cb
 F src/test_rtree.c aba603c949766c4193f1068b91c787f57274e0d9
 F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
 F src/test_server.c 2f99eb2837dfa06a4aacf24af24c6affdf66a84f
-F src/test_spellfix.c 5ed989693d4040f4d343316c338e25c5a6a1f05d
+F src/test_spellfix.c 3a260d237fabbf5884389aa8c0e516b4e61ab98a
 F src/test_stat.c d1569c7a4839f13e80187e2c26b2ab4da2d03935
 F src/test_superlock.c 2b97936ca127d13962c3605dbc9a4ef269c424cd
 F src/test_syscall.c a992d8c80ea91fbf21fb2dd570db40e77dd7e6ae
@@ -718,7 +718,7 @@ F test/speed3.test d32043614c08c53eafdc80f33191d5bd9b920523
 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
-F test/spellfix.test 5af977d1a1a9e3801ed4239ee4dea92d70a53d35
+F test/spellfix.test 8bdb52dc612711660cfb64540b11830f21827983
 F test/sqllimits1.test b1aae27cc98eceb845e7f7adf918561256e31298
 F test/stat.test 08e8185b3fd5b010c90d7ad82b9dd4ea1cbf14b0
 F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9
@@ -1010,7 +1010,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P 9888ce9294c09749f5c958f965f949561867fea0
-R a98aa246c40b02fe38a0fee800dd8927
-U mistachkin
-Z 9b5874d2d03bd5e6df37f953a18d9b36
+P 1de2237d005fa1a1e1d034820d17daf64a860f81
+R c6a6a5e27cc06765fbb21bed044152b3
+U drh
+Z f62627106b46abb8dea1d772e4525d54
diff --git a/manifest.uuid b/manifest.uuid
index 0feb2de849..a2aa6fb25c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1de2237d005fa1a1e1d034820d17daf64a860f81
\ No newline at end of file
+6954fef006431d153de6e63e362b8d260ebeb1c6
\ No newline at end of file
diff --git a/src/test_spellfix.c b/src/test_spellfix.c
index cc3531268b..92755cd1d6 100644
--- a/src/test_spellfix.c
+++ b/src/test_spellfix.c
@@ -10,276 +10,9 @@
 **
 *************************************************************************
 **
-** This module implements a VIRTUAL TABLE that can be used to search
-** a large vocabulary for close matches.  For example, this virtual
-** table can be used to suggest corrections to misspelled words.  Or,
-** it could be used with FTS4 to do full-text search using potentially
-** misspelled words.
-**
-** Create an instance of the virtual table this way:
-**
-**    CREATE VIRTUAL TABLE demo USING spellfix1;
-**
-** The "spellfix1" term is the name of this module.  The "demo" is the
-** name of the virtual table you will be creating.  The table is initially
-** empty.  You have to populate it with your vocabulary.  Suppose you
-** have a list of words in a table named "big_vocabulary".  Then do this:
-**
-**    INSERT INTO demo(word) SELECT word FROM big_vocabulary;
-**
-** If you intend to use this virtual table in cooperation with an FTS4
-** table (for spelling correctly of search terms) then you can extract
-** the vocabulary using an fts3aux table:
-**
-**    INSERT INTO demo(word) SELECT term FROM search_aux WHERE col='*';
-**
-** You can also provide the virtual table with a "rank" for each word.
-** The "rank" is an estimate of how common the word is.  Larger numbers
-** mean the word is more common.  If you omit the rank when populating
-** the table, then a rank of 1 is assumed.  But if you have rank 
-** information, you can supply it and the virtual table will show a
-** slight preference for selecting more commonly used terms.  To
-** populate the rank from an fts4aux table "search_aux" do something
-** like this:
-**
-**    INSERT INTO demo(word,rank)
-**        SELECT term, documents FROM search_aux WHERE col='*';
-**
-** To query the virtual table, include a MATCH operator in the WHERE
-** clause.  For example:
-**
-**    SELECT word FROM demo WHERE word MATCH 'kennasaw';
-**
-** Using a dataset of American place names (derived from
-** http://geonames.usgs.gov/domestic/download_data.htm) the query above
-** returns 20 results beginning with:
-**
-**    kennesaw
-**    kenosha
-**    kenesaw
-**    kenaga
-**    keanak
-**
-** If you append the character '*' to the end of the pattern, then
-** a prefix search is performed.  For example:
-**
-**    SELECT word FROM demo WHERE word MATCH 'kennes*';
-**
-** Yields 20 results beginning with:
-**
-**    kennesaw
-**    kennestone
-**    kenneson
-**    kenneys
-**    keanes
-**    keenes
-**
-** The virtual table actually has a unique rowid with five columns plus three
-** extra hidden columns.  The columns are as follows:
-**
-**    rowid         A unique integer number associated with each
-**                  vocabulary item in the table.  This can be used
-**                  as a foreign key on other tables in the database.
-**
-**    word          The text of the word that matches the pattern.
-**                  Both word and pattern can contains unicode characters
-**                  and can be mixed case.
-**
-**    rank          This is the rank of the word, as specified in the
-**                  original INSERT statement.
-**
-**    distance      This is an edit distance or Levensthein distance going
-**                  from the pattern to the word.
-**
-**    langid        This is the language-id of the word.  All queries are
-**                  against a single language-id, which defaults to 0.
-**                  For any given query this value is the same on all rows.
-**
-**    score         The score is a combination of rank and distance.  The
-**                  idea is that a lower score is better.  The virtual table
-**                  attempts to find words with the lowest score and 
-**                  by default (unless overridden by ORDER BY) returns
-**                  results in order of increasing score.
-**
-**    matchlen      For prefix queries, the number of characters in the prefix
-**                  of the returned value (word) that matched the query term.
-**                  For non-prefix queries, the number of characters in the 
-**                  returned value.
-**
-**    top           (HIDDEN)  For any query, this value is the same on all
-**                  rows.  It is an integer which is the maximum number of
-**                  rows that will be output.  The actually number of rows
-**                  output might be less than this number, but it will never
-**                  be greater.  The default value for top is 20, but that
-**                  can be changed for each query by including a term of
-**                  the form "top=N" in the WHERE clause of the query.
-**
-**    scope         (HIDDEN)  For any query, this value is the same on all
-**                  rows.  The scope is a measure of how widely the virtual
-**                  table looks for matching words.  Smaller values of
-**                  scope cause a broader search.  The scope is normally
-**                  choosen automatically and is capped at 4.  Applications
-**                  can change the scope by including a term of the form
-**                  "scope=N" in the WHERE clause of the query.  Increasing
-**                  the scope will make the query run faster, but will reduce
-**                  the possible corrections.
-**
-**    srchcnt       (HIDDEN)  For any query, this value is the same on all
-**                  rows.  This value is an integer which is the number of
-**                  of words examined using the edit-distance algorithm to
-**                  find the top matches that are ultimately displayed.  This
-**                  value is for diagnostic use only.
-**
-**    soundslike    (HIDDEN)  When inserting vocabulary entries, this field
-**                  can be set to an spelling that matches what the word
-**                  sounds like.  See the DEALING WITH UNUSUAL AND DIFFICULT
-**                  SPELLINGS section below for details.
-**
-** When inserting into or updating the virtual table, only the rowid, word,
-** rank, and langid may be changes.  Any attempt to set or modify the values
-** of distance, score, top, scope, or srchcnt is silently ignored.
-**
-** ALGORITHM
-**
-** A shadow table named "%_vocab" (where the % is replaced by the name of
-** the virtual table; Ex: "demo_vocab" for the "demo" virtual table) is
-** constructed with these columns:
-**
-**    id            The unique id (INTEGER PRIMARY KEY)
-**
-**    rank          The rank of word.
-**
-**    langid        The language id for this entry.
-**
-**    word          The original UTF8 text of the vocabulary word
-**
-**    k1            The word transliterated into lower-case ASCII.  
-**                  There is a standard table of mappings from non-ASCII
-**                  characters into ASCII.  Examples: "æ" -> "ae",
-**                  "þ" -> "th", "ß" -> "ss", "á" -> "a", ...  The
-**                  accessory function spellfix1_translit(X) will do
-**                  the non-ASCII to ASCII mapping.  The built-in lower(X)
-**                  function will convert to lower-case.  Thus:
-**                  k1 = lower(spellfix1_translit(word)).
-**
-**    k2            This field holds a phonetic code derived from k1.  Letters
-**                  that have similar sounds are mapped into the same symbol.
-**                  For example, all vowels and vowel clusters become the
-**                  single symbol "A".  And the letters "p", "b", "f", and
-**                  "v" all become "B".  All nasal sounds are represented
-**                  as "N".  And so forth.  The mapping is base on
-**                  ideas found in Soundex, Metaphone, and other
-**                  long-standing phonetic matching systems.  This key can
-**                  be generated by the function spellfix1_phonehash(X).  
-**                  Hence: k2 = spellfix1_phonehash(k1)
-**
-** There is also a function for computing the Wagner edit distance or the
-** Levenshtein distance between a pattern and a word.  This function
-** is exposed as spellfix1_editdist(X,Y).  The edit distance function
-** returns the "cost" of converting X into Y.  Some transformations
-** cost more than others.  Changing one vowel into a different vowel,
-** for example is relatively cheap, as is doubling a constant, or
-** omitting the second character of a double-constant.  Other transformations
-** or more expensive.  The idea is that the edit distance function returns
-** a low cost of words that are similar and a higher cost for words
-** that are futher apart.  In this implementation, the maximum cost
-** of any single-character edit (delete, insert, or substitute) is 100,
-** with lower costs for some edits (such as transforming vowels).
-**
-** The "score" for a comparison is the edit distance between the pattern
-** and the word, adjusted down by the base-2 logorithm of the word rank.
-** For example, a match with distance 100 but rank 1000 would have a
-** score of 122 (= 100 - log2(1000) + 32) where as a match with distance
-** 100 with a rank of 1 would have a score of 131 (100 - log2(1) + 32).
-** (NB:  The constant 32 is added to each score to keep it from going
-** negative in case the edit distance is zero.)  In this way, frequently
-** used words get a slightly lower cost which tends to move them toward
-** the top of the list of alternative spellings.
-**
-** A straightforward implementation of a spelling corrector would be
-** to compare the search term against every word in the vocabulary
-** and select the 20 with the lowest scores.  However, there will 
-** typically be hundreds of thousands or millions of words in the
-** vocabulary, and so this approach is not fast enough.
-**
-** Suppose the term that is being spell-corrected is X.  To limit
-** the search space, X is converted to a k2-like key using the
-** equivalent of:
-**
-**    key = spellfix1_phonehash(lower(spellfix1_translit(X)))
-**
-** This key is then limited to "scope" characters.  The default scope
-** value is 4, but an alternative scope can be specified using the
-** "scope=N" term in the WHERE clause.  After the key has been truncated,
-** the edit distance is run against every term in the vocabulary that
-** has a k2 value that begins with the abbreviated key.
-**
-** For example, suppose the input word is "Paskagula".  The phonetic 
-** key is "BACACALA" which is then truncated to 4 characters "BACA".
-** The edit distance is then run on the 4980 entries (out of
-** 272,597 entries total) of the vocabulary whose k2 values begin with
-** BACA, yielding "Pascagoula" as the best match.
-** 
-** Only terms of the vocabulary with a matching langid are searched.
-** Hence, the same table can contain entries from multiple languages
-** and only the requested language will be used.  The default langid
-** is 0.
-**
-** DEALING WITH UNUSUAL AND DIFFICULT SPELLINGS
-**
-** The algorithm above works quite well for most cases, but there are
-** exceptions.  These exceptions can be dealt with by making additional
-** entries in the virtual table using the "soundslike" column.
-**
-** For example, many words of Greek origin begin with letters "ps" where
-** the "p" is silent.  Ex:  psalm, pseudonym, psoriasis, psyche.  In
-** another example, many Scottish surnames can be spelled with an
-** initial "Mac" or "Mc".  Thus, "MacKay" and "McKay" are both pronounced
-** the same.
-**
-** Accommodation can be made for words that are not spelled as they
-** sound by making additional entries into the virtual table for the
-** same word, but adding an alternative spelling in the "soundslike"
-** column.  For example, the canonical entry for "psalm" would be this:
-**
-**   INSERT INTO demo(word) VALUES('psalm');
-**
-** To enhance the ability to correct the spelling of "salm" into
-** "psalm", make an addition entry like this:
-**
-**   INSERT INTO demo(word,soundslike) VALUES('psalm','salm');
-**
-** It is ok to make multiple entries for the same word as long as
-** each entry has a different soundslike value.  Note that if no
-** soundslike value is specified, the soundslike defaults to the word
-** itself.
-**
-** Listed below are some cases where it might make sense to add additional
-** soundslike entries.  The specific entries will depend on the application
-** and the target language.
-**
-**   *   Silent "p" in words beginning with "ps":  psalm, psyche
-**
-**   *   Silent "p" in words beginning with "pn":  pneumonia, pneumatic
-**
-**   *   Silent "p" in words beginning with "pt":  pterodactyl, ptolemaic
-**
-**   *   Silent "d" in words beginning with "dj":  djinn, Djikarta
-**
-**   *   Silent "k" in words beginning with "kn":  knight, Knuthson
-**
-**   *   Silent "g" in words beginning with "gn":  gnarly, gnome, gnat
-**
-**   *   "Mac" versus "Mc" beginning Scottish surnames
-**
-**   *   "Tch" sounds in Slavic words:  Tchaikovsky vs. Chaykovsky
-**
-**   *   The letter "j" pronounced like "h" in Spanish:  LaJolla
-**
-**   *   Words beginning with "wr" versus "r":  write vs. rite
-**
-**   *   Miscellanous problem words such as "debt", "tsetse",
-**       "Nguyen", "Van Nuyes".
+** This module implements the spellfix1 VIRTUAL TABLE that can be used
+** to search a large vocabulary for close matches.  See separate
+** documentation files (spellfix1.wiki and editdist3.wiki) for details.
 */
 #if SQLITE_CORE
 # include "sqliteInt.h"
@@ -306,7 +39,7 @@
 **   8   'M'       Nasals:  M N
 **   9   'W'       Letter W at the beginning of a word
 **   10  'Y'       Letter Y at the beginning of a word.
-**   11  '9'       A digit: 0 1 2 3 4 5 6 7 8 9
+**   11  '9'       Digits: 0 1 2 3 4 5 6 7 8 9
 **   12  ' '       White space
 **   13  '?'       Other.
 */
@@ -466,7 +199,6 @@ static unsigned char *phoneticHash(const unsigned char *zIn, int nIn){
       }
     }
   }
-  if( zIn[0]=='k' && zIn[1]=='n' ){ zIn++, nIn--; }
   for(i=0; i<nIn; i++){
     unsigned char c = zIn[i];
     if( i+1<nIn ){
@@ -586,7 +318,7 @@ static int substituteCost(char cPrev, char cFrom, char cTo){
   classTo = characterClass(cPrev, cTo);
   if( classFrom==classTo ){
     /* Same character class */
-    return classFrom=='A' ? 25 : 40;
+    return 40;
   }
   if( classFrom>=CCLASS_B && classFrom<=CCLASS_Y
       && classTo>=CCLASS_B && classTo<=CCLASS_Y ){
@@ -616,7 +348,7 @@ static int substituteCost(char cPrev, char cFrom, char cTo){
 ** If zA does end in a '*', then it is the number of bytes in the prefix
 ** of zB that was deemed to match zA.
 */
-static int editdist1(const char *zA, const char *zB, int iLangId, int *pnMatch){
+static int editdist1(const char *zA, const char *zB, int *pnMatch){
   int nA, nB;            /* Number of characters in zA[] and zB[] */
   int xA, xB;            /* Loop counters for zA[] and zB[] */
   char cA, cB;           /* Current character of zA and zB */
@@ -645,10 +377,10 @@ static int editdist1(const char *zA, const char *zB, int iLangId, int *pnMatch){
 
   /* Verify input strings and measure their lengths */
   for(nA=0; zA[nA]; nA++){
-    if( zA[nA]>127 ) return -2;
+    if( zA[nA]&0x80 ) return -2;
   }
   for(nB=0; zB[nB]; nB++){
-    if( zB[nB]>127 ) return -2;
+    if( zB[nB]&0x80 ) return -2;
   }
 
   /* Special processing if either string is empty */
@@ -756,7 +488,9 @@ static int editdist1(const char *zA, const char *zB, int iLangId, int *pnMatch){
     }
   }else{
     res = m[nB];
-    if( pnMatch ) *pnMatch = -1;
+    /* In the current implementation, pnMatch is always NULL if zA does
+    ** not end in "*" */
+    assert( pnMatch==0 );
   }
   sqlite3_free(toFree);
   return res;
@@ -764,7 +498,6 @@ static int editdist1(const char *zA, const char *zB, int iLangId, int *pnMatch){
 
 /*
 ** Function:    editdist(A,B)
-**              editdist(A,B,langid)
 **
 ** Return the cost of transforming string A into string B.  Both strings
 ** must be pure ASCII text.  If A ends with '*' then it is assumed to be
@@ -776,11 +509,10 @@ static void editdistSqlFunc(
   int argc,
   sqlite3_value **argv
 ){
-  int langid = argc==2 ? 0 : sqlite3_value_int(argv[2]);
   int res = editdist1(
                     (const char*)sqlite3_value_text(argv[0]),
                     (const char*)sqlite3_value_text(argv[1]),
-                    langid, 0);
+                    0);
   if( res<0 ){
     if( res==(-3) ){
       sqlite3_result_error_nomem(context);
@@ -924,7 +656,7 @@ static int editDist3ConfigLoad(
   const char *zTable      /* Name of the table from which to load */
 ){
   sqlite3_stmt *pStmt;
-  int rc;
+  int rc, rc2;
   char *zSql;
   int iLangPrev = -9999;
   EditDist3Lang *pLang;
@@ -939,24 +671,26 @@ static int editDist3ConfigLoad(
   while( sqlite3_step(pStmt)==SQLITE_ROW ){
     int iLang = sqlite3_column_int(pStmt, 0);
     const char *zFrom = (const char*)sqlite3_column_text(pStmt, 1);
-    int nFrom = sqlite3_column_bytes(pStmt, 1);
+    int nFrom = zFrom ? sqlite3_column_bytes(pStmt, 1) : 0;
     const char *zTo = (const char*)sqlite3_column_text(pStmt, 2);
-    int nTo = sqlite3_column_bytes(pStmt, 2);
+    int nTo = zTo ? sqlite3_column_bytes(pStmt, 2) : 0;
     int iCost = sqlite3_column_int(pStmt, 3);
 
-    if( nFrom>100 || nFrom<0 || nTo>100 || nTo<0 ) continue;
+    assert( zFrom!=0 || nFrom==0 );
+    assert( zTo!=0 || nTo==0 );
+    if( nFrom>100 || nTo>100 ) continue;
     if( iCost<0 ) continue;
     if( iLang!=iLangPrev ){
       EditDist3Lang *pNew;
-      p->nLang++;
-      pNew = sqlite3_realloc(p->a, p->nLang*sizeof(p->a[0]));
+      pNew = sqlite3_realloc(p->a, (p->nLang+1)*sizeof(p->a[0]));
       if( pNew==0 ){ rc = SQLITE_NOMEM; break; }
       p->a = pNew;
-      pLang = &p->a[p->nLang-1];
+      pLang = &p->a[p->nLang];
+      p->nLang++;
       pLang->iLang = iLang;
       pLang->iInsCost = 100;
       pLang->iDelCost = 100;
-      pLang->iSubCost = 200;
+      pLang->iSubCost = 150;
       pLang->pCost = 0;
       iLangPrev = iLang;
     }
@@ -981,7 +715,8 @@ static int editDist3ConfigLoad(
       pLang->pCost = pCost; 
     }
   }
-  sqlite3_finalize(pStmt);
+  rc2 = sqlite3_finalize(pStmt);
+  if( rc==SQLITE_OK ) rc = rc2;
   return rc;
 }
 
@@ -1019,7 +754,7 @@ static int matchTo(EditDist3Cost *p, const char *z, int n){
 ** the given string.
 */
 static int matchFrom(EditDist3Cost *p, const char *z, int n){
-  if( p->nFrom>n ) return 0;
+  assert( p->nFrom<=n );
   if( memcmp(p->a, z, p->nFrom)!=0 ) return 0;
   return 1;
 }
@@ -1066,10 +801,12 @@ static EditDist3FromString *editDist3FromStringNew(
   EditDist3Cost *p;
   int i;
 
+  if( z==0 ) return 0;
   if( n<0 ) n = (int)strlen(z);
   pStr = sqlite3_malloc( sizeof(*pStr) + sizeof(pStr->a[0])*n + n + 1 );
   if( pStr==0 ) return 0;
   pStr->a = (EditDist3From*)&pStr[1];
+  memset(pStr->a, 0, sizeof(pStr->a[0])*n);
   pStr->n = n;
   pStr->z = (char*)&pStr->a[n];
   memcpy(pStr->z, z, n+1);
@@ -1113,30 +850,6 @@ static EditDist3FromString *editDist3FromStringNew(
   return pStr;
 }
 
-#if 0 /* No longer used */
-/*
-** Return the number of bytes in the common prefix of two UTF8 strings.
-** Only complete characters are considered.
-*/
-static int editDist3PrefixLen(const char *z1, const char *z2){
-  int n = 0;
-  while( z1[n] && z1[n]==z2[n] ){ n++; }
-  while( n && (z1[n]&0xc0)==0x80 ){ n--; }
-  return n;
-}
-
-/*
-** Return the number of bytes in the common suffix of two UTF8 strings.
-** Only complete characters are considered.
-*/
-static int editDist3SuffixLen(const char *z1, int n1, const char *z2, int n2){
-  int origN1 = n1;
-  while( n1>0 && n2>0 && z1[n1-1]==z2[n2-1] ){ n1--; n2--; }
-  while( n1<origN1 && (z1[n1]&0xc0)==0x80 ){ n1++; n2++; }
-  return origN1 - n1;
-}
-#endif /* 0 */
-
 /*
 ** Update entry m[i] such that it is the minimum of its current value
 ** and m[j]+iCost.
@@ -1185,22 +898,6 @@ static int editDist3Core(
   EditDist3Cost *p;
   int res;
 
-#if 0
-  /* Remove comment prefix and suffix */
-  n = editDist3PrefixLen(f.z, z2);
-  if( f.n==n2 && n2==n ) return 0;  /* Identical strings */
-  f.n -= n;
-  f.z += n;
-  f.a += n;
-  n2 -= n;
-  z2 += n;
-  if( f.isPrefix==0 ){
-    n = editDist3SuffixLen(f.z, f.n, z2, n2);
-    f.n -= n;
-    n2 -= n;
-  }
-#endif
-
   /* allocate the Wagner matrix and the aTo[] array for the TO string */
   n = (f.n+1)*(n2+1);
   n = (n+1)&~1;
@@ -1284,7 +981,7 @@ static int editDist3Core(
     }
   }
 
-#if 0
+#if 0  /* Enable for debugging */
   printf("         ^");
   for(i1=0; i1<f.n; i1++) printf(" %c-%2x", f.z[i1], f.z[i1]&0xff);
   printf("\n   ^:");
@@ -1383,7 +1080,11 @@ static void editDist3SqlFunc(
     }
     dist = editDist3Core(pFrom, zB, nB, pLang, 0);
     editDist3FromStringDelete(pFrom);
-    sqlite3_result_int(context, dist);
+    if( dist==(-1) ){
+      sqlite3_result_error_nomem(context);
+    }else{
+      sqlite3_result_int(context, dist);
+    }
   } 
 }
 
@@ -1439,7 +1140,9 @@ static const unsigned char sqlite3Utf8Trans1[] = {
 static int utf8Read(const unsigned char *z, int n, int *pSize){
   int c, i;
 
-  if( n==0 ){
+  /* All callers to this routine (in the current implementation)
+  ** always have n>0. */
+  if( NEVER(n==0) ){
     c = i = 0;
   }else{
     c = z[0];
@@ -1880,10 +1583,10 @@ static const struct {
 */
 static unsigned char *transliterate(const unsigned char *zIn, int nIn){
   unsigned char *zOut = sqlite3_malloc( nIn*4 + 1 );
-  int i, c, sz, nOut;
+  int c, sz, nOut;
   if( zOut==0 ) return 0;
-  i = nOut = 0;
-  while( i<nIn ){
+  nOut = 0;
+  while( nIn>0 ){
     c = utf8Read(zIn, nIn, &sz);
     zIn += sz;
     nIn -= sz;
@@ -2035,128 +1738,6 @@ static void scriptCodeSqlFunc(
 /* End transliterate
 ******************************************************************************
 ******************************************************************************
-** Begin Polloc & Zamora SPEEDCOP style keying functions.
-*/
-/*
-** The Pollock & Zamora skeleton function.  Move all consonants to the
-** front and all vowels to the end, removing duplicates.  Except if the
-** first letter is a vowel then it remains as the first letter.
-*/
-static void pollockSkeletonKey(const char *zIn, char *zOut){
-  int i, j;
-  unsigned char c;
-  char seen[26];
-  static const unsigned char isVowel[] = { 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0,
-    0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 };
-  memset(seen, 0, sizeof(seen));
-  for(i=j=0; (c = (unsigned char)zIn[i])!=0; i++){
-    if( c<'a' || c>'z' ) continue;
-    if( j>0 || isVowel[c-'a'] ) continue;
-    if( seen[c-'a'] ) continue;
-    seen[c-'a'] = 1;
-    zOut[j++] = c;
-  }
-  for(i=0; (c = (unsigned char)zIn[i])!=0; i++){
-    if( c<'a' || c>'z' ) continue;
-    if( seen[c-'a'] ) continue;
-    if( !isVowel[c-'a'] ) continue;
-    seen[c-'a'] = 1;
-    zOut[j++] = c;
-  }
-  zOut[j] = 0;
-}
-
-/*
-** Function:    pollock_skeleton(X)
-**
-** Return the Pollock and Zamora skeleton key for a string X of all
-** lower-case letters.
-*/
-static void pollockSkeletonSqlFunc(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  const char *zIn = (const char*)sqlite3_value_text(argv[0]);
-  int nIn = sqlite3_value_bytes(argv[0]);
-  char *zOut;
-  if( zIn ){
-    zOut = sqlite3_malloc( nIn + 1 );
-    if( zOut==0 ){
-      sqlite3_result_error_nomem(context);
-    }else{
-      pollockSkeletonKey(zIn, zOut);
-      sqlite3_result_text(context, (char*)zOut, -1, sqlite3_free);
-    }
-  }
-}  
-
-/*
-** The Pollock & Zamora omission key.
-**
-** The key consists of unique consonants in the following order:
-**
-**         jkqxzvwybfmgpdhclntsr
-**
-** These are followed by unique vowels in input order.
-*/
-static void pollockOmissionKey(const char *zIn, char *zOut){
-  int i, j;
-  unsigned char c;
-  char seen[26];
-  static const unsigned char isVowel[] = { 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0,
-    0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 };
-  static const unsigned char constOrder[] = "jkqxzvwybfmgpdhclntsr";
-
-  memset(seen, 0, sizeof(seen));
-  for(i=j=0; (c = (unsigned char)zIn[i])!=0; i++){
-    if( c<'a' || c>'z' ) continue;
-    if( isVowel[c-'a'] ) continue;
-    if( seen[c-'a'] ) continue;
-    seen[c-'a'] = 1;
-  }
-  for(i=0; (c = constOrder[i])!=0; i++){
-    if( seen[c-'a'] ) zOut[j++] = c;
-  }
-  for(i=0; (c = (unsigned char)zIn[i])!=0; i++){
-    if( c<'a' || c>'z' ) continue;
-    if( seen[c-'a'] ) continue;
-    if( !isVowel[c-'a'] ) continue;
-    seen[c-'a'] = 1;
-    zOut[j++] = c;
-  }
-  zOut[j] = 0;
-}
-
-/*
-** Function:    pollock_omission(X)
-**
-** Return the Pollock and Zamora omission key for a string X of all
-** lower-case letters.
-*/
-static void pollockOmissionSqlFunc(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  const char *zIn = (const char*)sqlite3_value_text(argv[0]);
-  int nIn = sqlite3_value_bytes(argv[0]);
-  char *zOut;
-  if( zIn ){
-    zOut = sqlite3_malloc( nIn + 1 );
-    if( zOut==0 ){
-      sqlite3_result_error_nomem(context);
-    }else{
-      pollockOmissionKey(zIn, zOut);
-      sqlite3_result_text(context, (char*)zOut, -1, sqlite3_free);
-    }
-  }
-}  
-
-
-/* End SPEEDCOP keying functions
-******************************************************************************
-******************************************************************************
 ** Begin spellfix1 virtual table.
 */
 
@@ -2164,7 +1745,7 @@ static void pollockOmissionSqlFunc(
 #define SPELLFIX_MX_HASH  8
 
 /* Maximum number of hash strings to examine per query */
-#define SPELLFIX_MX_RUN   8
+#define SPELLFIX_MX_RUN   1
 
 typedef struct spellfix1_vtab spellfix1_vtab;
 typedef struct spellfix1_cursor spellfix1_cursor;
@@ -2187,10 +1768,11 @@ struct spellfix1_cursor {
   int nRow;                    /* Number of rows of content */
   int nAlloc;                  /* Number of allocated rows */
   int iRow;                    /* Current row of content */
-  int iLang;                   /* Value of the lang= constraint */
+  int iLang;                   /* Value of the langid= constraint */
   int iTop;                    /* Value of the top= constraint */
   int iScope;                  /* Value of the scope= constraint */
   int nSearch;                 /* Number of vocabulary items checked */
+  sqlite3_stmt *pFullScan;     /* Shadow query for a full table scan */
   struct spellfix1_row {       /* For each row of content */
     sqlite3_int64 iRowid;         /* Rowid for this row */
     char *zWord;                  /* Text for this row */
@@ -2267,11 +1849,13 @@ static char *spellfix1Dequote(const char *zIn){
   zOut = sqlite3_mprintf("%s", zIn);
   if( zOut==0 ) return 0;
   i = (int)strlen(zOut);
+#if 0  /* The parser will never leave spaces at the end */
   while( i>0 && isspace(zOut[i-1]) ){ i--; }
+#endif
   zOut[i] = 0;
   c = zOut[0];
   if( c=='\'' || c=='"' ){
-    for(i=1, j=0; zOut[i]; i++){
+    for(i=1, j=0; ALWAYS(zOut[i]); i++){
       zOut[j++] = zOut[i];
       if( zOut[i]==c ){
         if( zOut[i+1]==c ){
@@ -2311,31 +1895,25 @@ static int spellfix1Init(
   int rc = SQLITE_OK;
   int i;
 
-  if( argc<3 ){
-    *pzErr = sqlite3_mprintf(
-        "%s: wrong number of CREATE VIRTUAL TABLE arguments", argv[0]
-    );
-    rc = SQLITE_ERROR;
+  nDbName = strlen(zDbName);
+  pNew = sqlite3_malloc( sizeof(*pNew) + nDbName + 1);
+  if( pNew==0 ){
+    rc = SQLITE_NOMEM;
   }else{
-    nDbName = strlen(zDbName);
-    pNew = sqlite3_malloc( sizeof(*pNew) + nDbName + 1);
-    if( pNew==0 ){
+    memset(pNew, 0, sizeof(*pNew));
+    pNew->zDbName = (char*)&pNew[1];
+    memcpy(pNew->zDbName, zDbName, nDbName+1);
+    pNew->zTableName = sqlite3_mprintf("%s", zTableName);
+    pNew->db = db;
+    if( pNew->zTableName==0 ){
       rc = SQLITE_NOMEM;
     }else{
-      memset(pNew, 0, sizeof(*pNew));
-      pNew->zDbName = (char*)&pNew[1];
-      memcpy(pNew->zDbName, zDbName, nDbName+1);
-      pNew->zTableName = sqlite3_mprintf("%s", zTableName);
-      pNew->db = db;
-      if( pNew->zTableName==0 ){
-        rc = SQLITE_NOMEM;
-      }else{
-        rc = sqlite3_declare_vtab(db, 
-             "CREATE TABLE x(word,rank,distance,langid, "
-             "score, matchlen, phonehash, "
-             "top HIDDEN, scope HIDDEN, srchcnt HIDDEN, "
-             "soundslike HIDDEN, command HIDDEN)"
-        );
+      rc = sqlite3_declare_vtab(db, 
+           "CREATE TABLE x(word,rank,distance,langid, "
+           "score, matchlen, phonehash HIDDEN, "
+           "top HIDDEN, scope HIDDEN, srchcnt HIDDEN, "
+           "soundslike HIDDEN, command HIDDEN)"
+      );
 #define SPELLFIX_COL_WORD            0
 #define SPELLFIX_COL_RANK            1
 #define SPELLFIX_COL_DISTANCE        2
@@ -2348,39 +1926,44 @@ static int spellfix1Init(
 #define SPELLFIX_COL_SRCHCNT         9
 #define SPELLFIX_COL_SOUNDSLIKE     10
 #define SPELLFIX_COL_COMMAND        11
+    }
+    if( rc==SQLITE_OK && isCreate ){
+      sqlite3_uint64 r;
+      spellfix1DbExec(&rc, db,
+         "CREATE TABLE IF NOT EXISTS \"%w\".\"%w_vocab\"(\n"
+         "  id INTEGER PRIMARY KEY,\n"
+         "  rank INT,\n"
+         "  langid INT,\n"
+         "  word TEXT,\n"
+         "  k1 TEXT,\n"
+         "  k2 TEXT\n"
+         ");\n",
+         zDbName, zTableName
+      );
+      sqlite3_randomness(sizeof(r), &r);
+      spellfix1DbExec(&rc, db,
+         "CREATE INDEX IF NOT EXISTS \"%w\".\"%w_index_%llx\" "
+            "ON \"%w_vocab\"(langid,k2);",
+         zDbName, zModule, r, zTableName
+      );
+    }
+    for(i=3; rc==SQLITE_OK && i<argc; i++){
+      if( memcmp(argv[i],"edit_cost_table=",16)==0 && pNew->zCostTable==0 ){
+        pNew->zCostTable = spellfix1Dequote(&argv[i][16]);
+        if( pNew->zCostTable==0 ) rc = SQLITE_NOMEM;
+        continue;
       }
-      if( rc==SQLITE_OK && isCreate ){
-        sqlite3_uint64 r;
-        spellfix1DbExec(&rc, db,
-           "CREATE TABLE IF NOT EXISTS \"%w\".\"%w_vocab\"(\n"
-           "  id INTEGER PRIMARY KEY,\n"
-           "  rank INT,\n"
-           "  langid INT,\n"
-           "  word TEXT,\n"
-           "  k1 TEXT,\n"
-           "  k2 TEXT\n"
-           ");\n",
-           zDbName, zTableName
-        );
-        sqlite3_randomness(sizeof(r), &r);
-        spellfix1DbExec(&rc, db,
-           "CREATE INDEX IF NOT EXISTS \"%w\".\"%w_index_%llx\" "
-              "ON \"%w_vocab\"(langid,k2);",
-           zDbName, zModule, r, zTableName
-        );
-      }
-      for(i=3; rc==SQLITE_OK && i<argc; i++){
-        if( memcmp(argv[i],"edit_cost_table=",16)==0 && pNew->zCostTable==0 ){
-          pNew->zCostTable = spellfix1Dequote(&argv[i][16]);
-          if( pNew->zCostTable==0 ) rc = SQLITE_NOMEM;
-          continue;
-        }
-        rc = SQLITE_ERROR; 
-      }
+      *pzErr = sqlite3_mprintf("bad argument to spellfix1(): \"%s\"", argv[i]);
+      rc = SQLITE_ERROR; 
     }
   }
 
-  *ppVTab = (sqlite3_vtab *)pNew;
+  if( rc && pNew ){
+    *ppVTab = 0;
+    spellfix1Uninit(0, &pNew->base);
+  }else{
+    *ppVTab = (sqlite3_vtab *)pNew;
+  }
   return rc;
 }
 
@@ -2417,6 +2000,10 @@ static void spellfix1ResetCursor(spellfix1_cursor *pCur){
   pCur->nRow = 0;
   pCur->iRow = 0;
   pCur->nSearch = 0;
+  if( pCur->pFullScan ){
+    sqlite3_finalize(pCur->pFullScan);
+    pCur->pFullScan = 0;
+  }
 }
 
 /*
@@ -2535,7 +2122,7 @@ static int spellfix1BestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
     int idx = 2;
     pIdxInfo->idxNum = iPlan;
     if( pIdxInfo->nOrderBy==1
-     && pIdxInfo->aOrderBy[0].iColumn==4
+     && pIdxInfo->aOrderBy[0].iColumn==SPELLFIX_COL_SCORE
      && pIdxInfo->aOrderBy[0].desc==0
     ){
       pIdxInfo->orderByConsumed = 1;  /* Default order by iScore */
@@ -2640,9 +2227,9 @@ static void spellfix1RunQuery(MatchQuery *p, const char *zQuery, int nQuery){
   char zHash2[SPELLFIX_MX_HASH];
   char *zClass;
   int nClass;
+  int rc;
 
   if( pCur->a==0 || p->rc ) return;   /* Prior memory allocation failure */
-  if( p->nRun>=SPELLFIX_MX_RUN ) return;
   zClass = (char*)phoneticHash((unsigned char*)zQuery, nQuery);
   if( zClass==0 ){
     p->rc = SQLITE_NOMEM;
@@ -2666,18 +2253,27 @@ static void spellfix1RunQuery(MatchQuery *p, const char *zQuery, int nQuery){
   memcpy(zHash2, zHash1, iScope);
   zHash2[iScope] = 'Z';
   zHash2[iScope+1] = 0;
+#if SPELLFIX_MX_RUN>1
   for(i=0; i<p->nRun; i++){
     if( strcmp(p->azPrior[i], zHash1)==0 ) return;
   }
+#endif
+  assert( p->nRun<SPELLFIX_MX_RUN );
   memcpy(p->azPrior[p->nRun++], zHash1, iScope+1);
-  sqlite3_bind_text(pStmt, 1, zHash1, -1, SQLITE_STATIC);
-  sqlite3_bind_text(pStmt, 2, zHash2, -1, SQLITE_STATIC);
+  if( sqlite3_bind_text(pStmt, 1, zHash1, -1, SQLITE_STATIC)==SQLITE_NOMEM
+   || sqlite3_bind_text(pStmt, 2, zHash2, -1, SQLITE_STATIC)==SQLITE_NOMEM
+  ){
+    p->rc = SQLITE_NOMEM;
+    return;
+  }
+#if SPELLFIX_MX_RUN>1
   for(i=0; i<pCur->nRow; i++){
     if( pCur->a[i].iScore>iWorst ){
       iWorst = pCur->a[i].iScore;
       idxWorst = i;
     }
   }
+#endif
   while( sqlite3_step(pStmt)==SQLITE_ROW ){
     int iMatchlen = -1;
     iRank = sqlite3_column_int(pStmt, 2);
@@ -2688,7 +2284,11 @@ static void spellfix1RunQuery(MatchQuery *p, const char *zQuery, int nQuery){
     }else{
       zK1 = (const char*)sqlite3_column_text(pStmt, 3);
       if( zK1==0 ) continue;
-      iDist = editdist1(p->zPattern, zK1, pCur->iLang, 0);
+      iDist = editdist1(p->zPattern, zK1, 0);
+    }
+    if( iDist<0 ){
+      p->rc = SQLITE_NOMEM;
+      break;
     }
     pCur->nSearch++;
     iScore = spellfix1Score(iDist,iRank);
@@ -2708,6 +2308,10 @@ static void spellfix1RunQuery(MatchQuery *p, const char *zQuery, int nQuery){
       continue;
     }
     pCur->a[idx].zWord = sqlite3_mprintf("%s", sqlite3_column_text(pStmt, 1));
+    if( pCur->a[idx].zWord==0 ){
+      p->rc = SQLITE_NOMEM;
+      break;
+    }
     pCur->a[idx].iRowid = sqlite3_column_int64(pStmt, 0);
     pCur->a[idx].iRank = iRank;
     pCur->a[idx].iDistance = iDist;
@@ -2727,7 +2331,8 @@ static void spellfix1RunQuery(MatchQuery *p, const char *zQuery, int nQuery){
       }
     }
   }
-  sqlite3_reset(pStmt);
+  rc = sqlite3_reset(pStmt);
+  if( rc ) p->rc = rc;
 }
 
 /*
@@ -2748,7 +2353,7 @@ static int spellfix1FilterForMatch(
   int iScope = 3;                    /* Use this many characters of zClass */
   int iLang = 0;                     /* Language code */
   char *zSql;                        /* SQL of shadow table query */
-  sqlite3_stmt *pStmt;               /* Shadow table query */
+  sqlite3_stmt *pStmt = 0;           /* Shadow table query */
   int rc;                            /* Result code */
   int idx = 1;                       /* Next available filter parameter */
   spellfix1_vtab *p = pCur->pVTab;   /* The virtual table that owns pCur */
@@ -2790,13 +2395,20 @@ static int spellfix1FilterForMatch(
   if( p->pConfig3 ){
     x.pLang = editDist3FindLang(p->pConfig3, iLang);
     pMatchStr3 = editDist3FromStringNew(x.pLang, (const char*)zMatchThis, -1);
+    if( pMatchStr3==0 ){
+      x.rc = SQLITE_NOMEM;
+      goto filter_exit;
+    }
   }else{
     x.pLang = 0;
   }
   zPattern = (char*)transliterate(zMatchThis, sqlite3_value_bytes(argv[0]));
   sqlite3_free(pCur->zPattern);
   pCur->zPattern = zPattern;
-  if( zPattern==0 ) return SQLITE_NOMEM;
+  if( zPattern==0 ){
+    x.rc = SQLITE_NOMEM;
+    goto filter_exit;
+  }
   nPattern = strlen(zPattern);
   if( zPattern[nPattern-1]=='*' ) nPattern--;
   zSql = sqlite3_mprintf(
@@ -2805,6 +2417,11 @@ static int spellfix1FilterForMatch(
      " WHERE langid=%d AND k2>=?1 AND k2<?2",
      p->zDbName, p->zTableName, iLang
   );
+  if( zSql==0 ){
+    x.rc = SQLITE_NOMEM;
+    pStmt = 0;
+    goto filter_exit;
+  }
   rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
   sqlite3_free(zSql);
   pCur->iLang = iLang;
@@ -2820,34 +2437,18 @@ static int spellfix1FilterForMatch(
     spellfix1RunQuery(&x, zPattern, nPattern);
   }
 
-#if 0
-  /* Convert "ght" to "t" in the original pattern and try again */
-  if( x.rc==SQLITE_OK ){
-    int i, j;                         /* Loop counters */
-    char zQuery[50];                  /* Space for alternative query string */
-    for(i=j=0; i<nPattern && i<sizeof(zQuery)-1; i++){
-      char c = zPattern[i];
-      if( c=='g' && i<nPattern-2 && zPattern[i+1]=='h' && zPattern[i+2]=='t' ){
-        i += 2;
-        c= 't';
-      }
-      zQuery[j++] = c;
-    }
-    zQuery[j] = 0;
-    if( j<i ){
-      spellfix1RunQuery(&x, zQuery, j);
-    }
-  }
-#endif
-
   if( pCur->a ){
     qsort(pCur->a, pCur->nRow, sizeof(pCur->a[0]), spellfix1RowCompare);
     pCur->iTop = iLimit;
     pCur->iScope = iScope;
+  }else{
+    x.rc = SQLITE_NOMEM;
   }
+
+filter_exit:
   sqlite3_finalize(pStmt);
   editDist3FromStringDelete(pMatchStr3);
-  return pCur->a ? x.rc : SQLITE_NOMEM;
+  return x.rc;
 }
 
 /*
@@ -2859,9 +2460,25 @@ static int spellfix1FilterForFullScan(
   int argc,
   sqlite3_value **argv
 ){
+  int rc;
+  char *zSql;
+  spellfix1_vtab *pVTab = pCur->pVTab;
   spellfix1ResetCursor(pCur);
-  spellfix1ResizeCursor(pCur, 0);
-  return SQLITE_OK;
+  zSql = sqlite3_mprintf(
+     "SELECT word, rank, NULL, langid, id FROM \"%w\".\"%w_vocab\"",
+     pVTab->zDbName, pVTab->zTableName);
+  if( zSql==0 ) return SQLITE_NOMEM;
+  rc = sqlite3_prepare_v2(pVTab->db, zSql, -1, &pCur->pFullScan, 0);
+  sqlite3_free(zSql);
+  pCur->nRow = pCur->iRow = 0;
+  if( rc==SQLITE_OK ){
+    rc = sqlite3_step(pCur->pFullScan);
+    if( rc==SQLITE_ROW ){ pCur->iRow = -1; rc = SQLITE_OK; }
+    if( rc==SQLITE_DONE ){ rc = SQLITE_OK; }
+  }else{
+    pCur->iRow = 0;
+  }
+  return rc;
 }
 
 
@@ -2891,7 +2508,14 @@ static int spellfix1Filter(
 */
 static int spellfix1Next(sqlite3_vtab_cursor *cur){
   spellfix1_cursor *pCur = (spellfix1_cursor *)cur;
-  if( pCur->iRow < pCur->nRow ) pCur->iRow++;
+  if( pCur->iRow < pCur->nRow ){
+    if( pCur->pFullScan ){
+      int rc = sqlite3_step(pCur->pFullScan);
+      if( rc!=SQLITE_ROW ) pCur->iRow = pCur->nRow;
+    }else{
+      pCur->iRow++;
+    }
+  }
   return SQLITE_OK;
 }
 
@@ -2906,8 +2530,20 @@ static int spellfix1Eof(sqlite3_vtab_cursor *cur){
 /*
 ** Return columns from the current row.
 */
-static int spellfix1Column(sqlite3_vtab_cursor *cur, sqlite3_context *ctx, int i){
+static int spellfix1Column(
+  sqlite3_vtab_cursor *cur,
+  sqlite3_context *ctx,
+  int i
+){
   spellfix1_cursor *pCur = (spellfix1_cursor*)cur;
+  if( pCur->pFullScan ){
+    if( i<=SPELLFIX_COL_LANGID ){
+      sqlite3_result_value(ctx, sqlite3_column_value(pCur->pFullScan, i));
+    }else{
+      sqlite3_result_null(ctx);
+    }
+    return SQLITE_OK;
+  }
   switch( i ){
     case SPELLFIX_COL_WORD: {
       sqlite3_result_text(ctx, pCur->a[pCur->iRow].zWord, -1, SQLITE_STATIC);
@@ -2941,7 +2577,7 @@ static int spellfix1Column(sqlite3_vtab_cursor *cur, sqlite3_context *ctx, int i
           int res;
           zTranslit = (char *)transliterate((unsigned char *)zWord, nWord);
           if( !zTranslit ) return SQLITE_NOMEM;
-          res = editdist1(pCur->zPattern, zTranslit, pCur->iLang, &iMatchlen);
+          res = editdist1(pCur->zPattern, zTranslit, &iMatchlen);
           sqlite3_free(zTranslit);
           if( res<0 ) return SQLITE_NOMEM;
           iMatchlen = translen_to_charlen(zWord, nWord, iMatchlen);
@@ -2982,7 +2618,11 @@ static int spellfix1Column(sqlite3_vtab_cursor *cur, sqlite3_context *ctx, int i
 */
 static int spellfix1Rowid(sqlite3_vtab_cursor *cur, sqlite_int64 *pRowid){
   spellfix1_cursor *pCur = (spellfix1_cursor*)cur;
-  *pRowid = pCur->a[pCur->iRow].iRowid;
+  if( pCur->pFullScan ){
+    *pRowid = sqlite3_column_int64(pCur->pFullScan, 4);
+  }else{
+    *pRowid = pCur->a[pCur->iRow].iRowid;
+  }
   return SQLITE_OK;
 }
 
@@ -3066,8 +2706,8 @@ static int spellfix1Update(
       rowid = sqlite3_value_int64(argv[0]);
       newRowid = *pRowid = sqlite3_value_int64(argv[1]);
       spellfix1DbExec(&rc, db,
-             "UPDATE \"%w\".\"%w_vocab\" SET id=%lld, rank=%d, lang=%d,"
-             " word=%Q, rank=%d, k1=%Q, k2=%Q WHERE id=%lld",
+             "UPDATE \"%w\".\"%w_vocab\" SET id=%lld, rank=%d, langid=%d,"
+             " word=%Q, k1=%Q, k2=%Q WHERE id=%lld",
              p->zDbName, p->zTableName, newRowid, iRank, iLang,
              zWord, zK1, zK2, rowid
       );
@@ -3096,6 +2736,8 @@ static int spellfix1Rename(sqlite3_vtab *pVTab, const char *zNew){
   if( rc==SQLITE_OK ){
     sqlite3_free(p->zTableName);
     p->zTableName = zNewName;
+  }else{
+    sqlite3_free(zNewName);
   }
   return rc;
 }
@@ -3137,16 +2779,10 @@ static int spellfix1Register(sqlite3 *db){
                                   transliterateSqlFunc, 0, 0);
   nErr += sqlite3_create_function(db, "spellfix1_editdist", 2, SQLITE_UTF8, 0,
                                   editdistSqlFunc, 0, 0);
-  nErr += sqlite3_create_function(db, "spellfix1_editdist", 3, SQLITE_UTF8, 0,
-                                  editdistSqlFunc, 0, 0);
   nErr += sqlite3_create_function(db, "spellfix1_phonehash", 1, SQLITE_UTF8, 0,
                                   phoneticHashSqlFunc, 0, 0);
   nErr += sqlite3_create_function(db, "spellfix1_scriptcode", 1, SQLITE_UTF8, 0,
                                   scriptCodeSqlFunc, 0, 0);
-  nErr += sqlite3_create_function(db, "pollock_skeleton", 1, SQLITE_UTF8, 0,
-                                  pollockSkeletonSqlFunc, 0, 0);
-  nErr += sqlite3_create_function(db, "pollock_omission", 1, SQLITE_UTF8, 0,
-                                  pollockOmissionSqlFunc, 0, 0);
   nErr += sqlite3_create_module(db, "spellfix1", &spellfix1Module, 0);
   nErr += editDist3Install(db);
 
diff --git a/test/spellfix.test b/test/spellfix.test
index 14a4cd722e..b2182a69f3 100644
--- a/test/spellfix.test
+++ b/test/spellfix.test
@@ -137,12 +137,13 @@ do_test 3.2 {
 
 breakpoint
 foreach {tn word res} {
-  1   kos*     {kosher 3 kiosk 4 kudo 2 kappa 1 keypad 1}
-  2   kellj*   {killjoy 5 killed 4 killingly 4 kill 4 killer 4}
+  1   kos*     {kosher 3 kiosk 4 kudo 2 kiss 3 kissed 3}
+  2   kellj*   {killjoy 5 kill 4 killed 4 killer 4 killers 4}
   3   kellj    {kill 4 kills 5 killjoy 7 keel 4 killed 6}
 } {
   do_execsql_test 1.2.$tn {
-    SELECT word, matchlen FROM t3 WHERE word MATCH $word LIMIT 5
+    SELECT word, matchlen FROM t3 WHERE word MATCH $word
+     ORDER BY score, word LIMIT 5
   } $res
 } 
 

From ec73930adc09d2e237b4f8cdf6e9d51a67ecb00f Mon Sep 17 00:00:00 2001
From: drh <drh@noemail.net>
Date: Tue, 14 Aug 2012 18:43:39 +0000
Subject: [PATCH 33/36] Add an assert() to the btree rebalancer in order to
 silence a clang/scan-build warning.

FossilOrigin-Name: 6730579cf5c6c74cb293e7237d896d3a3a36b691
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/btree.c   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index 42bcaa0a49..61ec3496c3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\sspellfix\svirtual\stable\sto\sthe\slatest\sdevelopment\scode.
-D 2012-08-14T17:29:27.517
+C Add\san\sassert()\sto\sthe\sbtree\srebalancer\sin\sorder\sto\ssilence\sa\s\nclang/scan-build\swarning.
+D 2012-08-14T18:43:39.547
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -123,7 +123,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c 5b31b24d6814b11de763debf342c8cd0a15a4910
 F src/bitvec.c 26675fe8e431dc555e6f2d0e11e651d172234aa1
 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
-F src/btree.c fe84910555e103013455e21571ac8bbed23c5c50
+F src/btree.c 82b6fcbec3101ff951f47797f407d5eb5d06fa44
 F src/btree.h 4aee02e879211bfcfd3f551769578d2e940ab6c2
 F src/btreeInt.h 4e5c2bd0f9b36b2a815a6d84f771a61a65830621
 F src/build.c 0f6b40ad6211dcaba6159d0f9a297f0704f22142
@@ -1010,7 +1010,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P 1de2237d005fa1a1e1d034820d17daf64a860f81
-R c6a6a5e27cc06765fbb21bed044152b3
+P 6954fef006431d153de6e63e362b8d260ebeb1c6
+R c7501b04ad663e9c70817cec3b4cff7e
 U drh
-Z f62627106b46abb8dea1d772e4525d54
+Z aedea036152f85450c01ebb017cff317
diff --git a/manifest.uuid b/manifest.uuid
index a2aa6fb25c..a961a38622 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6954fef006431d153de6e63e362b8d260ebeb1c6
\ No newline at end of file
+6730579cf5c6c74cb293e7237d896d3a3a36b691
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 6b5dd683a5..097f02323e 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -6473,6 +6473,7 @@ static int balance_nonroot(
         ** sibling page j. If the siblings are not leaf pages of an
         ** intkey b-tree, then cell i was a divider cell. */
         assert( j+1 < ArraySize(apCopy) );
+        assert( j+1 < nOld );
         pOld = apCopy[++j];
         iNextOld = i + !leafData + pOld->nCell + pOld->nOverflow;
         if( pOld->nOverflow ){
@@ -8307,4 +8308,3 @@ void sqlite3BtreeCursorHints(BtCursor *pCsr, unsigned int mask){
   assert( mask==BTREE_BULKLOAD || mask==0 );
   pCsr->hints = mask;
 }
-

From 8b64b3977e2557848f7654e84de2e7af568dfd4a Mon Sep 17 00:00:00 2001
From: drh <drh@noemail.net>
Date: Tue, 14 Aug 2012 19:04:27 +0000
Subject: [PATCH 34/36] Silence three harmless compiler warnings in vdbesort.c.

FossilOrigin-Name: a5431c86df442c6e6dfaeae8e8aa62b56d204e97
---
 manifest       | 12 ++++++------
 manifest.uuid  |  2 +-
 src/vdbesort.c |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/manifest b/manifest
index 61ec3496c3..fa8c06418b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\san\sassert()\sto\sthe\sbtree\srebalancer\sin\sorder\sto\ssilence\sa\s\nclang/scan-build\swarning.
-D 2012-08-14T18:43:39.547
+C Silence\sthree\sharmless\scompiler\swarnings\sin\svdbesort.c.
+D 2012-08-14T19:04:27.492
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -244,7 +244,7 @@ F src/vdbeapi.c 88ea823bbcb4320f5a6607f39cd7c2d3cc4c26b1
 F src/vdbeaux.c dce80038c3c41f2680e5ab4dd0f7e0d8b7ff9071
 F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
 F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
-F src/vdbesort.c bd5ce83f9314bfb632c8c653e9e81db31928a753
+F src/vdbesort.c 0dc1b274dcb4d4c8e71b0b2b15261f286caba39b
 F src/vdbetrace.c 8bd5da325fc90f28464335e4cc4ad1407fe30835
 F src/vtab.c bb8ea3a26608bb1357538a5d2fc72beba6638998
 F src/wal.c 9294df6f96aae5909ae1a9b733fd1e1b4736978b
@@ -1010,7 +1010,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P 6954fef006431d153de6e63e362b8d260ebeb1c6
-R c7501b04ad663e9c70817cec3b4cff7e
+P 6730579cf5c6c74cb293e7237d896d3a3a36b691
+R 7ea1e8d09a42f7daed61f69d5f68ea70
 U drh
-Z aedea036152f85450c01ebb017cff317
+Z 6a9fd56c83b0e144f530abdc3bddd4ea
diff --git a/manifest.uuid b/manifest.uuid
index a961a38622..4dc7f489ce 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6730579cf5c6c74cb293e7237d896d3a3a36b691
\ No newline at end of file
+a5431c86df442c6e6dfaeae8e8aa62b56d204e97
\ No newline at end of file
diff --git a/src/vdbesort.c b/src/vdbesort.c
index 63288cfa6b..ba1e9f0f23 100644
--- a/src/vdbesort.c
+++ b/src/vdbesort.c
@@ -195,7 +195,7 @@ static int vdbeSorterIterRead(
     int rc;                       /* sqlite3OsRead() return code */
 
     /* Determine how many bytes of data to read. */
-    nRead = p->iEof - p->iReadOff;
+    nRead = (int)(p->iEof - p->iReadOff);
     if( nRead>p->nBuffer ) nRead = p->nBuffer;
     assert( nRead>0 );
 
@@ -300,7 +300,7 @@ static int vdbeSorterIterNext(
   rc = vdbeSorterIterVarint(db, pIter, &nRec);
   if( rc==SQLITE_OK ){
     pIter->nKey = (int)nRec;
-    rc = vdbeSorterIterRead(db, pIter, nRec, &pIter->aKey);
+    rc = vdbeSorterIterRead(db, pIter, (int)nRec, &pIter->aKey);
   }
 
   return rc;
@@ -343,7 +343,7 @@ static int vdbeSorterIterInit(
     if( iBuf ){
       int nRead = nBuf - iBuf;
       if( (iStart + nRead) > pSorter->iWriteOff ){
-        nRead = pSorter->iWriteOff - iStart;
+        nRead = (int)(pSorter->iWriteOff - iStart);
       }
       rc = sqlite3OsRead(
           pSorter->pTemp1, &pIter->aBuffer[iBuf], nRead, iStart

From e74f4651da9d37fef98d83b293ed220d2ca6a7e4 Mon Sep 17 00:00:00 2001
From: drh <drh@noemail.net>
Date: Wed, 15 Aug 2012 16:06:54 +0000
Subject: [PATCH 35/36] Change autoconf so that the --with-tcl=DIR option will
 override the TCL configuration that is found using tclsh.

FossilOrigin-Name: 772d0de3f311f2035f8a42f01371c96c9fa587ce
---
 configure     | 18 ++++++++++--------
 configure.ac  | 18 ++++++++++--------
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 4 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/configure b/configure
index e1fd1686b8..af10fe3bd1 100755
--- a/configure
+++ b/configure
@@ -12778,14 +12778,16 @@ $as_echo "$as_me: error: ${with_tclconfig} directory doesn't contain tclConfig.s
     fi
 
     # Start autosearch by asking tclsh
-    if test x"$cross_compiling" = xno; then
-      for i in `echo 'puts stdout $auto_path' | ${TCLSH_CMD}`
-      do
-        if test -f "$i/tclConfig.sh" ; then
-          ac_cv_c_tclconfig="$i"
-          break
-        fi
-      done
+    if test x"${ac_cv_c_tclconfig}" = x ; then
+      if test x"$cross_compiling" = xno; then
+        for i in `echo 'puts stdout $auto_path' | ${TCLSH_CMD}`
+        do
+          if test -f "$i/tclConfig.sh" ; then
+            ac_cv_c_tclconfig="$i"
+            break
+          fi
+        done
+      fi
     fi
 
     # then check for a private Tcl installation
diff --git a/configure.ac b/configure.ac
index aac1d472f2..882c3ccf92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -388,14 +388,16 @@ if test "${use_tcl}" = "yes" ; then
     fi
 
     # Start autosearch by asking tclsh
-    if test x"$cross_compiling" = xno; then
-      for i in `echo 'puts stdout $auto_path' | ${TCLSH_CMD}`
-      do
-        if test -f "$i/tclConfig.sh" ; then
-          ac_cv_c_tclconfig="$i"
-          break
-        fi
-      done
+    if test x"${ac_cv_c_tclconfig}" = x ; then
+      if test x"$cross_compiling" = xno; then
+        for i in `echo 'puts stdout $auto_path' | ${TCLSH_CMD}`
+        do
+          if test -f "$i/tclConfig.sh" ; then
+            ac_cv_c_tclconfig="$i"
+            break
+          fi
+        done
+      fi
     fi
 
     # then check for a private Tcl installation
diff --git a/manifest b/manifest
index fa8c06418b..7248b97071 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Silence\sthree\sharmless\scompiler\swarnings\sin\svdbesort.c.
-D 2012-08-14T19:04:27.492
+C Change\sautoconf\sso\sthat\sthe\s--with-tcl=DIR\soption\swill\soverride\sthe\nTCL\sconfiguration\sthat\sis\sfound\susing\stclsh.
+D 2012-08-15T16:06:54.475
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -15,8 +15,8 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
 F config.h.in 0921066a13130082764ab4ab6456f7b5bebe56de
 F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
-F configure 8f973617dbc3fca46d26104070b75c17ef70beb7 x
-F configure.ac 9ee886c21c095b3272137b1553ae416c8b8c8557
+F configure e2d0e3b67d2b1b1049d389fd671275d79bb80457 x
+F configure.ac 6e909664785b8184db2179013cd9d574f96ca3a3
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/lemon.html 3091574143dd3415669b6745843ff8d011d33549
 F doc/pager-invariants.txt 870107036470d7c419e93768676fae2f8749cf9e
@@ -1010,7 +1010,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P 6730579cf5c6c74cb293e7237d896d3a3a36b691
-R 7ea1e8d09a42f7daed61f69d5f68ea70
+P a5431c86df442c6e6dfaeae8e8aa62b56d204e97
+R 6123b9c9d97ee6d2b788aa279b8a3858
 U drh
-Z 6a9fd56c83b0e144f530abdc3bddd4ea
+Z 4d101c802bb37b58a1c59c63393cf7ab
diff --git a/manifest.uuid b/manifest.uuid
index 4dc7f489ce..1bfbcb6c13 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a5431c86df442c6e6dfaeae8e8aa62b56d204e97
\ No newline at end of file
+772d0de3f311f2035f8a42f01371c96c9fa587ce
\ No newline at end of file

From 342ced4b92a8496915b3f248f7c39983193e8048 Mon Sep 17 00:00:00 2001
From: drh <drh@noemail.net>
Date: Wed, 15 Aug 2012 16:43:07 +0000
Subject: [PATCH 36/36] Changes to the spellfix test script to make the results
 deterministic.

FossilOrigin-Name: 31c07db2560ee867723c41cdb634e2aa7993634d
---
 manifest           | 12 ++++++------
 manifest.uuid      |  2 +-
 test/spellfix.test | 13 +++++++------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/manifest b/manifest
index 7248b97071..ed0976d6a5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sautoconf\sso\sthat\sthe\s--with-tcl=DIR\soption\swill\soverride\sthe\nTCL\sconfiguration\sthat\sis\sfound\susing\stclsh.
-D 2012-08-15T16:06:54.475
+C Changes\sto\sthe\sspellfix\stest\sscript\sto\smake\sthe\sresults\sdeterministic.
+D 2012-08-15T16:43:07.389
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -718,7 +718,7 @@ F test/speed3.test d32043614c08c53eafdc80f33191d5bd9b920523
 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
-F test/spellfix.test 8bdb52dc612711660cfb64540b11830f21827983
+F test/spellfix.test 4e339920585e7555660bd3b11cf338af82c656ae
 F test/sqllimits1.test b1aae27cc98eceb845e7f7adf918561256e31298
 F test/stat.test 08e8185b3fd5b010c90d7ad82b9dd4ea1cbf14b0
 F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9
@@ -1010,7 +1010,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P a5431c86df442c6e6dfaeae8e8aa62b56d204e97
-R 6123b9c9d97ee6d2b788aa279b8a3858
+P 772d0de3f311f2035f8a42f01371c96c9fa587ce
+R 5cf52533788596320f4b8771261628f7
 U drh
-Z 4d101c802bb37b58a1c59c63393cf7ab
+Z bf22097f18dc13a1f07a9f39f12dbcca
diff --git a/manifest.uuid b/manifest.uuid
index 1bfbcb6c13..a265920d2b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-772d0de3f311f2035f8a42f01371c96c9fa587ce
\ No newline at end of file
+31c07db2560ee867723c41cdb634e2aa7993634d
\ No newline at end of file
diff --git a/test/spellfix.test b/test/spellfix.test
index b2182a69f3..245fee24e1 100644
--- a/test/spellfix.test
+++ b/test/spellfix.test
@@ -69,17 +69,18 @@ do_test 1.1 {
 
 foreach {tn word res} {
   1   raxpi*     {rasping 5 rasped 5 raspberry 6 rasp 4 rasps 4}
-  2   ril*       {rail 4 railway 4 railing 4 rails 4 railways 4}
-  3   rilis*     {realist 6 realistic 6 realistically 6 realists 6 realism 6}
-  4   reail*     {realities 3 reality 3 real 3 realest 3 realist 3}
-  5   ras*       {rasp 3 rash 3 rasped 3 rasping 3 rasps 3}
+  2   ril*       {rail 4 railed 4 railer 4 railers 4 railing 4}
+  3   rilis*     {realism 6 realist 6 realistic 6 realistically 6 realists 6}
+  4   reail*     {real 3 realest 3 realign 3 realigned 3 realigning 3}
+  5   ras*       {rascal 3 rascally 3 rascals 3 rash 3 rasher 3}
   6   realistss* {realists 8 realigns 8 realistic 9 realistically 9 realest 7}
   7   realistss  {realists 8 realist 7 realigns 8 realistic 9 realest 7}
   8   rllation*  {realities 9 reality 7 rallied 7 railed 4}
-  9   renstom*   {rainstorm 8 ransomer 6 ransom 6 ransoming 6 ransoms 6}
+  9   renstom*   {rainstorm 8 ransom 6 ransomer 6 ransoming 6 ransoms 6}
 } {
   do_execsql_test 1.2.$tn {
-    SELECT word, matchlen FROM t1 WHERE word MATCH $word LIMIT 5
+    SELECT word, matchlen FROM t1 WHERE word MATCH $word 
+     ORDER BY score, word LIMIT 5
   } $res
 }