Merge [/src/vinfo/1958db4493461b3a54217a6a45f2730287107860|1958db4493] and [/src...

FossilOrigin-Name: ecbe0832be77599c7cc66fb9968d0f419000d231

diff --cc manifest
index 99e21dc9453b021686a9e95b7d044ed6c8789eca,04ad70f01fc4261447bd670a2c210cfa93ecde8c..a7dee2c9dec8fe48d87922be901d8d44c0cbd18b
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\sbug\swhere\sa\scondition\swas\sincorrectly\sbeing\scompiled\sout\swhen\sSQLITE_OMIT_VIRTUALTABLE\swas\sdefined.
- D 2009-09-07T17:32:35
 -C Warning\scleanup\sfrom\sthe\sMSVC\scompile.
 -D 2009-09-07T04:38:36
++C Merge\s[/src/vinfo/1958db4493461b3a54217a6a45f2730287107860|1958db4493]\sand\s[/src/vinfo/26cd015c0ee1c18dd37f11b47ce35cfa320b3514|26cd015c0e].
++D 2009-09-07T17:41:48
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in 73ddeec9dd10b85876c5c2ce1fdce627e1dcc7f8
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -209,7 -209,7 +209,7 @@@ F src/vdbe.c a158f0f3efbf2a66037dbfe402
  F src/vdbe.h 080fe6bc1264438becb8bf9b9f3c84074c336b78
  F src/vdbeInt.h 6094e60f64d7a9d4352d4e6b90d1219dce947ad9
  F src/vdbeapi.c 8d5013ab6104be757c208a70ffb191cc27d2b688
- F src/vdbeaux.c d1d3fde69d4e359db382a122172669bba2a9bf3b
 -F src/vdbeaux.c f13f4bc61c96837ee1ac531ee2401b6181244886
++F src/vdbeaux.c ea6d2f215a6a77a77882719ff23a757437e2cbcd
  F src/vdbeblob.c f93cb60ac388633ed3bde8a94ef161ad2dbfb689
  F src/vdbemem.c dc551981833756ea34a3e0b238f759479e7cf526
  F src/vtab.c 3e54fe39374e5feb8b174de32a90e7a21966025d
@@@ -750,7 -750,7 +750,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P f22e388727f0ba0f187cdee51ff8ba17a5d50b8a
- R cfbd6994f627d4adc6716a138fa3eea3
 -P 2a74ae1969aeec93576a44e11177677e6f3cea9c
 -R 8cf719dccba8f130bf794b448e1f87bd
 -U shane
 -Z 6418a3cacb4f862c4527545d609ab4e2
++P 1958db4493461b3a54217a6a45f2730287107860 26cd015c0ee1c18dd37f11b47ce35cfa320b3514
++R c696e4c21d675d7ca4562a71667fb0c3
 +U dan
- Z d9d5b322d9a74ca8546783c342555838
++Z 7455be8358f8e7bf1ced5a136a1693ca

diff --cc manifest.uuid
index 2ba29e23665aa67959dabe504ecd96ac08eadaad,7de8f3f009f9d7a9ccc4e0d7890719f11d460544..1ddfd61408ca56763b0f9bead0294419b20e1227
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 1958db4493461b3a54217a6a45f2730287107860
 -26cd015c0ee1c18dd37f11b47ce35cfa320b3514
++ecbe0832be77599c7cc66fb9968d0f419000d231

diff --cc src/vdbeaux.c
Simple merge