From: dan <dan@noemail.net>
Date: Wed, 19 Aug 2009 14:42:25 +0000 (+0000)
Subject: Merge with 709e16145e.
X-Git-Tag: fts3-refactor~249^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9267f8579055dbad7e3cf471d01ef71ee6915453;p=thirdparty%2Fsqlite.git

Merge with 709e16145e.

FossilOrigin-Name: 6c8a0e2b37d9f4399ef90a44cbc492526201d0d5
---

9267f8579055dbad7e3cf471d01ef71ee6915453
diff --cc manifest
index dbfa3aaf14,549bc68b6a..bd3a5527ab
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Clean\sup\ssqlite_stat2\srelated\scode.\sAdd\stest\scases.
- D 2009-08-19T14:34:55
 -C Adjust\ssync\scount\sfor\sSQLITE_DISABLE_DIRSYNC\scompiler\soption.
 -D 2009-08-19T04:24:48
++C Merge\swith\s709e16145e.
++D 2009-08-19T14:42:25
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in 0f7761c5d1c62ae7a841e3393ffaff1fa0f5c00a
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -84,9 -84,9 +84,9 @@@ F ext/rtree/rtree_perf.tcl 0fabb6d5c48c
  F ext/rtree/rtree_util.tcl ee0a0311eb12175319d78bfb37302320496cee6e
  F ext/rtree/tkt3363.test 6662237ea75bb431cd5d262dfc9535e1023315fc
  F ext/rtree/viewrtree.tcl 09526398dae87a5a87c5aac2b3854dbaf8376869
 -F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 +F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
- F main.mk 6272ba6c273b6390602b276dd2b1e4fe71d1049a
+ F main.mk 3ae48161d5a76def45cd8fa253b28295f239dd69
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -114,10 -114,10 +114,10 @@@ F src/callback.c cb68b21b0d4ae7d11ae0e4
  F src/complete.c 5ad5c6cd4548211867c204c41a126d73a9fbcea0
  F src/date.c ab5f7137656652a48434d64f96bdcdc823bb23b3
  F src/delete.c dcf07632d8ca3d4086df8b65ea907a47278e6382
- F src/expr.c ea04de0bf495eb899ba0c8c7af6561afb1dfac2d
 -F src/expr.c 73b678023236b8c10078a0291b43ee642bc2c729
++F src/expr.c 1dac211523b00d504c35e72b6d28d97621895420
  F src/fault.c dc88c821842157460750d2d61a8a8b4197d047ff
  F src/func.c e536218d193b8d326aab91120bc4c6f28aa2b606
- F src/global.c 448419c44ce0701104c2121b0e06919b44514c0c
+ F src/global.c 271952d199a8cc59d4ce840b3bbbfd2f30c8ba32
  F src/hash.c ebcaa921ffd9d86f7ea5ae16a0a29d1c871130a7
  F src/hash.h 35b216c13343d0b4f87d9f21969ac55ad72174e1
  F src/hwtime.h 4a1d45f4cae1f402ea19686acf24acf4f0cb53cb
@@@ -161,14 -161,14 +161,14 @@@ 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 a6850e9034df1336e8139c4d6964d7d2f0f52337
+ F src/sqlite.h.in 393349b50ab4a22ed740a9f8cc4237d17e81e7b4
  F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17
- F src/sqliteInt.h 6bf0a232dc66ef02c4f1bedacc63322282081757
 -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
- F src/tclsqlite.c e18e5013dc6bca9f25e6022fbe17ba3ccb821f95
+ F src/tclsqlite.c 5eea5025c370d3a91ce0415f9d46f96fdc7aef44
 -F src/test1.c 0e882812c94cf35fce30fc25fbf952a33a86d70b
 +F src/test1.c eacb3456a9419191f42a0f601e12ca8a424a6de1
  F src/test2.c 0de743ec8890ca4f09e0bce5d6d5a681f5957fec
  F src/test3.c 2445c2beb5e7a0c91fd8136dc1339ec369a24898
  F src/test4.c f79ab52d27ff49b784b631a42e2ccd52cfd5c84c
@@@ -744,7 -746,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 67207a15bd7302ffeb2f342532b57b4852838d83
- R fc67b3175e5d16a0dc57c70ae312c646
 -P 093917d7fda442012dfd1a1b2f20f85d2eefa093
 -R bd2ad6ef6f8298aaa392cef396e66c78
 -U shane
 -Z 8a5e7a3b12f153b47f147ba40f17579d
++P aa728e06ce456fa42e68687bff6c7424460c31ef 709e16145e37940cb243eede75071fb15095d960
++R f834f9dc41038ed48095999e07ccab3c
 +U dan
- Z b80db5caa38d8f59e436115740e81d97
++Z 2159618824032fadaab0aea7ee6653b7
diff --cc manifest.uuid
index 9b8e4fba22,c1a81268d2..911b713a17
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- aa728e06ce456fa42e68687bff6c7424460c31ef
 -709e16145e37940cb243eede75071fb15095d960
++6c8a0e2b37d9f4399ef90a44cbc492526201d0d5