From: dan <dan@noemail.net>
Date: Mon, 18 Apr 2011 17:30:56 +0000 (+0000)
Subject: Merge trunk changes into sessions branch.
X-Git-Tag: version-3.13.0~148^2~277
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23328bedf076be200314ffd0bbfea09a877e2894;p=thirdparty%2Fsqlite.git

Merge trunk changes into sessions branch.

FossilOrigin-Name: b91b4c31fe311b292044c9c747feba294ffce25c
---

23328bedf076be200314ffd0bbfea09a877e2894
diff --cc manifest
index f38f5e51b4,9f1f44ec21..bae894c06c
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sfurther\smissing\scomments\sand\sother\sminor\sissues\sin\sthe\ssession\smodule\scode.
- D 2011-04-18T15:47:08.694
 -C Change\sthe\sprototype\sfor\sthe\sopen()\ssystem\scall\sto\sagree\swith\sPosix.\s\sThough\na\sfaulty\sfunction\sprototype\sin\sa\spointer\scast\sis\sa\sseemingly\sinnocuous\serror,\s\nthe\scorrect\sprototype\sis\snecessary\sfor\spthreads\sto\swork\scorrectly\son\sNetBSD.
 -D 2011-04-17T17:09:58.565
++C Merge\strunk\schanges\sinto\ssessions\sbranch.
++D 2011-04-18T17:30:56.521
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -153,8 -143,8 +153,8 @@@ F src/journal.c 552839e54d1bf76fb8f7abe
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
  F src/loadext.c 3ae0d52da013a6326310655be6473fd472347b85
 -F src/main.c a8571665d43ff18f89a49d47a281605ce5ea825e
 +F src/main.c 8b97db74cb876bf34ca4fb3720b18e4ffdcf9fd5
- F src/malloc.c 788f2ed928786dfe305b6783d551d6b1a9080976
+ F src/malloc.c 74c740e8ba22b806cfb980c8c0ddea1cbd54a20e
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
  F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
@@@ -186,11 -176,11 +186,11 @@@ F src/printf.c 585a36b6a963df832cfb6950
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
- F src/select.c 649a6f10f7eb7b52a5a28847773cb9968a828ae8
- F src/shell.c 9c8389796764f65d4506bcd614ac8061f4160d5c
- F src/sqlite.h.in 9cff46ef60540f044c1b665db606aa63ba67048f
+ F src/select.c d9d440809025a58547e39f4f268c2a296bfb56ff
+ F src/shell.c 72e7e176bf46d5c6518d15ac4ad6847c4bb5df79
 -F src/sqlite.h.in fe9a777d43276b4778e92b16a8b89ea6c38bb32b
++F src/sqlite.h.in 0cf61c41c48e1e6b863ff8cf9ecd69620932330e
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
 -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
@@@ -241,15 -231,15 +241,15 @@@ F src/test_wholenumber.c 6129adfbe7c744
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c 604607d6813e9551cf5189d899e0a25c12681080
  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/util.c 465fe10aabf0ca7d7826a156dab919b0b65c525a
  F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e
 -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 b95de01246c15499c700ae00cfda0de25c01358a
 +F src/vdbeapi.c 8051038f7674c708f4515ab189fc3ea929e09a4c
 +F src/vdbeaux.c b0a2a184a25380f7eb9d07e9336034ec38d1b213
  F src/vdbeblob.c c3ccb7c8732858c680f442932e66ad06bb036562
  F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
  F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
@@@ -938,7 -929,7 +940,7 @@@ F tool/speedtest8.c 2902c46588c40b55661
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 20d7c280235201e519f296372f269e7cecda24da
- R 22fa2c52781f892ef560f2c8f63b1707
 -P 9d6c6129fd8be42c164f14bb90011b252c1f2c46
 -R 4ae7f108651e5730cd8c416e7800e26e
 -U drh
 -Z 939cf52c691885a86594e39d90974750
++P 99f0f35092b0b78b7016b21c242da263ab64b77b 3e135748f1efacb52b414b3ac3f4ae2c08bcd8fb
++R b2692e50ee7820b096983b9aa33c1efd
 +U dan
- Z e6f0d0d675f579cb5b46b0fe2c73f457
++Z c7fa020efb14904762c294d2eedf7456
diff --cc manifest.uuid
index 240a76a7a9,2958ad9dcd..446a5128f3
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 99f0f35092b0b78b7016b21c242da263ab64b77b
 -3e135748f1efacb52b414b3ac3f4ae2c08bcd8fb
++b91b4c31fe311b292044c9c747feba294ffce25c