Merge latest trunk changes.

FossilOrigin-Name: e00ed717fbe456010ec6c746490d7c3e9d94ec5a

diff --cc manifest
index 53024362d576230a1dec110a43f0771b82f63d06,86c4f75cc8a712de604ec39cf4bc820d6c36a8e2..2b023bb25cf3bbd2cc9c3f356f9e76df20a32ae5
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\strunk\schanges.
- D 2014-03-01T19:45:23.403
 -C Fix\sa\ssegfault\sthat\scan\soccur\sfollowing\san\sOOM\serror.
 -D 2014-03-03T14:20:30.542
++C Merge\slatest\strunk\schanges.
++D 2014-03-03T14:45:06.920
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -274,23 -274,23 +274,23 @@@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f
  F src/tokenize.c 6da2de6e12218ccb0aea5184b56727d011f4bee7
  F src/trigger.c a80036fcbd992729adc7cd34a875d59a71fa10cc
  F src/update.c 5b3e74a03b3811e586b4f2b4cbd7c49f01c93115
- F src/utf.c 6fc6c88d50448c469c5c196acf21617a24f90269
+ F src/utf.c 6dc9ec9f1b3db43ae8ba0365377f11df1ee4c01c
  F src/util.c c46c90459ef9bdc0c6c73803cf4c55425b4771cf
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c ab910206dd8c9c5c1455f82953934bdbfe0bcc2a
 -F src/vdbe.c cbed4957185bfee7e585dce208d8ec4cd87179c2
 -F src/vdbe.h 147027d6e8e667a63e87177a38e2b42c71fdacf8
++F src/vdbe.c 75c3f5d27ab79af214646cf37d7551bc8cec09c2
 +F src/vdbe.h c6dc01f85cf3bdcc992d244aeff952c033fd5ad0
- F src/vdbeInt.h 5286af9067cabdb8ba57b87c0c988a931be6c6c8
+ F src/vdbeInt.h d55cab859abb2c6656911497ae74eba9dcf34e28
  F src/vdbeapi.c 5bc41aaea448a7fc250902c418f1795859be3820
- F src/vdbeaux.c da0979ce81ecdf3d018be9ee1e8998110181fb12
 -F src/vdbeaux.c 89a0ad3b2ecdbe71cf827a1f99d0ae51eccd6cce
++F src/vdbeaux.c f0532f7ce4fc3f4d9811d0bc29c6ce56d448596e
  F src/vdbeblob.c d939997de046b8fcc607cfee4248f3d33dbcca50
- F src/vdbemem.c 93fc3f13ebe6809ebaac8d0a17c812ec053ba233
 -F src/vdbemem.c 868a498a670c08344a594a9d5903a3ff330916a7
 -F src/vdbesort.c 9d83601f9d6243fe70dd0169a2820c5ddfd48147
++F src/vdbemem.c 2d7918e4c80546d943414668b1485b2581f58a28
 +F src/vdbesort.c 46801acb342e5e4c07ba1777fe58880c143abb59
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
  F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
  F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
- F src/where.c 36ef94b653a10944b39e34938ee4c758f3f42879
 -F src/where.c e4b57d81d2a5fece518c1419f047f0803483f90c
++F src/where.c 2269342f82ea97596564bdc981c362a5177b72c5
  F src/whereInt.h 921f935af8b684ffb49705610bda7284db1db138
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1152,7 -1152,7 +1152,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 3861e853105cb8da344c7eebd2e455622b26395e e6ecf7337658624d664e1e71ba3fc527fd6578c1
- R 13381de2688abf03e4d159f3d590d98e
 -P e3f6c61e0333d4d237dcd2ba2e404f0a91ee5069
 -R eaec45cec313455580b422d7721ccfeb
++P 9c1747b5ded995e77fdab2fa9d334ec3c17c7c14 7fdd378d54754a3ffdc01c6c0a66cf6d5899a495
++R 4cede51faff0bb760b6f55494711c674
  U dan
- Z e204c923f296e27176558f8973bbdd9c
 -Z 0f4ad0e1bfa9fac79dc39c1726a86e9b
++Z 2c68a923f498f2b3622ae1d55f13bc1f

diff --cc manifest.uuid
index 36e6abe0e16d3068c957a46c113d969d97be2962,e37ef738a9e15fe118f87bef3ada2be2d40712d0..b161fe627fde5fbf2c4ff73f9ca6010763607eb9
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9c1747b5ded995e77fdab2fa9d334ec3c17c7c14
 -7fdd378d54754a3ffdc01c6c0a66cf6d5899a495
++e00ed717fbe456010ec6c746490d7c3e9d94ec5a

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc src/vdbemem.c
Simple merge

diff --cc src/where.c
Simple merge