Merge the fix to ticket [f7b4edece25c99485] into the sessions branch.

FossilOrigin-Name: 1b736ac2934f2361dee5062e9033cbf26b41fc3a

diff --cc manifest
index 0bcad83403a1b13e15b7b62592a1b6e77abfd191,469c1e3830674670dd8a65d5b88251363eb436d2..a02bffa46b86bc58208cebc5fe6c8c0977351b36
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,8 +1,8 @@@
- C Hold\sthe\sdatabase\smutex\sfor\sthe\sduration\sof\san\ssqlite3changeset_apply()\scall.\sAlso\sfor\sthe\sduration\sof\sall\ssqlite3session_xxx()\scalls.
- D 2011-03-18T18:03:14
+ -----BEGIN PGP SIGNED MESSAGE-----
+ Hash: SHA1
+ 
 -C Add\sa\stest\scase\sto\sverify\sthat\sticket\s[f7b4edece25c994857]\sis\sfixed.
 -D 2011-03-19T02:04:02.294
++C Merge\sthe\sfix\sto\sticket\s[f7b4edece25c99485]\sinto\sthe\ssessions\sbranch.
++D 2011-03-19T02:37:38.712
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -99,12 -102,9 +102,12 @@@ F ext/rtree/rtree_util.tcl 06aab2ed5b82
  F ext/rtree/sqlite3rtree.h 1af0899c63a688e272d69d8e746f24e76f10a3f0
  F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
- F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 +F ext/session/sqlite3session.c d4ba709d457a7b184a72ccd3ab07e5a1e9dd9196
 +F ext/session/sqlite3session.h 9551c002efd5fde07c52994c6b592308e0df2d6a
 +F ext/session/test_session.c 2559ef68e421c7fb83e2c19ef08a17343b70d535
+ F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 -F main.mk 54190fab7cdba523e311c274c95ea480f32abfb5
 +F main.mk ae0868e05c76eaa8a0ae3d6927a949b1c8e810d7
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -181,9 -181,9 +184,9 @@@ F src/resolve.c 1c0f32b64f8e3f555fe1f73
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c d24406c45dd2442eb2eeaac413439066b149c944
  F src/shell.c 4a5e0ad845475c84881f0b25b1abba2ddaab0a72
 -F src/sqlite.h.in 369c767e6b9f101d63d8e4c5e40279f975ccec08
 +F src/sqlite.h.in 208dc372c9b8d89ca962babcb7cb0c1b16d32bc4
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
- F src/sqliteInt.h e427f9cff8fcf85ea23f95eb8b70e4b588d24212
 -F src/sqliteInt.h 223159f987959f7ed55ebe5b5d175842ebb7647f
++F src/sqliteInt.h 6d71ab98edf64d1605d6b49ee1bd880d16be927e
  F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
  F src/status.c 4997380fbb915426fef9e500b4872e79c99267fc
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -234,12 -234,12 +237,12 @@@ F src/update.c aa39db6c39a1e234e8badf49
  F src/utf.c 1baeeac91707a4df97ccc6141ec0f808278af685
  F src/util.c cd997077bad039efc0597eb027c929658f93c018
  F src/vacuum.c 924bd1bcee2dfb05376f79845bd3b4cec7b54b2f
- F src/vdbe.c 94cd191b1b20b0124e09b056bbce3d09f79821b3
 -F src/vdbe.c 8430780c643bf67d4b5da27f24d6ad39804fdaf4
++F src/vdbe.c 3f6d91163b5b7b3d2609bf5f21461d902989cdc5
  F src/vdbe.h 4de0efb4b0fdaaa900cf419b35c458933ef1c6d2
 -F src/vdbeInt.h 6e6f28e9bccc6c703dca1372fd661c57b5c15fb0
 -F src/vdbeapi.c a09ad9164cafc505250d5dd6b69660c960f1308c
 -F src/vdbeaux.c 00439455c80ff7b37d7f2e5be5c0cf02de732a42
 +F src/vdbeInt.h 20d13da932eed0667a2e2383a9cb0f80099a5fd3
 +F src/vdbeapi.c 0e53620e9a4889257eece201d517163d3093ee41
 +F src/vdbeaux.c 9807ae2e6974172b1d7b077327f862f6bd4dda2a
- F src/vdbeblob.c 18955f0ee6b133cd08e1592010cb9a6b11e9984c
+ F src/vdbeblob.c c3ccb7c8732858c680f442932e66ad06bb036562
  F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
  F src/vdbetrace.c 3ba13bc32bdf16d2bdea523245fd16736bed67b5
  F src/vtab.c b297e8fa656ab5e66244ab15680d68db0adbec30
@@@ -918,7 -918,14 +922,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 9604d13001e0a195718c7f03fc0e73e352226caa
- R 54e501f64ecb85ba88c3d3201e5dcd9b
- U dan
- Z 255e99dc78fad5aee707e21b8ff77ea9
 -P 36c04dd1695f0899b53ce58738181b146fc005ed
 -R 1ce5c0e249ae858a147a69727867b631
++P c615c38c3283e21c33550c093099a793761123a7 eedbcf0a0ba91bb8b9cd3d115081ba297e9959fe
++R d0ca47f6483ae12a6d0c994e1006aea9
+ U drh
 -Z 179ccdf4b38b983395c742d9461b85ad
++Z 5fff78b74e6c376b68b45fceb2b4a735
+ -----BEGIN PGP SIGNATURE-----
+ Version: GnuPG v1.4.6 (GNU/Linux)
+ 
 -iD8DBQFNhA8WoxKgR168RlERApdUAJ0ZcnA8de9+BAKkGU67ZwJ/tScyAACcDr2W
 -TL3YrSbPYZGi8T9lSJDGJ70=
 -=7h3j
++iD8DBQFNhBb2oxKgR168RlERAgoXAKCNG+a12IdNjhU70FvIK6nf6CqkoQCfbtYL
++k5XHY8ri1b+IAtTgBjHO+hs=
++=5lEb
+ -----END PGP SIGNATURE-----

diff --cc manifest.uuid
index 235b1b6cb512ff9bca1ace0a4ae201c93fd24aef,0d946b1bb8b649a98739306d8e28b298bd5540c8..a441a6b6aef77151caafc0744fc003285f1cf51a
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c615c38c3283e21c33550c093099a793761123a7
 -eedbcf0a0ba91bb8b9cd3d115081ba297e9959fe
++1b736ac2934f2361dee5062e9033cbf26b41fc3a

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge