Merge recent changes to trunk into sessions branch.

FossilOrigin-Name: 62adb0e0d70e619becb68ffd2625d979bcc777cd

diff --cc manifest
index b0f2690b3b0d55c743db7477699fef46b3ba5a11,a6db29d38b7d141c45bcec4f0099e1eb1f672d07..dda8425088decf671cd6201ec8a8ed4b110b4072
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sall\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
- D 2013-03-06T02:12:18.694
 -C Define\s_BSD_SOURCE\swhen\sbuilding\son\sOpenBSD.\sThis\sis\srequired\sfor\sfchmod().
 -D 2013-03-11T13:37:52.519
++C Merge\srecent\schanges\sto\strunk\sinto\ssessions\sbranch.
++D 2013-03-12T11:38:59.574
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 9a804abbd3cae82d196e4d33aba13239e32522a5
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -141,7 -129,7 +141,7 @@@ F src/callback.c d7e46f40c3cf53c43550b7
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 72a70dcfda75d3a1f81041ce4573e7afddcd8e4e
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
- F src/delete.c 9bc9463952bdc9fc43111b1f9c83a0af9b8e2239
 -F src/delete.c aeabdabeeeaa0584127f291baa9617153d334778
++F src/delete.c 39a770e9729b1acd2de347f8f614584841d0083e
  F src/expr.c a23b4aac2a455b2e76b55bef5dcfbe62b665375c
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c e16942bd5c8a868ac53287886464a5ed0e72b179
@@@ -188,10 -176,10 +188,10 @@@ F src/resolve.c 9079da7d59aed2bb14ec831
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
  F src/select.c e1c6f6abdf9f359f4e735cb8ae11d2f359bf52a9
  F src/shell.c 7c41bfcd9e5bf9d96b9215f79b03a5b2b44a3bca
 -F src/sqlite.h.in 31045976254225e6bf046a96e87b40fa4c1d55e4
 +F src/sqlite.h.in 7c9b66c397025a9e93e1ec1faa03324b757a2880
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h 7183ab832e23db0f934494f16928da127a571d75
- F src/sqliteInt.h 4b854bf7da123c2bab96664afaac8d14e6027524
 -F src/sqliteInt.h 59477c6ddb25e7ed8d8b67f4c58ded254371182e
++F src/sqliteInt.h 8515d149d4b20fb89d4c5bd2ce57f005e4ced42f
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -251,13 -239,13 +251,13 @@@ F src/update.c abb0fcabe551dae0a133fd2a
  F src/utf.c 8d819e2e5104a430fc2005f018db14347c95a38f
  F src/util.c 0af2e515dc0dabacec931bca39525f6c3f1c5455
  F src/vacuum.c 2727bdd08847fcb6b2d2da6d14f018910e8645d3
 -F src/vdbe.c 292f8f7ced59c29c63fe17830cbe5f5a0230cdf0
 -F src/vdbe.h b52887278cb173e66188da84dfab216bea61119d
 -F src/vdbeInt.h 396bb03eec560f768d1b86092b00f46c25575d3b
 -F src/vdbeapi.c 9616986209cc77822aa9f7d91cf9e6880516d557
 -F src/vdbeaux.c 735a6905df302a7f3c715a82bd3af06dc7d74ef2
 -F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
 +F src/vdbe.c 9e4164ac85aa01e1a563e6c7f565b106ff0bf67b
 +F src/vdbe.h 1223e2548e0970cf96f573ff6b99f804a36ad683
 +F src/vdbeInt.h 0112cab1c820a599005c6bcc9504bdb17f5dbcdb
 +F src/vdbeapi.c b816227ece97354aee7a741c1fc3c5445202d8bb
 +F src/vdbeaux.c 684c159170453c8a118786b9c174627ece825f3a
 +F src/vdbeblob.c 11248c6362389569764682eb0f59ce910f3cc381
- F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
+ F src/vdbemem.c 833005f1cbbf447289f1973dba2a0c2228c7b8ab
  F src/vdbesort.c c61ca318681c0e7267da8be3abfca8469652a7e9
  F src/vdbetrace.c 8bd5da325fc90f28464335e4cc4ad1407fe30835
  F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83
@@@ -1050,7 -1037,7 +1050,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 7e14dc734d7d941da5c3aa6612e26d93b5b929bd 7097241c1220ada318f8eda938c3e3430b94a606
- R e469c56b0b932202c050a14daa3532bb
- U drh
- Z a8cbf1c861240eb4a7fc756e2ad3beac
 -P 1da15adba8f6eec69c24ec6385d6f1a7905a388f
 -R 23658f0952d1a2fe0f61c5471a6869f3
++P d69d21903b883067c66dbcdefe6b369a6fe328b0 f9027cb47bdec8dcebf1f038921b28d9e9928c18
++R f222f57c93ab273cf35121a2470c5e52
+ U dan
 -Z 6b791dcdadf138e4fa4768d3023bd490
++Z c5f2b4d72ddf45f3699f5c346c8949b7

diff --cc manifest.uuid
index 9a0a84d2e1bdaa9f7b5d074a9e19b78f06b7da0e,7c0fe040be0d4ccdfabc454194fa948ee5ca4bd9..a0ef93ed7ef8de12ea0b58b6cc0e4a560bdea5ba
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d69d21903b883067c66dbcdefe6b369a6fe328b0
 -f9027cb47bdec8dcebf1f038921b28d9e9928c18
++62adb0e0d70e619becb68ffd2625d979bcc777cd

diff --cc src/delete.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge