From: drh <drh@noemail.net>
Date: Sat, 9 Apr 2011 18:07:51 +0000 (+0000)
Subject: Merge the latest trunk changes into the sessions branch.
X-Git-Tag: version-3.13.0~148^2~288
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e3fbc0157cdcda6d03cda1251e9a31e8f98230d;p=thirdparty%2Fsqlite.git

Merge the latest trunk changes into the sessions branch.

FossilOrigin-Name: 83705e90a54bad462a5b7fbca70cc129998f871c
---

9e3fbc0157cdcda6d03cda1251e9a31e8f98230d
diff --cc manifest
index aaad18cb5b,36e2f96988..336c603f40
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sa\smissing\s"extern\sC"\sterminator\sto\sthe\send\sof\ssqlite3session.h.
- D 2011-04-06T23:40:28.737
 -C Remove\san\salways-true\sconditional.\s\sReplace\sit\swith\san\sassert().
 -D 2011-04-09T17:53:30.201
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
++D 2011-04-09T18:07:51.034
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -124,21 -115,21 +124,21 @@@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47
  F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
  F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
  F src/alter.c 280f5c04b11b492703a342222b3de0a999445280
- F src/analyze.c a1ad9f4d8aac055c4a4bbd99073e2e78fe66129c
- F src/attach.c 7cae2cf0c14762ce14c074a860ec52890a973a56
+ F src/analyze.c a425d62e8fa9ebcb4359ab84ff0c62c6563d2e2a
+ F src/attach.c 7f97ca76ef2453440170929531a9c778267c0830
  F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
- F src/backup.c b7529a6691f0fd534ae8ff622203c46a7f1b626b
+ F src/backup.c 986c15232757f2873dff35ee3b35cbf935fc573c
  F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c 4fcad108b612a4d33dac568b11d26e4d38ccbe35
+ F src/btree.c 6a9164af8a2ef4612ee30b253635a9bd8e5e1b1b
  F src/btree.h 11753dd46597a20702bca8746cb4caa4486a82b5
  F src/btreeInt.h 67978c014fa4f7cc874032dd3aacadd8db656bc3
- F src/build.c b7c993274ee2a029937b0bc4815bdef80b330017
+ F src/build.c f09c46c66a1e7668c6ee25c9a2518aaa6842044c
  F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
- F src/ctime.c 52ff72f966cee3087e0138a3ec69371c22be3c01
+ F src/ctime.c 7deec4534f3b5a0c3b4a4cbadf809d321f64f9c4
  F src/date.c 1548fdac51377e4e7833251de878b4058c148e1b
 -F src/delete.c 7a24fcc9a31664d145acb97ce56b6d9f249a25e4
 +F src/delete.c ad9fa1cbf91a83ec6990d0aecb7e21cd5ff07e71
  F src/expr.c e3cf0957c6b8faaaf7386a3bc69e53c0dc9705be
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c a43ba8a005fb5efd1deeee06853e3a6120d46a91
@@@ -147,12 -138,12 +147,12 @@@ F src/global.c 02335177cf6946fe5525c6f0
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c ef33ce1522a77f6d8077f0bdb6ab22d306900950
 -F src/insert.c acfb89fe4a73d703e425e167bfcc72985f4299ae
++F src/insert.c 8796ca3f9209b699cb8120fc44290fc97ac26abe
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
  F src/loadext.c 3ae0d52da013a6326310655be6473fd472347b85
- F src/main.c 37608a8346394e52690368742d734f7b01330aaa
 -F src/main.c a8571665d43ff18f89a49d47a281605ce5ea825e
++F src/main.c 8b97db74cb876bf34ca4fb3720b18e4ffdcf9fd5
  F src/malloc.c 788f2ed928786dfe305b6783d551d6b1a9080976
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
@@@ -186,10 -177,10 +186,10 @@@ F src/random.c cd4a67b3953b88019f8cd4cc
  F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c 649a6f10f7eb7b52a5a28847773cb9968a828ae8
- F src/shell.c a73b30067ec15f116d5d0c28880179898fbe3d0b
- F src/sqlite.h.in 235300cdca517ce148385d3ab816e7e8cf9e1ff3
+ F src/shell.c 9c8389796764f65d4506bcd614ac8061f4160d5c
 -F src/sqlite.h.in 4d28db70c37a1b17942820308eb59f211140da43
++F src/sqlite.h.in 9cff46ef60540f044c1b665db606aa63ba67048f
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
- F src/sqliteInt.h 0873a71099f763cdf24cfabf04a237ad100e20d0
 -F src/sqliteInt.h ac8f3f5846275c634f6649969304a9e97f6f9854
++F src/sqliteInt.h 9a29e5bb82f3abef6b4af91e18d637050fa3c883
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -207,7 -198,7 +207,7 @@@ F src/test_async.c 0612a752896fad42d55c
  F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e
  F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de
  F src/test_btree.c 47cd771250f09cdc6e12dda5bc71bc0b3abc96e2
- F src/test_config.c 3050df9faf023fb52937f7e9998004c2415d4122
 -F src/test_config.c d536042f27226b4639f0f87d4795fd37428a9ddf
++F src/test_config.c 25a4128c2dc9e1dbebafcb7e8c61d45f09f7fbc3
  F src/test_demovfs.c 31050680fa6925b4f677cfd4fa965b5f19195e50
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_func.c cbdec5cededa0761daedde5baf06004a9bf416b5
@@@ -239,8 -230,8 +239,8 @@@ F src/test_vfstrace.c 2265c9895f350c8d3
  F src/test_wholenumber.c 6129adfbe7c7444f2e60cc785927f3aa74e12290
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c 604607d6813e9551cf5189d899e0a25c12681080
- F src/trigger.c d5bc8b9ffa2b54569ce635084765c6e41aa9d174
+ F src/trigger.c 144cc18bb701f3286484aae4292a9531f09278c8
 -F src/update.c 81911be16ece3c3e7716aa18565b4814ec41f8b9
 +F src/update.c 3f3f3bb734a0da1dffd0ed33e504642b35ed3605
  F src/utf.c d83650c3ea08f7407bd9d0839d9885241c209c60
  F src/util.c cd997077bad039efc0597eb027c929658f93c018
  F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e
@@@ -937,7 -927,7 +937,7 @@@ F tool/speedtest8.c 2902c46588c40b55661
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 7b7c8d366c51e89aefc6efc9dcffe3f62c7e1d25
- R 35a03a7ffb44f2b52e4ebaca11ffd944
 -P a46f32900a013aa6bb2dad2a9ed3ce00ab2493fd
 -R 82deaf50c44bacb7e77b8358435cc0c9
++P 29090b695a95feaba1b74f9894997083a060263a 1c2f0f8477bcf251fe874a2cfae4d7a403cb88ff
++R a40e5f171b5b8b5d469c7b8e3eba3790
  U drh
- Z efe884ab8aaf8c7e1eec316d7a2437f1
 -Z 1d377ca5bb92e1cc67ae34d0dbcea9e6
++Z 7e220d1108384435c7d9af48b2056273
diff --cc manifest.uuid
index cf1a04a1ea,e9b55b99fe..1c2583a835
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 29090b695a95feaba1b74f9894997083a060263a
 -1c2f0f8477bcf251fe874a2cfae4d7a403cb88ff
++83705e90a54bad462a5b7fbca70cc129998f871c