Merge the vtab1 test script fix and the FTS3 memory leak fix from trunk

into the apple-osx branch.

FossilOrigin-Name: 892d8779cc3c4037d6e21c04c39796284d811157

diff --cc manifest
index 6a038d3915055ae8d7ecae7eeccc1359ddb910a4,5876291154b24e8905712ccdb8fcc6cbc87340df..108794aa5c7b549f18bd624441fd67625a708b2a
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
- D 2012-06-08T01:13:17.906
 -C Fix\san\sobscure\smemory\sleak\sin\sFTS3\sthat\scan\scome\sabout\swhen\stwo\smemory\nallocations\sare\simmediately\sadjacent\sto\sone\sanother.
 -D 2012-06-08T14:01:53.027
++C Merge\sthe\svtab1\stest\sscript\sfix\sand\sthe\sFTS3\smemory\sleak\sfix\sfrom\strunk\ninto\sthe\sapple-osx\sbranch.
++D 2012-06-08T14:11:30.151
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 4f37eb61be9d38643cdd839a74b8e3bad724cfcf
 +F Makefile.in f4e42073f1092a09a9cbd42aecf2f33790208cb5
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc fd86027849a59a2f621b791b79eabf3f8ffbd684
  F Makefile.vxworks 3b7fe7a0571fdadc61363ebc1b23732d2d6363ca
@@@ -1010,7 -1005,7 +1010,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P ed53b645cc791e2c75885866ecb668fff14f8e7e cfcbf9375fddd0aae0dd17bdc76a710ab77ef667
- R a2bdb973ff39fb5034d6425a7a821a3b
 -P 006db555260273209933371d17afb33d557baa68
 -R a3c1e8a9e6eec9c51478c97a48291850
++P 9d1b8515625ce7fbde170180126bd1a273bb4994 025227be5495f950c466dfabac140cba69e498be
++R 73fc9d898a1621cfcd2d0602a720ceb8
  U drh
- Z 91498d3a538de86f544b60346b3f3742
 -Z d9212c98f4fefc48d255111660b350de
++Z 70bd5ce96a21e994af0322978beb4b1b

diff --cc manifest.uuid
index 7bbb3b26a2057a7404fe07702f33ee8d54461582,bec602a3e6dcf850c45c9ee1eaa07aa7667718de..36f8bad2e175f56af261676470622ecbe881222e
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9d1b8515625ce7fbde170180126bd1a273bb4994
 -025227be5495f950c466dfabac140cba69e498be
++892d8779cc3c4037d6e21c04c39796284d811157