From: dan <dan@noemail.net>
Date: Mon, 6 Aug 2012 18:10:09 +0000 (+0000)
Subject: Update sorter-coalesce-writes branch with latest trunk changes.
X-Git-Tag: version-3.7.14~46^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c5287ec73659e982e593c339b92e6ea2f5ff3d1;p=thirdparty%2Fsqlite.git

Update sorter-coalesce-writes branch with latest trunk changes.

FossilOrigin-Name: 214f8cda1727e0eee51605be487d4cf4f2dfb6db
---

8c5287ec73659e982e593c339b92e6ea2f5ff3d1
diff --cc manifest
index c3c728bb31,830c9c3fb7..7722412b09
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Update\ssome\scomments\sin\svdbesort.c.
- D 2012-07-26T09:21:14.241
 -C Update\sdescription\sstrings\sin\sthe\sVSIX\spackage.
 -D 2012-08-06T10:51:55.331
++C Update\ssorter-coalesce-writes\sbranch\swith\slatest\strunk\schanges.
++D 2012-08-06T18:10:09.480
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 8f6d858bf3df9978ba43df19985146a1173025e4
+ F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 56ff0fcc3fc3b275aec7f6acb34b3c0526c684bc
+ F Makefile.msc c1293ece66e237b545eae4484e3e81571fb5f47c
  F Makefile.vxworks 879f034a64062a364b21000266bbd5bc6e0c19b9
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION a71848df48082f1d6585d4b0819d530fc455485d
@@@ -244,8 -244,8 +244,8 @@@ F src/vdbeapi.c 88ea823bbcb4320f5a6607f
  F src/vdbeaux.c dce80038c3c41f2680e5ab4dd0f7e0d8b7ff9071
  F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
  F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
- F src/vdbesort.c 106796cedf32a8209e92f28560d0523193c19a9a
- F src/vdbetrace.c 79059ebd17b3c8545fab2a24253713e77e4ab392
 -F src/vdbesort.c 628b2bc0cc82cae0e9946f70c5c81986e9fba91f
++F src/vdbesort.c ad3078561072cc3faaf8084b5d7d3cd6affb5f42
+ F src/vdbetrace.c 8bd5da325fc90f28464335e4cc4ad1407fe30835
  F src/vtab.c bb8ea3a26608bb1357538a5d2fc72beba6638998
  F src/wal.c 9294df6f96aae5909ae1a9b733fd1e1b4736978b
  F src/wal.h 29c197540b19044e6cd73487017e5e47a1d3dac6
@@@ -1005,7 -1007,8 +1007,8 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 4ba266fc534f390267180eca8d68b8d5f0b7f832
- R e276763c29e00cdde695ab89ab0038a7
+ F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
 -P 335e91e599555d9f4e42f90576d1676c381314f4
 -R eadc6c87ec15f9db6747eb42f404a18d
 -U mistachkin
 -Z 9bc32025e8412eea1e17719cbb9188be
++P f4b3fded231231ef15bde98d2a996b4e16415d4c 541e9310a7b88e0b40c6530947803527f28e51de
++R 29178e6d938c0a18dd53fdfdd0d9db73
 +U dan
- Z 42e5e7096761a49ccf3e633dc0ad5716
++Z ebf9b1cca66bb54b576393e824c02bfc
diff --cc manifest.uuid
index 528757c4ac,f7027c4945..5a544c351b
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f4b3fded231231ef15bde98d2a996b4e16415d4c
 -541e9310a7b88e0b40c6530947803527f28e51de
++214f8cda1727e0eee51605be487d4cf4f2dfb6db
diff --cc src/vdbesort.c
index c00e9a2f1a,5faeca8dc7..1fcf0ddd27
--- a/src/vdbesort.c
+++ b/src/vdbesort.c
@@@ -710,13 -545,9 +710,13 @@@ static int fileWriterWriteVarint(FileWr
  **       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 */
 +  int rc2;                        /* fileWriterFinish return code */
    VdbeSorter *pSorter = pCsr->pSorter;
 +  FileWriter writer;
 +
 +  memset(&writer, 0, sizeof(FileWriter));
  
    if( pSorter->nInMemory==0 ){
      assert( pSorter->pRecord==0 );