From: drh <drh@noemail.net>
Date: Fri, 23 Sep 2011 14:40:31 +0000 (+0000)
Subject: Merge the latest trunk changes into the stat3-trunk branch.
X-Git-Tag: version-3.7.9~67^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=790a55171e3d8fc81f9e2312de0f03d84259f8df;p=thirdparty%2Fsqlite.git

Merge the latest trunk changes into the stat3-trunk branch.

FossilOrigin-Name: 0beb88a92c8f75231df120bef54616c7e4bb68c8
---

790a55171e3d8fc81f9e2312de0f03d84259f8df
diff --cc manifest
index 343598e9a7,ec8da322ff..b1f37ef3ee
--- a/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Testability\senhancements.
- D 2011-09-23T13:59:33.693
 -C Remove\sa\sredundant\s(and\sundefined)\s"forcedelete"\scommand\sfrom\scorruptE.test.
 -D 2011-09-22T15:31:30.163
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sstat3-trunk\sbranch.
++D 2011-09-23T14:40:31.864
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in d314143fa6be24828021d3f583ad37d9afdce505
+ F Makefile.in 8de00a4e52f308ef6d564834c0973e53646e0d4c
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc b5e917439d5ed42364173d1648aae1d418e323ea
+ F Makefile.msc 6676bcfe711f621a0b1916ecfa5d0927f8084517
  F Makefile.vxworks 1deb39c8bb047296c30161ffa10c1b5423e632f9
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
- F VERSION f724de7326e87b7f3b0a55f16ef4b4d993680d54
+ F VERSION bb37c274b503bbe73f00ea4f374eb817cba4b171
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/2005osaward.gif 0d1851b2a7c1c9d0ccce545f3e14bca42d7fd248
@@@ -127,10 -127,10 +127,10 @@@ F src/btmutex.c 976f45a12e37293e32cae02
  F src/btree.c 77b09c69d4849a90361e6fe5db36d167f20600c0
  F src/btree.h f5d775cd6cfc7ac32a2535b70e8d2af48ef5f2ce
  F src/btreeInt.h 67978c014fa4f7cc874032dd3aacadd8db656bc3
 -F src/build.c 851e81f26a75abbb98bd99a7c5f10e8670d867bb
 +F src/build.c 2dc09385981bf7f41eae7d3aeb47cb2453813456
  F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
- F src/ctime.c dde6a9b835b9e8cc067b713de1a7f6a0c9ff807e
 -F src/ctime.c 3f2715d38635b8e86d344b36a6f7f3e446fa5ec3
++F src/ctime.c 829f3261d3db48e3d87891bc887208734734c2e4
  F src/date.c a3c6842bad7ae632281811de112a8ba63ff08ab3
  F src/delete.c ff68e5ef23aee08c0ff528f699a19397ed8bbed8
  F src/expr.c f4dcaeb8252c4b16fcdc245660f70ed366bc6cdd
@@@ -181,13 -181,13 +181,13 @@@ F src/resolve.c 36368f44569208fa074e61f
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c d9b7d20b0365f80761846f00ef3638d4b33eeaf2
  F src/shell.c 13fe2aeddc3cc90d6a273831d1f63736d1596f81
- F src/sqlite.h.in 3f531daa04457e83bc13765c98c06c7d71c27fa5
 -F src/sqlite.h.in c0ebc53056fd99590dec4cb4bd60a0787098ff18
++F src/sqlite.h.in 3b238342522bfc3b9d68d7ff3240a27a2a59ee59
  F src/sqlite3ext.h 1a1a4f784aa9c3b00edd287940197de52487cd93
 -F src/sqliteInt.h 76d81cd9da0618b231398bfcf90556e971972fca
 +F src/sqliteInt.h 28cca77ebdaf6025ae5df52717dff429c7c6d4ef
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
- F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
+ F src/status.c 4568e72dfd36b6a5911f93457364deb072e0b03a
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c 3ef1dda2f1dc207c792eaadebf9d8adc44648581
+ F src/tclsqlite.c 20578e66dda94b4d4db3d4478644a4dd9c6084a6
  F src/test1.c 0f41b7c67719207a5de24b009e172c4dcf189827
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 124ff9735fb6bb7d41de180d6bac90e7b1509432
@@@ -201,7 -201,7 +201,7 @@@ F src/test_async.c 0612a752896fad42d55c
  F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e
  F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de
  F src/test_btree.c 47cd771250f09cdc6e12dda5bc71bc0b3abc96e2
- F src/test_config.c afc0bbf8fe048d79ae03469542e826c76a2175e5
 -F src/test_config.c 9bc44df77f22cd0648c651fcd459353b8a984d7b
++F src/test_config.c 6b1b69da02eb9a19330d8c2c33403c6eafbc3416
  F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_func.c cbdec5cededa0761daedde5baf06004a9bf416b5
@@@ -359,9 -358,10 +359,10 @@@ F test/crash8.test 38767cb504bbe491de6b
  F test/crashtest1.c 09c1c7d728ccf4feb9e481671e29dda5669bbcc2
  F test/createtab.test b5de160630b209c4b8925bdcbbaf48cc90b67fe8
  F test/cse.test 277350a26264495e86b1785f34d2d0c8600e021c
- F test/ctime.test 7f0bd5084d9dd7da9ad46901810896edd2ebb463
+ F test/ctime.test 7bd009071e242aac4f18521581536b652b789a47
  F test/date.test a18a2ce81add84b17b06559e82ad7bb91bc6ddff
 -F test/dbstatus.test a719af0f226bd280748a4bb9054c0a5a9fc1b16c
 +F test/dbstatus.test 9eb484ba837c6f3f9bbcaecc29e6060a8c3ba6d2
+ F test/dbstatus2.test dc57b0d9610851c0ff58a8e1b5b191678398b72a
  F test/default.test 6faf23ccb300114924353007795aa9a8ec0aa9dc
  F test/delete.test a065b05d2ebf60fd16639c579a4adfb7c381c701
  F test/delete2.test 3a03f2cca1f9a67ec469915cb8babd6485db43fa
@@@ -964,8 -963,8 +965,8 @@@ F tool/split-sqlite3c.tcl d9be87f1c3402
  F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
  F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 -F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2
 -P 4eb4689834b538b9eeec5a5803528260e1aff78d
 -R 262c3aeccd7c893526a314d03fa12d82
 -U dan
 -Z b984e82b28ae9a7089c19360a2ce9099
 +F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 74e27fad339a2d7899c1f42805e615128929f07a
- R 2a02eac3daaa0669ad4c98fbdd4d2386
++P be44928cf2a3c063c8228b769d90947acbfad1ef 6d8d4e1694694c3e961fc1922f732d1da40caa6f
++R d77ad79f371c48e48b75d0b9ae4d6798
 +U drh
- Z 0b4e185fe7f24f4f88a2a412ad76b268
++Z 325ba8d2018722c1460e52f95a5b9a1a
diff --cc manifest.uuid
index 1d09d551ec,614e1201f0..d8ac7f71ab
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- be44928cf2a3c063c8228b769d90947acbfad1ef
 -6d8d4e1694694c3e961fc1922f732d1da40caa6f
++0beb88a92c8f75231df120bef54616c7e4bb68c8