Pull the latest trunk changes (and hence the schema-parse-refactor changes)

into the sessions branch.

FossilOrigin-Name: 03ca83422f0259ae5525aeecc14171811252a67d

diff --cc manifest
index b8cb6b4d46f405102de9102401402d70569d5b8a,e0e1861928cf8e170fb7a178fffd0fee9c8db3b6..be3153a3f478fc65b977ea9c82a5d76149360fc0
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\schanges\sof\strunk\sinto\sthe\ssession\sbranch.
- D 2011-04-04T13:19:36.696
 -C Merge\sthe\sscheme-parse-refactor\schanges\sinto\strunk:\s(1)\sadded\nsqlite3SchemaMutexHeld()\sasserts,\s(2)\sUse\s-1\sinstead\sof\s0\sto\smean\n"all"\sin\ssqlite3ResetInternalSchema(),\sand\sother\scosmetic\schanges.
 -D 2011-04-05T13:12:28.885
++C Pull\sthe\slatest\strunk\schanges\s(and\shence\sthe\sschema-parse-refactor\schanges)\ninto\sthe\ssessions\sbranch.
++D 2011-04-05T13:27:30.706
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -138,21 -129,21 +138,21 @@@ F src/callback.c 0425c6320730e6d3981acf
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 52ff72f966cee3087e0138a3ec69371c22be3c01
  F src/date.c 1548fdac51377e4e7833251de878b4058c148e1b
- F src/delete.c 44800af91a90f9d9445a266129313f27487614d8
- F src/expr.c 00817c672af554321fd67c44325afd7cef0e4648
 -F src/delete.c 7a24fcc9a31664d145acb97ce56b6d9f249a25e4
++F src/delete.c ad9fa1cbf91a83ec6990d0aecb7e21cd5ff07e71
+ F src/expr.c e3cf0957c6b8faaaf7386a3bc69e53c0dc9705be
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c 418b840007c873975fd0d071746d952f8bca20ce
+ F src/fkey.c a43ba8a005fb5efd1deeee06853e3a6120d46a91
  F src/func.c 3a8cb2fb2de3e3aed7f39106daf4878d9d17fcce
  F src/global.c 02335177cf6946fe5525c6f0755cf181140debf3
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c e354eadb2ca3e8d939ba928f229e2268974f380c
 -F src/insert.c 6873a0b359e538d0568a8b459ca630edef8dde2c
++F src/insert.c ef33ce1522a77f6d8077f0bdb6ab22d306900950
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
  F src/loadext.c 8af9fcc75708d60b88636ccba38b4a7b3c155c3e
- F src/main.c bed41512fabb19492b61d37fd988d79f6225e624
 -F src/main.c 83cb6a9f1404d59b4dc06ef58cf20401ac1f2261
++F src/main.c 50d70810f4cd625c7a8408030efad899aaccccad
  F src/malloc.c 92d59a007d7a42857d4e9454aa25b6b703286be1
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
@@@ -187,13 -178,13 +187,13 @@@ F src/resolve.c 1c0f32b64f8e3f555fe1f73
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c d24406c45dd2442eb2eeaac413439066b149c944
  F src/shell.c 9dc0b4bb59290c0a35256d278cab0f314987ad6a
 -F src/sqlite.h.in e047f69a61d604d4f8be6cf1d1bdfc68be9ba7e5
 +F src/sqlite.h.in 235300cdca517ce148385d3ab816e7e8cf9e1ff3
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
- F src/sqliteInt.h bb9e764799e8c48ca547fbd1ddc3978aeb035bc5
 -F src/sqliteInt.h 7b0150bfdab049b11bb2d055d065051ff734d113
++F src/sqliteInt.h 0873a71099f763cdf24cfabf04a237ad100e20d0
  F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
- F src/status.c 4997380fbb915426fef9e500b4872e79c99267fc
+ 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
@@@ -207,8 -198,8 +207,8 @@@ 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 62f0f8f934b1d5c7e4cd4f506ae453a1117b47d7
 +F src/test_config.c 3050df9faf023fb52937f7e9998004c2415d4122
- F src/test_demovfs.c 0aed671636735116fc872c5b03706fd5612488b5
+ F src/test_demovfs.c 31050680fa6925b4f677cfd4fa965b5f19195e50
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_func.c cbdec5cededa0761daedde5baf06004a9bf416b5
  F src/test_fuzzer.c f884f6f32e8513d34248d6e1ac8a32047fead254
@@@ -239,16 -230,16 +239,16 @@@ 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 ec4813709e990a169b6923293e839fa5dfd64282
+ F src/trigger.c d5bc8b9ffa2b54569ce635084765c6e41aa9d174
 -F src/update.c 81911be16ece3c3e7716aa18565b4814ec41f8b9
 +F src/update.c 3f3f3bb734a0da1dffd0ed33e504642b35ed3605
  F src/utf.c d83650c3ea08f7407bd9d0839d9885241c209c60
  F src/util.c cd997077bad039efc0597eb027c929658f93c018
- F src/vacuum.c 924bd1bcee2dfb05376f79845bd3b4cec7b54b2f
- F src/vdbe.c e4afe80d602eb2e59d384e7e8e7cb19b06858bde
- F src/vdbe.h edef9c4f0be83e1f1dccd049da37b40e021b63d9
+ F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e
 -F src/vdbe.c 0140a57f9cbd50351219bfc4e44ef3de64bd65b8
 -F src/vdbe.h 8a675fefdf7119441fe817c800a9a52440c2e797
 -F src/vdbeInt.h 7e2f028ecc1a9faa6f253e7aa8d89cae03662bae
 -F src/vdbeapi.c a09ad9164cafc505250d5dd6b69660c960f1308c
 -F src/vdbeaux.c e1ea6edc07b4f33a339cc45a2fbe0a36067d2d8b
++F src/vdbe.c f38def1fc23013c13d8e97a1551c2ed0e23136fe
++F src/vdbe.h 44fd57aeed86da0cd31206626c13cdde0e72cc0e
 +F src/vdbeInt.h 36dddc4cc333867d27f00d326e29af30062a102a
 +F src/vdbeapi.c 7ef519083e3420bf7793d8b4eae2961d894d98ab
- F src/vdbeaux.c 15eff6a3202145a54e7a6e65374652045ece3545
++F src/vdbeaux.c 12765fcaa529846f547f9e31a042968f84056dcd
  F src/vdbeblob.c c3ccb7c8732858c680f442932e66ad06bb036562
  F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
  F src/vdbetrace.c 3ba13bc32bdf16d2bdea523245fd16736bed67b5
@@@ -936,7 -926,7 +936,7 @@@ F tool/speedtest8.c 2902c46588c40b55661
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P d184cf00574b52b93f1f089025d6a0addca57558 425e3edb146c497817855dd741878709a25c8b98
- R ffd652e7771374b0d07d334e1f6024f2
 -P bf664b206bf6f5c1941da1986dfe2c0d1831d5e4 2aff1b0ca87a99b8ec80e696b9e8a48bb43db2c2
 -R 22cfdab389baca0a36a30b474bcbf649
++P 95d53c44320b9639f2623aa9cc88d0d3e1a3be8f 5db4511d8a77b74be3503a7c34257ef6b07541f5
++R 674c9237ca4fa927463c92020097f885
  U drh
- Z 333cd8aa259ea963e7224b1b34eb509c
 -Z d9847e96611c99287cdc62e449a97608
++Z 76b761508ba82daab535ead06aca81f1

diff --cc manifest.uuid
index 5524b4073a96b88a1e278c89ffdf5a2ac47997f2,b996a954a358a3a56a5591a6b86f32e28dbe885f..d499c43cc850077cbace58e1856fa3fa983fa5e3
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 95d53c44320b9639f2623aa9cc88d0d3e1a3be8f
 -5db4511d8a77b74be3503a7c34257ef6b07541f5
++03ca83422f0259ae5525aeecc14171811252a67d

diff --cc src/delete.c
Simple merge

diff --cc src/insert.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbe.h
Simple merge

diff --cc src/vdbeaux.c
Simple merge