Merge the scheme-parse-refactor changes into trunk: (1) added

sqlite3SchemaMutexHeld() asserts, (2) Use -1 instead of 0 to mean
"all" in sqlite3ResetInternalSchema(), and other cosmetic changes.

FossilOrigin-Name: 5db4511d8a77b74be3503a7c34257ef6b07541f5

diff --cc manifest
index e39ffdd1bf53c570bc7d2b741354616163ef1dbd,e06a7959a38391abb7c497ee4f845e5ed58f7eaf..e0e1861928cf8e170fb7a178fffd0fee9c8db3b6
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sthe\sP4_TRANSIENT\sconstant\sso\sthat\sit\sworks\scorrect\s-\sso\sthat\sit\sreally\nmakes\sa\scopy\sof\sthe\sstring\sfor\sthe\sP4\sargument.\s\sUse\sP4_TRANSIENT\swherever\nappropriate.\s\sChange\sP4_STATICs\sof\sschema\snames\sto\sP4_TRANSIENT.
- D 2011-04-05T12:25:19.250
 -C Add\sa\scomment\sto\sthe\sVACUUM\simplementation\sexplaining\swhen\sall\sschemas\sare\nreset\sand\snot\sjust\sthe\s"main"\sschema.
 -D 2011-04-04T23:08:14.941
++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
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -129,16 -129,16 +129,16 @@@ F src/callback.c 0425c6320730e6d3981acf
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 52ff72f966cee3087e0138a3ec69371c22be3c01
  F src/date.c 1548fdac51377e4e7833251de878b4058c148e1b
 -F src/delete.c 7ed8a8c8b5f748ece92df173d7e0f7810c899ebd
 -F src/expr.c 00817c672af554321fd67c44325afd7cef0e4648
 +F src/delete.c 7a24fcc9a31664d145acb97ce56b6d9f249a25e4
 +F src/expr.c e3cf0957c6b8faaaf7386a3bc69e53c0dc9705be
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c 8ab7ace42f9be515e97202fc942e87c35309c05e
 -F src/fkey.c 387c9b458eba388538922591dddf4fa032a39dcb
++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 4083e8af5c7ca6faa32a56f8f2f80bac346b13a4
 -F src/insert.c 081d0dc22f8264093057e6358365681036a95309
++F src/insert.c 6873a0b359e538d0568a8b459ca630edef8dde2c
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
@@@ -170,8 -170,8 +170,8 @@@ F src/parse.y 12b7ebd61ea54f0e1b1083ff6
  F src/pcache.c 09d38c44ab275db581f7a2f6ff8b9bc7f8c0faaa
  F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
  F src/pcache1.c d548e31beafa792d1994b663a29a5303569efc4e
- F src/pragma.c 65698dc369567de328cac4aaf020e417e5b8745d
- F src/prepare.c eb4944d9f7bfa13eb42a7416ed9aaed4de4d0bf3
 -F src/pragma.c 36eec9129bfea2dbcdc1694d362f17330132697d
++F src/pragma.c 49c90ab27a4339d4b5bc0b03c08cbcf20ed8d454
+ F src/prepare.c 206e1f06479fb5f756592bded468bd3ece3f41d4
  F src/printf.c 585a36b6a963df832cfb69505afa3a34ed5ef8a1
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
@@@ -230,16 -230,16 +230,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 4c1ed08b8dca272e16112c837c64848c56b323e6
 -F src/trigger.c bb68c3d1feff3e1335c55a7acf195b9c96ae91ec
++F src/trigger.c d5bc8b9ffa2b54569ce635084765c6e41aa9d174
  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 05513dca036a1e7848fe18d5ed1265ac0b32365e
+ F src/vdbe.c 0140a57f9cbd50351219bfc4e44ef3de64bd65b8
 -F src/vdbe.h 4de0efb4b0fdaaa900cf419b35c458933ef1c6d2
 +F src/vdbe.h 8a675fefdf7119441fe817c800a9a52440c2e797
  F src/vdbeInt.h 7e2f028ecc1a9faa6f253e7aa8d89cae03662bae
  F src/vdbeapi.c a09ad9164cafc505250d5dd6b69660c960f1308c
- 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 bcbc9ff568d1eb9f925574ebd22e5fdfa06daf6e
- R 7427b4db22639678e80e85b7a7894dba
 -P 39c00907833413c0d97d3e06fdda967b825d23ea
 -R 649858c83395859d3a968f120123364a
++P bf664b206bf6f5c1941da1986dfe2c0d1831d5e4 2aff1b0ca87a99b8ec80e696b9e8a48bb43db2c2
++R 22cfdab389baca0a36a30b474bcbf649
  U drh
- Z 8ac4b3854411b1d7191f15313f585b57
 -Z 182c2bca240b7634d123c22091b55227
++Z d9847e96611c99287cdc62e449a97608

diff --cc manifest.uuid
index 13312505c3b66d76d992017a8a66ae72ad89d012,ac9178d6750114a57562dce94a1fb6fe0398442d..b996a954a358a3a56a5591a6b86f32e28dbe885f
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- bf664b206bf6f5c1941da1986dfe2c0d1831d5e4
 -2aff1b0ca87a99b8ec80e696b9e8a48bb43db2c2
++5db4511d8a77b74be3503a7c34257ef6b07541f5

diff --cc src/fkey.c
Simple merge

diff --cc src/insert.c
Simple merge

diff --cc src/pragma.c
Simple merge

diff --cc src/trigger.c
Simple merge