Merge in the latest changes from trunk.

FossilOrigin-Name: 47b79c40cf07048f682c44bfef533d4764b20c4d

diff --cc manifest
index 0c5e0af6347b089343c31f12282990fd574be0a3,65800fd981d7d46f373891a777e8a52d6044be8b..bc2cf93e7848e8ef6e836f62676ca4d3f8bc3869
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
 -C Move\sthe\sexpired-statement\stest\sfor\sOP_Function\suntil\safter\sall\smemory\shas\nbeen\sfreed.\s\sThe\stest\sis\sstill\scommented\sout,\showever.
 -D 2011-04-04T12:29:20.265
 +C Merge\sin\sthe\slatest\schanges\sfrom\strunk.
- D 2011-04-02T20:08:10.095
++D 2011-04-04T13:07:02.051
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -116,15 -116,15 +116,15 @@@ F sqlite3.1 6be1ad09113570e1fc8dcaff84c
  F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
  F src/alter.c 280f5c04b11b492703a342222b3de0a999445280
  F src/analyze.c d0a673d303f611690fc7a3293aaefed57cccc5c8
 -F src/attach.c 438ea6f6b5d5961c1f49b737f2ce0f14ce7c6877
 +F src/attach.c 7cae2cf0c14762ce14c074a860ec52890a973a56
  F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 -F src/backup.c 537f89c7ef5021cb580f31f782e556ffffcb2ed1
 +F src/backup.c b7529a6691f0fd534ae8ff622203c46a7f1b626b
  F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
- F src/btmutex.c 96a12f50f7a17475155971a241d85ec5171573ff
- F src/btree.c 2b9c81ff64da339a67dda4f94c0d763627be0b67
- F src/btree.h 8d36f774ec4b1d0027b8966f8c03d9a72a518c14
- F src/btreeInt.h 20f73dc93b1eeb83afd7259fbc6bd7dcf2df7fe4
+ F src/btmutex.c 3e595ee1bb99e3a1f16824137b435ffc97c98e5f
+ F src/btree.c 107723ed4f9bdb55213ba6164c30c49af75f4bf9
+ F src/btree.h a840a20c1969391f98ee06960d5ee2dc460186b3
+ F src/btreeInt.h 6714ce2f5e879eb9a904a6a4575dc4faa4f29991
 -F src/build.c 3a8c6c4b1e16798755d46e699b7fcc12b9f27b2b
 +F src/build.c 0dd1fd5a9d38534e99d7ed70c325647917e571c5
  F src/callback.c 5069f224882cbdccd559f591271d28d7f37745bc
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 52ff72f966cee3087e0138a3ec69371c22be3c01
@@@ -234,12 -234,12 +234,12 @@@ F src/trigger.c ec4813709e990a169b69232
  F src/update.c 81911be16ece3c3e7716aa18565b4814ec41f8b9
  F src/utf.c d83650c3ea08f7407bd9d0839d9885241c209c60
  F src/util.c cd997077bad039efc0597eb027c929658f93c018
 -F src/vacuum.c 924bd1bcee2dfb05376f79845bd3b4cec7b54b2f
 -F src/vdbe.c 6488f759929602cbc3acea5e9c7c10e2d2cd00ed
 +F src/vacuum.c 3b2b0998f4f277e4bc61469c2d78d8424d02899b
- F src/vdbe.c 6b15a8fb9bb5d5abd232fbc72cc6410c2fd70c1b
++F src/vdbe.c 48fe95bd84b7cdeb155c4d2b825c7d19a65c5b3d
  F src/vdbe.h 4de0efb4b0fdaaa900cf419b35c458933ef1c6d2
- F src/vdbeInt.h 8ee9302ecc1036509956df8aceea6b0b5e0e231c
+ F src/vdbeInt.h 7e2f028ecc1a9faa6f253e7aa8d89cae03662bae
  F src/vdbeapi.c a09ad9164cafc505250d5dd6b69660c960f1308c
- F src/vdbeaux.c f4b4a7dce084fbe49f6ba761f4ce42e732eb95b1
 -F src/vdbeaux.c 010e4e67a5a577451b0220ea8903c9e279a43248
++F src/vdbeaux.c e1ea6edc07b4f33a339cc45a2fbe0a36067d2d8b
  F src/vdbeblob.c c3ccb7c8732858c680f442932e66ad06bb036562
  F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
  F src/vdbetrace.c 3ba13bc32bdf16d2bdea523245fd16736bed67b5
@@@ -926,7 -926,7 +926,7 @@@ F tool/speedtest8.c 2902c46588c40b55661
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 211d5dde1f9c15048c65d1d700141aa7b2491011 3d6f2e82358c0d8c0ca04e0da20b84fc65c3f7fa
- R 290acaeec121836b8a1b99b53f8bb8b6
 -P 4e996f36c73c5e768a954394fcbbf5e17576c807
 -R 4c64876ffe2c0a670add1f1b62152ed8
++P 0d99229a7a58da07748072326f6261c533c1958f 425e3edb146c497817855dd741878709a25c8b98
++R 0ccaf0f101b400777a3c1e84b0615efa
  U drh
- Z 38fca8897a28d9359be9824575889a08
 -Z badc0ef9dd3fcc800ebaf4f50ec0d36c
++Z 3368f164313f101c42a8e8263501ee32

diff --cc manifest.uuid
index 7a9e90a4e4a4cf59b823a22b5f2a77d1477ecef8,3a4413c91a396cd4c6d4d83d55fb83a76282dbc2..b7ce1af1d773aa9074ca14c5902e5723f3c62dab
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0d99229a7a58da07748072326f6261c533c1958f
 -425e3edb146c497817855dd741878709a25c8b98
++47b79c40cf07048f682c44bfef533d4764b20c4d

diff --cc src/vdbe.c
index 0c790d65024a247a2fb83078356703118726d6f5,4bfe518a9cc8974346047acd533962243d724b07..560ca343198f701154989ce258bb0da648bb55ef
--- 1/src/vdbe.c
--- 2/src/vdbe.c
+++ b/src/vdbe.c
@@@ -2649,7 -2659,8 +2659,8 @@@ case OP_Savepoint: 
          }
          if( p1==SAVEPOINT_ROLLBACK && (db->flags&SQLITE_InternChanges)!=0 ){
            sqlite3ExpirePreparedStatements(db);
 -          sqlite3ResetInternalSchema(db, 0);
 +          sqlite3ResetInternalSchema(db, -1);
+           sqlite3VdbeMutexResync(p);
            db->flags = (db->flags | SQLITE_InternChanges);
          }
        }

diff --cc src/vdbeaux.c
Simple merge