From: drh <drh@noemail.net>
Date: Wed, 6 Apr 2011 22:33:50 +0000 (+0000)
Subject: Merge in the latest changes from the trunk.
X-Git-Tag: version-3.13.0~148^2~291
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22e9c155ae19aa7851a8a50f070f90c0171bebbc;p=thirdparty%2Fsqlite.git

Merge in the latest changes from the trunk.

FossilOrigin-Name: 435b57dc2be7b071270a6cddece297758b8153aa
---

22e9c155ae19aa7851a8a50f070f90c0171bebbc
diff --cc manifest
index afb3dfd8b1,a043600f2a..a2bcb079d9
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
- D 2011-04-05T22:13:49.215
 -C Fix\sa\sperformance\sregression:\s\sKeep\stwo\sbtree\smasks\sin\seach\sprepared\nstatement;\sone\sfor\sbtrees\sused\sand\sanother\sfor\sbtrees\sthat\srequire\slocks.\nOnly\stry\sto\slock\sthe\sbtrees\sidentified\sby\sthe\ssecond\smask.
 -D 2011-04-06T22:05:53.025
++C Merge\sin\sthe\slatest\schanges\sfrom\sthe\strunk.
++D 2011-04-06T22:33:50.737
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -151,8 -142,8 +151,8 @@@ F src/insert.c ef33ce1522a77f6d8077f0bd
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
- F src/loadext.c 8af9fcc75708d60b88636ccba38b4a7b3c155c3e
+ F src/loadext.c 3ae0d52da013a6326310655be6473fd472347b85
 -F src/main.c 5dad851457fdd249a4d4f41e94fe9cb11aedf1f2
 +F src/main.c 37608a8346394e52690368742d734f7b01330aaa
  F src/malloc.c 788f2ed928786dfe305b6783d551d6b1a9080976
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
@@@ -185,15 -176,15 +185,15 @@@ F src/printf.c 585a36b6a963df832cfb6950
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
- F src/select.c d24406c45dd2442eb2eeaac413439066b149c944
+ F src/select.c 649a6f10f7eb7b52a5a28847773cb9968a828ae8
  F src/shell.c a73b30067ec15f116d5d0c28880179898fbe3d0b
 -F src/sqlite.h.in 923630d8249b66cf8a266dd53d4d094cace80164
 +F src/sqlite.h.in 235300cdca517ce148385d3ab816e7e8cf9e1ff3
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
 -F src/sqliteInt.h 7b0150bfdab049b11bb2d055d065051ff734d113
 +F src/sqliteInt.h 0873a71099f763cdf24cfabf04a237ad100e20d0
- F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
+ F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
 -F src/tclsqlite.c 501c9a200fd998a268be475be5858febc90b725b
 +F src/tclsqlite.c fe0da0eb0ebd8d21eec90683b779456e64351de6
  F src/test1.c 9ca440e80e16e53920904a0a5ac7feffb9b2c9a1
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 056093cfef69ff4227a6bdb9108564dc7f45e4bc
@@@ -244,11 -235,11 +244,11 @@@ F src/update.c 3f3f3bb734a0da1dffd0ed33
  F src/utf.c d83650c3ea08f7407bd9d0839d9885241c209c60
  F src/util.c cd997077bad039efc0597eb027c929658f93c018
  F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e
- F src/vdbe.c b6bcbe5663d942d49d7a2e25d437fed82da5b709
 -F src/vdbe.c 05deeec6659f2579674a5e6510b3ada2a442f8d5
 -F src/vdbe.h 8a675fefdf7119441fe817c800a9a52440c2e797
 -F src/vdbeInt.h fe8f58d305e629fff02f61f655aca1d299f1f6ae
 -F src/vdbeapi.c e0e2672e0a96ae3f8575c8ecd02912a3e8a554a1
 -F src/vdbeaux.c 9ae5074b19bdff2d8806a278533956fb281510d5
++F src/vdbe.c dd53dda1cf786397e72643a497b5c2f368ff11ba
 +F src/vdbe.h 44fd57aeed86da0cd31206626c13cdde0e72cc0e
- F src/vdbeInt.h 3dec3d5b88173c6aad0a6bc23d58142636c6cb82
++F src/vdbeInt.h b95de01246c15499c700ae00cfda0de25c01358a
 +F src/vdbeapi.c 8051038f7674c708f4515ab189fc3ea929e09a4c
- F src/vdbeaux.c 88671caaee3ef9c5e600486b3961c395bc4ac493
++F src/vdbeaux.c b0a2a184a25380f7eb9d07e9336034ec38d1b213
  F src/vdbeblob.c c3ccb7c8732858c680f442932e66ad06bb036562
  F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
  F src/vdbetrace.c 3ba13bc32bdf16d2bdea523245fd16736bed67b5
@@@ -936,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 03ca83422f0259ae5525aeecc14171811252a67d 3eeb0ff78d04891b5fd1a3d99a9fb8cfbed77a81
- R f0650bbd397ea127a3fadf071b0b957e
 -P 61a6ccbe3c9c3ad5f35fb325e3c327cb19409925
 -R 5fa436b215ae7db10b0b34b9477bdc0a
++P 45f20261720dcd73eb887f7e3df100723000418b 614de91a504d2231009a9de1305e31fce1b1c5a6
++R 502dde3bb5feee985b14f915e41e9858
  U drh
- Z 199b5e50f9e261886cd6678fe8286ef5
 -Z e891e0a53128468187772ad760452d05
++Z 9b010756d90228476ef26682d9d1164b
diff --cc manifest.uuid
index 6a6f0c6b06,507019b439..6bf7c439fb
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 45f20261720dcd73eb887f7e3df100723000418b
 -614de91a504d2231009a9de1305e31fce1b1c5a6
++435b57dc2be7b071270a6cddece297758b8153aa