Update the sessions branch to include the SQLLOG enhancement, the

SQLITE_IOERR_DELETE_NOENT fix, and a fix for the number-of-documents
bug in FTS4.

FossilOrigin-Name: ba8d08b67021a32fda069c18b7eb93523e6f0d1f

diff --cc main.mk
Simple merge

diff --cc manifest
index 6217c562fc75f46e04207876b6bab1a3a6381d51,55cc2f4544665cb8ded050bf98a043788009be03..aba83b00bf2dac1842d3634f7b77381857f45bc8
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\schanges\sfrom\strunk:\schiefly\sthe\souter/inner\sloop\squery\noptimizer\sscoring\senhancement\sand\sthe\sINSTR()\sfunction.
- D 2012-11-10T01:27:59.154
 -C Add\sthe\sSQLLOG\scapability\sto\strunk.
 -D 2012-11-27T21:22:54.195
++C Update\sthe\ssessions\sbranch\sto\sinclude\sthe\sSQLLOG\senhancement,\sthe\nSQLITE_IOERR_DELETE_NOENT\sfix,\sand\sa\sfix\sfor\sthe\snumber-of-documents\nbug\sin\sFTS4.
++D 2012-11-27T21:56:28.635
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 82c41c0ed4cc94dd3cc7d498575b84c57c2c2384
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -101,21 -101,9 +101,21 @@@ F ext/rtree/rtree_util.tcl 06aab2ed5b82
  F ext/rtree/sqlite3rtree.h c34c1e41d1ab80bb8ad09aae402c9c956871a765
  F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 +F ext/session/session1.test 502086908e4144dfaccb1baa77bc29d75a9daace
 +F ext/session/session2.test 99ca0da7ddb617d42bafd83adccf99f18ae0384b
 +F ext/session/session3.test a7a9ce59b8d1e49e2cc23d81421ac485be0eea01
 +F ext/session/session4.test a6ed685da7a5293c5d6f99855bcf41dbc352ca84
 +F ext/session/session5.test 8fdfaf9dba28a2f1c6b89b06168bdab1fef2d478
 +F ext/session/session6.test 443789bc2fca12e4f7075cf692c60b8a2bea1a26
 +F ext/session/session8.test 7d35947ad329b8966f095d34f9617a9eff52dc65
 +F ext/session/session_common.tcl 1539d8973b2aea0025c133eb0cc4c89fcef541a5
 +F ext/session/sessionfault.test 496291b287ba3c0b14ca2e074425e29cc92a64a6
 +F ext/session/sqlite3session.c 57d04e1d6a3579e673e61dea29f214fb4e0fc505
 +F ext/session/sqlite3session.h f374c9c4c96e08f67ac418871c29d423245c7673
 +F ext/session/test_session.c ea4dc9b4a1895c8e6bddcbfe3838d7eb57df2d99
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
- F main.mk faf97ab7bd203e56b5d93975c80abd32c814ddec
 -F main.mk a0d170ae1a8a8683688e281194e09d47a68eaa3f
++F main.mk d87518f07b121bd397117bf1f144f399388c7e06
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -155,7 -143,7 +155,7 @@@ F src/journal.c 552839e54d1bf76fb8f7abe
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
- F src/main.c febaf66b42c36433b170e4704fef5b8b073a6d61
 -F src/main.c 448564ee3795b13c373bbc5c8590df8fbfe1d64c
++F src/main.c e8e33e613698f3138031c037ce9d87a0030955c1
  F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
@@@ -188,10 -176,10 +188,10 @@@ F src/resolve.c 7b986a715ac281643309c29
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
  F src/select.c 3a8baf4719f9723b4e0b43f2baa60692d0d921f8
  F src/shell.c 24cd0aa74aff73ea08594629faead564c4c2a286
- F src/sqlite.h.in 6c9386f4be831a293bc7bac803f735e12a666ac1
 -F src/sqlite.h.in 4e71a210f383b6d060bd3fdf81d850f0f8c4eca3
++F src/sqlite.h.in 36d91c7ca79b9fb35831a0f097f4fcb653819a10
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h b071b5d387b9d256b1dcd2d0240fe50a74dbb898
 -F src/sqliteInt.h 68f23dcfc3fb6559c07b327ab6d8d2e63e4bb69e
++F src/sqliteInt.h 3a67c14ba5f17c33f2f9c551bb03c4c341de0bd4
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -248,12 -237,12 +249,12 @@@ F src/update.c abb0fcabe551dae0a133fd2a
  F src/utf.c 8d819e2e5104a430fc2005f018db14347c95a38f
  F src/util.c 0af2e515dc0dabacec931bca39525f6c3f1c5455
  F src/vacuum.c 2727bdd08847fcb6b2d2da6d14f018910e8645d3
 -F src/vdbe.c e1b2f881f85598b8e5d3366a3cdba60526d40144
 -F src/vdbe.h b52887278cb173e66188da84dfab216bea61119d
 -F src/vdbeInt.h 79abf9b31be406d35ca77d6999cb2d42aaf91e78
 -F src/vdbeapi.c 4c2418161cf45392ba76a7ca92f9a5f06b96f89c
 -F src/vdbeaux.c 552a878f5d9d3484ff6fd09acc3d566403f5db4b
 -F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
 +F src/vdbe.c 640a7e140c7dc0465eff7e515252e434ca77286e
 +F src/vdbe.h 1223e2548e0970cf96f573ff6b99f804a36ad683
 +F src/vdbeInt.h 2de43968dc47f1961d5bc76aa3cb68eacf433a7c
 +F src/vdbeapi.c 58fdcd56109c05876f69c25d47a138ef370d3647
- F src/vdbeaux.c 5f53f96cda10e467ae308876157cad42572d9299
++F src/vdbeaux.c b8f2a0cb28401b7252bdbaba8988f53691909497
 +F src/vdbeblob.c 11248c6362389569764682eb0f59ce910f3cc381
  F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
  F src/vdbesort.c c61ca318681c0e7267da8be3abfca8469652a7e9
  F src/vdbetrace.c 8bd5da325fc90f28464335e4cc4ad1407fe30835
@@@ -1037,7 -1025,7 +1038,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 fce667f2d93a4ba65ccf1e748469576a3cd7ffcc 5a3b07f0f5dfae7eea870303f52f37d6a17f1da2
- R 2cae8c229d6424df7351cab19781b1e6
 -P 92e9b5bc05887c47bc964828447a76ce29aa255c b3809c937b230b34e5bc6ce4909c04ceef72fb85
 -R 7b1c6922767981286ed7cd5ff2185445
++P 2993ca20207f8dac02f58d01e31d68c84328356a f0843f885ab3337f83fe3b304aab80bb7b5dd0a3
++R 4a1915adbe009074546a4e2d976a205c
  U drh
- Z 883d57cdfacddb67b9acee024d2c5aac
 -Z 56c73f084832549f0811a2beca2c3d86
++Z 7494d16bf0eedbea369965ccf52a8519

diff --cc manifest.uuid
index 2c0d0dd2375132a6068b6d7515779988ea24088f,efda54efe5dbbf8bb58c172d50d59131a0ad908b..e7e9d26c852ce7aef872f7ea33d5b437b14e14fa
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2993ca20207f8dac02f58d01e31d68c84328356a
 -f0843f885ab3337f83fe3b304aab80bb7b5dd0a3
++ba8d08b67021a32fda069c18b7eb93523e6f0d1f

diff --cc src/main.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbeaux.c
Simple merge