Merge in recent changes from the trunk

FossilOrigin-Name: 7a0ac682c3bffcb345321fe97434563350ac90f9

diff --cc manifest
index 133446facbbcdc6da06cb9c3d39e2da89a350d50,f2bb25a6d4bb12b081b60442194855c880381903..74ed04bf37f093598c5bf9dc04b971879b14b548
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,10 +1,10 @@@
- C Do\snot\sattempt\sto\sset\sjournal_mode=wal\son\s:memory:\sor\stemp\sfile\sdatabases.
- D 2010-04-26T17:42:56
+ -----BEGIN PGP SIGNED MESSAGE-----
+ Hash: SHA1
+ 
 -C Optimization:\sConvert\san\sORDER\sBY\sclause\sinto\sa\sno-op\sif\sthe\squery\salso\ncontains\sa\sGROUP\sBY\sclause\sthat\swill\sforce\sthe\ssame\soutput\sorder.
 -D 2010-04-26T19:17:27
++C Merge\sin\srecent\schanges\sfrom\sthe\strunk
++D 2010-04-27T01:56:22
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 -F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
 +F Makefile.in d83a0ffef3dcbfb08b410a6c6dd6c009ec9167fb
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
  F Makefile.vxworks ab005d301296c40e021ccd0133ce49ca811e319f
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
@@@ -158,17 -161,17 +161,17 @@@ F src/parse.y ace5c7a125d9f2a410e431ee3
  F src/pcache.c ace8f6a5ecd4711cc66a1b23053be7109bd437cf
  F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
  F src/pcache1.c 6dc1871ce8ead9187161c370a58cd06c84221f76
- F src/pragma.c bae3ce82ca6d0ac5d3ca3e46b286856d1f0ddd70
 -F src/pragma.c 71ba42f5a6f1c91266ca065c2a55c168c7846d3a
++F src/pragma.c 5ba364af022d9dbdfb39daf4fd26cbf26571fc0e
  F src/prepare.c fd1398cb1da54385ba5bd68d93928f10d10a1d9c
  F src/printf.c 5f5b65a83e63f2096a541a340722a509fa0240a7
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c ac5f1a713cd1ae77f08b83cc69581e11bf5ae6f9
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
- F src/select.c b7c9a40bc1567bceff52ad4b73108734ee4bf268
+ F src/select.c c03d8a0565febcde8c6a12c5d77d065fddae889b
  F src/shell.c c40427c7245535a04a9cb4a417b6cc05c022e6a4
 -F src/sqlite.h.in dc98616304e3e776008655671d81e3ad3028ada7
 +F src/sqlite.h.in 96b0bed7825da354119a9742a83033087c537133
  F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
- F src/sqliteInt.h de668d16e73ef456b940ab3f60b2ac8842957853
 -F src/sqliteInt.h 4303fdad2e96c56f510cc8e31a647b1b8c5a5254
++F src/sqliteInt.h 700a2df7b8dfe57c3b8d83c52ff40928e026220c
  F src/sqliteLimit.h 3afab2291762b5d09ae20c18feb8e9fa935a60a6
  F src/status.c 4df6fe7dce2d256130b905847c6c60055882bdbe
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -808,7 -801,14 +811,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 6a944f028d4a070bef29e1fbc6fbef481ebcd34c
- R 74f903b2272910b858a0c5c9e03f5db8
- U dan
- Z 9dd751e835cbcac366a5e64c32910528
 -P 36fb2cae75b5dfe1fe818895f03c0b4f4190a722
 -R 39601da2973f0d22788b2e5833832c44
++P 30d0134454734fd9335896372c30a903e9adcc64 ca9d86baf70f210d331ce93102177c8005c494cb
++R b0a15978d17250dbff5ca26f38578573
+ U drh
 -Z 9d6faae1537324b0ce24766e774d3c1e
++Z 50883e064ff8d31e35ff6084caafc75f
+ -----BEGIN PGP SIGNATURE-----
+ Version: GnuPG v1.4.6 (GNU/Linux)
+ 
 -iD8DBQFL1ebKoxKgR168RlERAixaAJ9MtsB9+gfG3m3Uh9CtO8GjRZH+fgCghDsR
 -Xx+FaS5+UH9uAeCG9zc761s=
 -=CIW0
++iD8DBQFL1kRKoxKgR168RlERAhGtAJ0ZNNVfZUQ2rD2DR5znbRsfpO0FrQCeMGjZ
++bgsVZnQebWJklqCayCQA1Cc=
++=MFJQ
+ -----END PGP SIGNATURE-----

diff --cc manifest.uuid
index 59b15965e5622b81dafec737c3d59abda864986e,8feb63902d7cf2993ec3866d4283006c287e3275..e84e36275cb83e7acbed9b4d4764433387febd18
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 30d0134454734fd9335896372c30a903e9adcc64
 -ca9d86baf70f210d331ce93102177c8005c494cb
++7a0ac682c3bffcb345321fe97434563350ac90f9

diff --cc src/pragma.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge