From: dan <dan@noemail.net>
Date: Sat, 14 Jan 2012 13:50:12 +0000 (+0000)
Subject: Update sessions branch with latest changes from trunk.
X-Git-Tag: version-3.13.0~148^2~247
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af49af7f9e622c5cfd74dbb9b37d22e9f34e2a6a;p=thirdparty%2Fsqlite.git

Update sessions branch with latest changes from trunk.

FossilOrigin-Name: 01c84fd391a0ca1f5245c7eff0644d0cc6cff86b
---

af49af7f9e622c5cfd74dbb9b37d22e9f34e2a6a
diff --cc manifest
index 68ee2b1ff1,260abe4e61..d6154d7b08
--- a/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\sall\sof\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
- D 2012-01-05T13:02:36.422
 -C Make\ssure\sthe\sEXTERN\smacro\sis\sproperly\sdefined\swhen\sbuilding\stargets\sthat\srequire\sit\s(e.g.\son\sMinGW).
 -D 2012-01-14T03:34:24.129
++C Update\ssessions\sbranch\swith\slatest\schanges\sfrom\strunk.
++D 2012-01-14T13:50:12.463
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
+ F Makefile.in 3f79a373e57c3b92dabf76f40b065e719d31ac34
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc dcad80fa69f17d46fe6778ba873fc108ca16298d
  F Makefile.vxworks 1deb39c8bb047296c30161ffa10c1b5423e632f9
@@@ -194,16 -182,16 +194,16 @@@ F src/resolve.c 3d3e80a98f203ac6b9329e9
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c a1d075db66a0ea42807353501b62997969e5be79
  F src/shell.c aa4183d4a5243d8110b1d3d77faa4aea7e9c9c2d
- F src/sqlite.h.in e819002c73cc667717aa0eab4f0584e201c4e102
 -F src/sqlite.h.in 53516617d2945a411d028674d7fa20dd394b9ec0
++F src/sqlite.h.in 132b3140f29469dc1222a43fd9451c1785c80a51
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
 -F src/sqliteInt.h b8fdd9c39c8d7f5c794f4ea917293d9c75b9aff2
 +F src/sqliteInt.h 701b38210f369a802853894309af5185b44061b4
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 4568e72dfd36b6a5911f93457364deb072e0b03a
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c 008daf83b287c600c2495845ac46a9d364c1961a
 -F src/tclsqlite.c 2aeb69958965dad0842d5ea1456f1a958ef296e6
++F src/tclsqlite.c 47d088f383a106b2914ac970586fdab66c1bd169
  F src/test1.c 1b1e514e85ffe7152b02cba38bd0a1ce8cd56113
- F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
- F src/test3.c 124ff9735fb6bb7d41de180d6bac90e7b1509432
+ F src/test2.c 711555927f1f7e8db9aab86b512bc6934a774abe
+ F src/test3.c 91d3f1a09cfae3533ef17d8b484a160f3d1f1a21
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
  F src/test5.c e1a19845625144caf038031234a12185e40d315c
  F src/test6.c cf6ab27a59e1ab64b011bb251ba600131e803e59
@@@ -248,17 -236,17 +248,17 @@@ F src/test_wholenumber.c 6129adfbe7c744
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c 1e86210d3976717a19238ea7b047fac481fe8c12
  F src/trigger.c ee7e178fb9188f44b532cebd449a7c1df90fb684
 -F src/update.c d3076782c887c10e882996550345da9c4c9f9dea
 +F src/update.c 89de085a0bf4da448472029d0420a2b1cf1824ee
  F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
- F src/util.c ad06374bc92b98071f221f00d553daea514f2b60
+ F src/util.c 9e07bd67dfafe9c75b1da78c87ba030cebbb5388
  F src/vacuum.c 0c0ba2242355c6048d65e2b333abe0f7c06348fa
- F src/vdbe.c 3338717cb2ff8ead889109813149d2182484b835
 -F src/vdbe.c 64e3fc0bb56c54ceac3cc1d1e65257bfda21550e
 -F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
 -F src/vdbeInt.h ef9b8584b23b033894a0804dc6b90196c6779fb9
 -F src/vdbeapi.c 3662b6a468a2a4605a15dfab313baa6dff81ad91
 -F src/vdbeaux.c eb13a6917ed7455b5b49236fe5cfb3d3c3e4c57b
 -F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
++F src/vdbe.c 502f3deb63c24fbb3fe6b88a10c984ec897f5b7b
 +F src/vdbe.h 87b8ff40de3f55dbcdc33029416862f517c37a2f
- F src/vdbeInt.h 57ca039ec5291566b667932a31ee03e51872caaa
++F src/vdbeInt.h 1aa78a0c2d6e4fdc4b9b8ff29192e98182d25afa
 +F src/vdbeapi.c 2fc381f651738feb2495cb001cf2114dea596cc3
 +F src/vdbeaux.c ca1eada4b21723a67c510c0f456217c03ad15e48
 +F src/vdbeblob.c 11248c6362389569764682eb0f59ce910f3cc381
- F src/vdbemem.c dadc7465860ad2e980f01c9b0b1ba44903249257
+ F src/vdbemem.c 4f7d25d5ea2e2040254095b8f6de07f8dbbadf80
  F src/vdbesort.c 468d43c057063e54da4f1988b38b4f46d60e7790
  F src/vdbetrace.c d6e50e04e1ec498150e519058f617d91b8f5c843
  F src/vtab.c e9318d88feac85be8e27ee783ac8f5397933fc8a
@@@ -642,7 -631,7 +643,7 @@@ F test/pageropt.test 9191867ed19a2b3db6
  F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
  F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
- F test/permutations.test 4ec9fbb2f1389f96be8a7108a86f7f2674ae5d4b
 -F test/permutations.test fa6f0e5f13fe0b1d3f7a7613179b7f7b20028184
++F test/permutations.test ab9fbb673617734869af2fc4cbdb04baa3339d1c
  F test/pragma.test 7fa35e53085812dac94c2bfcbb02c2a4ad35df5e
  F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
@@@ -723,7 -711,7 +724,7 @@@ F test/syscall.test 265cda616f56a297406
  F test/sysfault.test c79441d88d23696fbec7b147dba98d42a04f523f
  F test/table.test a59d985ca366e39b17b175f387f9d5db5a18d4e2
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
- F test/tclsqlite.test d5298750115768bca173da8043ffac2924be21a0
 -F test/tclsqlite.test 1597d353308531527583481d14d9da52ea8ed0af
++F test/tclsqlite.test 2f2aa887763af30641f5561bdc26c5d3fbc73a88
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test 51edd31c65ed1560dd600b1796e8325df96318e2
  F test/temptrigger.test 26670ed7a39cf2296a7f0a9e0a1d7bdb7abe936d
@@@ -999,7 -987,7 +1000,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 23580718e1c15ddb89682d0e7566da4d7276bfe9 1378f905d37544701776d38987fe7a312b255983
- R 5ebf66e93e6aec7fb5582a0e00987618
- U drh
- Z e88b35dabf798061ce032430eb1150b1
 -P 6da0821a4717253221b25fb22e05cd9c13492f3d
 -R 60e95146390d8e5cafff65c7013a6898
 -U mistachkin
 -Z 628b160b9efffdc491244097b11ce639
++P a9bcb432f58b96f079a73c456efd4851c582221e 88ad2f23c5036cbb4a69b73ce5792bd5c33a9177
++R 30723a7c24a6752d8bfb2c322e9b8748
++U dan
++Z 241182607d7d4efdfae3b5115d25b877
diff --cc manifest.uuid
index 54abe46586,c714ef615d..62957ac731
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a9bcb432f58b96f079a73c456efd4851c582221e
 -88ad2f23c5036cbb4a69b73ce5792bd5c33a9177
++01c84fd391a0ca1f5245c7eff0644d0cc6cff86b