From: dan <dan@noemail.net>
Date: Wed, 19 Aug 2009 16:21:25 +0000 (+0000)
Subject: Merge 29cafcfdcc and a6f39181a7.
X-Git-Tag: fts3-refactor~249
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4190326626be05534f33528375ba7d6a2ecc9d1d;p=thirdparty%2Fsqlite.git

Merge 29cafcfdcc and a6f39181a7.

FossilOrigin-Name: 740a93e89c5f12672d72de7b3c55807deac613d4
---

4190326626be05534f33528375ba7d6a2ecc9d1d
diff --cc manifest
index fd6493ebbb,a99221ae19..ab6c779043
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,5 +1,5 @@@
- -----BEGIN PGP SIGNED MESSAGE-----
- Hash: SHA1
- 
- C Documentation\simprovements\sin\ssqlite.h.in.\s\sNo\schanges\sto\scode.
- D 2009-08-19T15:57:08
 -C Add\ssome\stests\sthat\suse\sthe\ssqlite_stat2\stable\sin\sshared-cache\smode.
 -D 2009-08-19T15:34:59
++C Merge\s29cafcfdcc\sand\sa6f39181a7.
++D 2009-08-19T16:21:25
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in 0f7761c5d1c62ae7a841e3393ffaff1fa0f5c00a
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -164,9 -161,9 +161,9 @@@ F src/resolve.c 4a61d03e49b15440878096e
  F src/rowset.c c64dafba1f9fd876836c8db8682966b9d197eb1f
  F src/select.c 67b0778c9585905c8aa75aaa469e76ef3c1d315a
  F src/shell.c db2643650b9268df89a4bedca3f1c6d9e786f1bb
 -F src/sqlite.h.in 393349b50ab4a22ed740a9f8cc4237d17e81e7b4
 +F src/sqlite.h.in 3ccf717d82101f19548d0b1243f0a6f4854d51ee
  F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17
- F src/sqliteInt.h d675e20da30db2c28e7166deb1fc758fb5b29a9a
+ F src/sqliteInt.h a9516142b907d890150847edbe3c9831acd9acb1
  F src/sqliteLimit.h ffe93f5a0c4e7bd13e70cd7bf84cfb5c3465f45d
  F src/status.c 237b193efae0cf6ac3f0817a208de6c6c6ef6d76
  F src/table.c cc86ad3d6ad54df7c63a3e807b5783c90411a08d
@@@ -749,14 -747,7 +747,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
- P 709e16145e37940cb243eede75071fb15095d960
- R 826b929a3a8cf85b7d98d0f8ef95004e
- U drh
- Z 34436c77187f1f7c6f3ba769592974b4
- -----BEGIN PGP SIGNATURE-----
- Version: GnuPG v1.4.6 (GNU/Linux)
- 
- iD8DBQFKjCDXoxKgR168RlERAgBaAJ44m8/HPKZAOF1i7vTi2B+cf3uYnwCgjZp4
- FFl5KHEGM2pvi2W+2/k0MT0=
- =XAeg
- -----END PGP SIGNATURE-----
 -P 6c8a0e2b37d9f4399ef90a44cbc492526201d0d5
 -R c19d3a3705481fd11857a3ead91ecc48
++P a6f39181a7b3083ae46cffd7aee7db895b4df8a4 29cafcfdccf4c0a27746b9a82fa4191605a4505a
++R b5880e12c2965a2d2acde35170c6f032
+ U dan
 -Z 1e078a1016374413dd52c84153eab75d
++Z 4c51918a8057669ddd4c52a9aadb5b1c
diff --cc manifest.uuid
index 91e6f8e036,6caeb30274..8a30bf9ec1
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a6f39181a7b3083ae46cffd7aee7db895b4df8a4
 -29cafcfdccf4c0a27746b9a82fa4191605a4505a
++740a93e89c5f12672d72de7b3c55807deac613d4