From: drh <drh@noemail.net>
Date: Fri, 16 Sep 2011 19:29:58 +0000 (+0000)
Subject: Merge all the latest trunk changes into the experimental STAT3 branch.
X-Git-Tag: version-3.7.9~67^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c4e5e53fe2b5a1bcaddcda70c4cde1d912c19a3;p=thirdparty%2Fsqlite.git

Merge all the latest trunk changes into the experimental STAT3 branch.

FossilOrigin-Name: 51908c8f2bc6c086570f7493a29b096f0a40ce34
---

5c4e5e53fe2b5a1bcaddcda70c4cde1d912c19a3
diff --cc manifest
index 7c53646216,5c4f08aa37..2c01fd577f
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sstat3-trunk\sbranch.
- D 2011-09-13T19:09:28.865
 -C Remove\sunreachable\sbranches\sfrom\sthe\sprevious\schange.\s\sAdd\sadditional\ntest\scases.
 -D 2011-09-16T19:04:03.371
++C Merge\sall\sthe\slatest\strunk\schanges\sinto\sthe\sexperimental\sSTAT3\sbranch.
++D 2011-09-16T19:29:58.199
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in d314143fa6be24828021d3f583ad37d9afdce505
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -124,16 -124,16 +124,16 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c 28a4fe55327ff708bfaf9d4326d02686f7a553c3
  F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c 4cb13cf019d1978b62494b970d20e9555211094b
+ F src/btree.c 77b09c69d4849a90361e6fe5db36d167f20600c0
  F src/btree.h f5d775cd6cfc7ac32a2535b70e8d2af48ef5f2ce
  F src/btreeInt.h 67978c014fa4f7cc874032dd3aacadd8db656bc3
 -F src/build.c 851e81f26a75abbb98bd99a7c5f10e8670d867bb
 +F src/build.c 57e3b27c26e6754393cd63a2774a6c673df1e804
  F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
 -F src/ctime.c e3132ec65240b2e2f3d50831021eac387f27584d
 +F src/ctime.c dde6a9b835b9e8cc067b713de1a7f6a0c9ff807e
  F src/date.c a3c6842bad7ae632281811de112a8ba63ff08ab3
  F src/delete.c ff68e5ef23aee08c0ff528f699a19397ed8bbed8
- F src/expr.c cbcd8c2f1588a9862291a081699854c5e1cb28ab
+ F src/expr.c fd54c517869919c9b0b11dcadd43c66540ffa682
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 9f00ea98f6b360d477b5a78b5b59a1fbde82431c
  F src/func.c 59bb046d7e3df1ab512ac339ccb0a6f996a17cb7
@@@ -179,11 -179,11 +179,11 @@@ F src/printf.c 585a36b6a963df832cfb6950
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 36368f44569208fa074e61f4dd0b6c4fb60ca2b4
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
- F src/select.c bf7b7ea6befb483619da5f597b0864668b828c3c
+ F src/select.c d9b7d20b0365f80761846f00ef3638d4b33eeaf2
  F src/shell.c bbe7818ff5bc8614105ceb81ad67b8bdc0b671dd
 -F src/sqlite.h.in 0a6c9c23337fd1352c5c75a613ff9533aa7d91cb
 +F src/sqlite.h.in 3f531daa04457e83bc13765c98c06c7d71c27fa5
  F src/sqlite3ext.h 1a1a4f784aa9c3b00edd287940197de52487cd93
- F src/sqliteInt.h b7f41c29477dfa18b18c0aa3e9230c7a4c775de2
 -F src/sqliteInt.h feb4f2b212fe36bbd951e44d2490c6aacf02f689
++F src/sqliteInt.h dea1be7eccbc4c4e28fffebae19ab5e2af2b3a26
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -235,23 -235,23 +235,23 @@@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f
  F src/tokenize.c c819d9f72168a035d545a5bdafe9b085b20df705
  F src/trigger.c 1cfb80e2290ef66ea89cb4e821caae65a02c0d56
  F src/update.c 74a6cfb34e9732c1e2a86278b229913b4b51eeec
 -F src/utf.c c53eb7404b3eb5c1cbb5655c6a7a0e0ce6bd50f0
 +F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
  F src/util.c 06302ffd2b80408d4f6c7af71f7090e0cf8d8ff7
  F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e
- F src/vdbe.c 7008edbf8f608d82c035dcb1c56367ad85e68aaa
- F src/vdbe.h a10b360bf69474babc8aba8fcc64b824c5e97d38
+ F src/vdbe.c 60340bfb23f456ea0791cb28262a887363773371
+ F src/vdbe.h f0725ee997db869ecae5bb70a71612aabeca7755
  F src/vdbeInt.h 693d6ac6810298fc6b4c503cfbe3f99a240f40af
  F src/vdbeapi.c 11dc47987abacb76ad016dcf5abc0dc422482a98
- F src/vdbeaux.c 316409c6878363525a2835aab15e0505c951a16d
- F src/vdbeblob.c f024f0bf420f36b070143c32b15cc7287341ffd3
 -F src/vdbeaux.c 49be7a5ce6a1b7df9ef5791133c3e4e6ab2a1ffe
++F src/vdbeaux.c 461e3e39cc6084e23412f3ff85ef73839dae90e2
+ F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
 -F src/vdbemem.c 5e6effb96dd53d233361cbfaa3f0a43b9af689e9
 +F src/vdbemem.c 2fc78b3e0fabcc1eaa23cd79dd2e30e6dcfe1e56
- F src/vdbesort.c 667bc65254a9ebaf7bc466ebb7e58884933e351f
+ F src/vdbesort.c 468d43c057063e54da4f1988b38b4f46d60e7790
  F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
  F src/vtab.c 901791a47318c0562cd0c676a2c6ff1bc530e582
  F src/wal.c 3154756177d6219e233d84291d5b05f4e06ff5e9
  F src/wal.h 66b40bd91bc29a5be1c88ddd1f5ade8f3f48728a
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
- F src/where.c 3d9a78a422726c1b3a57188c3099e537cb18e18a
 -F src/where.c b641d399cfd8588d0e20d9790d1582b663a732a8
++F src/where.c 4d7321662f1d23c73fce7245470f4a41c18665df
  F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@@ -686,9 -685,9 +686,10 @@@ F test/speed4p.explain 6b5f104ebeb34a03
  F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
  F test/sqllimits1.test b1aae27cc98eceb845e7f7adf918561256e31298
  F test/stat.test 0997f6a57a35866b14111ed361ed8851ce7978ae
 +F test/stat3.test 986d735f70ef62a1daf98e8762f35fa3b062c5c3
  F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9
  F test/subquery.test b524f57c9574b2c0347045b4510ef795d4686796
+ F test/subquery2.test edcad5c118f0531c2e21bf16a09bbb105252d4cd
  F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
  F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a
  F test/superlock.test 5d7a4954b0059c903f82c7b67867bc5451a7c082
@@@ -962,8 -961,8 +963,8 @@@ F tool/split-sqlite3c.tcl d9be87f1c3402
  F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
  F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 -F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2
 -P 0156f10e23daca0e2504cd293a67ed0233d254d0
 -R 6ac04cf9823838428848cb3eecc8467b
 +F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 63f2c7859fa6e5d0e2cdd218ff52a3ec2d44c61d a9db247b752bcda0131b8f01c6f0182f3101d154
- R 2e9e259494c37eae338f4a7f0467a2a7
++P 11ca4ed8bf850dae1a24b7182f70039f32bd8dd1 cf51ef8ab8a610ddf64f66970dd689fe1df405b8
++R d21205869b95de630ee29bd2fddfacf5
  U drh
- Z 16b18ce61af4e2a2021001a6e69294e0
 -Z fc85b6ee205b1fa04072a560842933fc
++Z cf2b3cc9409ff7ff8b423ef999aa2d40
diff --cc manifest.uuid
index 48802d32a8,b05ad8b2ae..c0bc0031a6
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 11ca4ed8bf850dae1a24b7182f70039f32bd8dd1
 -cf51ef8ab8a610ddf64f66970dd689fe1df405b8
++51908c8f2bc6c086570f7493a29b096f0a40ce34