From: drh <drh@noemail.net>
Date: Fri, 16 Sep 2011 19:36:42 +0000 (+0000)
Subject: Merge the latest trunk fixes into the apple-osx branch.
X-Git-Tag: mountain-lion~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8062d660f1684c15b50f645af98188f97a161e45;p=thirdparty%2Fsqlite.git

Merge the latest trunk fixes into the apple-osx branch.

FossilOrigin-Name: 070bf203bb7cd59d69c10b29d7d9374e0361a47a
---

8062d660f1684c15b50f645af98188f97a161e45
diff --cc manifest
index 7f32a14ca2,5c4f08aa37..c844d62390
--- a/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\sin\sthe\slatest\schanges\sfrom\strunk.
- D 2011-09-14T19:05:55.068
 -C Remove\sunreachable\sbranches\sfrom\sthe\sprevious\schange.\s\sAdd\sadditional\ntest\scases.
 -D 2011-09-16T19:04:03.371
++C Merge\sthe\slatest\strunk\sfixes\sinto\sthe\sapple-osx\sbranch.
++D 2011-09-16T19:36:42.844
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in d314143fa6be24828021d3f583ad37d9afdce505
 +F Makefile.in 55bbee3ada084d4aa4dab9e1e0d90a21aab8bbcf
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc 25da409ce0c7799e57f48a729a8e153b23027adc
  F Makefile.vxworks 1deb39c8bb047296c30161ffa10c1b5423e632f9
@@@ -136,10 -133,10 +136,10 @@@ F src/complete.c dc1d136c0feee03c2f7550
  F src/ctime.c e3132ec65240b2e2f3d50831021eac387f27584d
  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
 +F src/func.c 1b9d471b632d8529e0f86b7bd2b918dcc2cb1097
  F src/global.c c70a46f28680f8d7c097dbc0430ccf3b932e90b0
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
@@@ -182,12 -179,11 +182,12 @@@ F src/printf.c 585a36b6a963df832cfb6950
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 36368f44569208fa074e61f4dd0b6c4fb60ca2b4
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
- F src/select.c 97b75b400070829833dfdebbd8a8575321d2f444
 -F src/select.c d9b7d20b0365f80761846f00ef3638d4b33eeaf2
++F src/select.c f3971442d59d06801ac3c712f2851ece8d1cdead
  F src/shell.c bbe7818ff5bc8614105ceb81ad67b8bdc0b671dd
 -F src/sqlite.h.in 0a6c9c23337fd1352c5c75a613ff9533aa7d91cb
 +F src/sqlite.h.in 175065018323ca082092f92873e074647d00bec2
 +F src/sqlite3_private.h 1d18557420cb0cc51ff31ec0a3fcce11e5cd6f5a
  F src/sqlite3ext.h 1a1a4f784aa9c3b00edd287940197de52487cd93
- F src/sqliteInt.h d1575c53663f4367f5d81abadd5770abc720cb1a
 -F src/sqliteInt.h feb4f2b212fe36bbd951e44d2490c6aacf02f689
++F src/sqliteInt.h 751564e4eb28a49d4f53f7bd2a211a48115d01d7
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -242,20 -238,20 +242,20 @@@ F src/update.c 74a6cfb34e9732c1e2a86278
  F src/utf.c c53eb7404b3eb5c1cbb5655c6a7a0e0ce6bd50f0
  F src/util.c 06302ffd2b80408d4f6c7af71f7090e0cf8d8ff7
  F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e
- F src/vdbe.c e46c71dbce112e6d6ad270a113792e050c706f9c
- F src/vdbe.h a10b360bf69474babc8aba8fcc64b824c5e97d38
 -F src/vdbe.c 60340bfb23f456ea0791cb28262a887363773371
++F src/vdbe.c 26deb38f5bd32ebeb2cb60853a52f2bf33d71641
+ F src/vdbe.h f0725ee997db869ecae5bb70a71612aabeca7755
  F src/vdbeInt.h 693d6ac6810298fc6b4c503cfbe3f99a240f40af
 -F src/vdbeapi.c 11dc47987abacb76ad016dcf5abc0dc422482a98
 +F src/vdbeapi.c 335435e65443f38d3073b5043e80cbbb7090c2d9
- F src/vdbeaux.c ca8aa399e1be85fe82498b107128297a5d84e6a2
- F src/vdbeblob.c f024f0bf420f36b070143c32b15cc7287341ffd3
+ F src/vdbeaux.c 49be7a5ce6a1b7df9ef5791133c3e4e6ab2a1ffe
+ F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
  F src/vdbemem.c 5e6effb96dd53d233361cbfaa3f0a43b9af689e9
  F src/vdbesort.c 468d43c057063e54da4f1988b38b4f46d60e7790
 -F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
 +F src/vdbetrace.c 4b92fe7355f682368203d29b2be7125cbab85e79
  F src/vtab.c 901791a47318c0562cd0c676a2c6ff1bc530e582
 -F src/wal.c 3154756177d6219e233d84291d5b05f4e06ff5e9
 -F src/wal.h 66b40bd91bc29a5be1c88ddd1f5ade8f3f48728a
 +F src/wal.c 92c7c876b026d5e38fab3ce332e49266ffcf8b2b
 +F src/wal.h e75d87752bd5df3dc4152ee2cb3b0dcd0b309e5e
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
- F src/where.c 7d09f4c1512affb60cc1190a4b33d121d4ce039a
+ F src/where.c b641d399cfd8588d0e20d9790d1582b663a732a8
  F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@@ -690,11 -685,12 +690,12 @@@ F test/speed4p.explain 6b5f104ebeb34a03
  F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
  F test/sqllimits1.test b1aae27cc98eceb845e7f7adf918561256e31298
  F test/stat.test 0997f6a57a35866b14111ed361ed8851ce7978ae
 -F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9
 +F test/stmt.test 78a6764439cfa5abdcbf98d4d084739e81eeec4f
  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
 +F test/superlock.test b68339e473d26cdeabe784ef14d7522334ec22c3
  F test/sync.test a34cd43e98b7fb84eabbf38f7ed8f7349b3f3d85
  F test/syscall.test 966addf703faee6a5d509abe6d8885e393e552fd
  F test/sysfault.test c79441d88d23696fbec7b147dba98d42a04f523f
@@@ -966,7 -962,7 +967,7 @@@ F tool/symbols.sh caaf6ccc7300fd4335331
  F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2
- P 55af80035f0432bbd4c4b3f4dbc9def13c5356b3 3035dc1c7398791d550f4c02774ef7f961b4bb02
- R 05d8fe3c3352da0fc1dd647fee427e2c
 -P 0156f10e23daca0e2504cd293a67ed0233d254d0
 -R 6ac04cf9823838428848cb3eecc8467b
++P 2456b4d0d2522dd2541146031347bc5e51f2036f cf51ef8ab8a610ddf64f66970dd689fe1df405b8
++R 0b04053dc847e693de750af3e7d35871
  U drh
- Z e8733d4709fe9dfd27a0d4562d922c5a
 -Z fc85b6ee205b1fa04072a560842933fc
++Z 9648d759d7257c88ac73ed1bf658e69a
diff --cc manifest.uuid
index b6fc271b61,b05ad8b2ae..16bb032c2e
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2456b4d0d2522dd2541146031347bc5e51f2036f
 -cf51ef8ab8a610ddf64f66970dd689fe1df405b8
++070bf203bb7cd59d69c10b29d7d9374e0361a47a