From: drh <drh@noemail.net>
Date: Thu, 23 Jun 2011 17:42:45 +0000 (+0000)
Subject: Pull the last-minute fixes for 3.7.7 into the apple-osx branch.
X-Git-Tag: mountain-lion~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b2327c5098928a915018c68d0b838b1fdd5e432;p=thirdparty%2Fsqlite.git

Pull the last-minute fixes for 3.7.7 into the apple-osx branch.

FossilOrigin-Name: 2d4458af59c697ad453996815d14442230654670
---

1b2327c5098928a915018c68d0b838b1fdd5e432
diff --cc manifest
index 63ace2d527,5971790c88..99539b6a6c
--- a/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Pull\sthe\slatest\schanges\sfrom\strunk\sinto\sthe\sapple-osx\sbranch.
- D 2011-06-23T02:30:36.446
 -C Add\sa\sbit\sto\sthe\sSQLITE_TESTCTRL_OPTIMIZATIONS\ssetting\sthat\swill\sdisable\naffinity\swhen\swriting\sto\sany\sindex,\sregardless\sof\swhether\sor\snot\sthe\sindex\nis\son\sa\smanifestation\sof\sa\sview.\s\sThis\sallows\sbetter\stesting\sof\sthe\sfix\nfor\sticket\s[91e2e8ba6ff2e2].
 -D 2011-06-23T17:29:33.244
++C Pull\sthe\slast-minute\sfixes\sfor\s3.7.7\sinto\sthe\sapple-osx\sbranch.
++D 2011-06-23T17:42:45.824
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
 +F Makefile.in 8410b02448997eb43bdf0ffa482c9bc2d2624e45
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc 11082f65b452b908d93013292c17850378c39284
  F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
@@@ -185,14 -182,13 +185,14 @@@ F src/rowset.c 69afa95a97c524ba6faf3805
  F src/select.c d9d440809025a58547e39f4f268c2a296bfb56ff
  F src/shell.c 0e0173b3e79d956368013e759f084caa7995ecb1
  F src/sqlite.h.in 4b7255c10d39c5faf089dbd29cde7c367ff39f1f
 +F src/sqlite3_private.h 2a814d17913732831acf13e7e87860105a3416e4
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
- F src/sqliteInt.h a9248d3b0d2b1cf428d8642320fb13044a8888e0
+ F src/sqliteInt.h 7b72f7c6929757c0678d94524dbc7e7e3d6dc398
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
  F src/tclsqlite.c 5db825be61708b1a2b3f8f6e185e9b753829acef
- F src/test1.c 81c73914d9d2d1fd73bf34cfef0dd3d3f1d4cb38
 -F src/test1.c 8eef932f1024f1076a8adb8a6f5d9c5267c9e969
++F src/test1.c 07463c4177b450dd4d9e2425c58ea8cc34502247
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 124ff9735fb6bb7d41de180d6bac90e7b1509432
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
@@@ -953,7 -949,7 +954,7 @@@ F tool/symbols.sh bc2a3709940d47c8ac8e0
  F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d
- P fb7ad09dec805ccb709b138509d6e1eb77323c2f 8dca748b23fa6f9abf47a186dcd1766f4dcf3ab7
- R 9a5aa13fe4b32880371984e2fbe95a7d
 -P c271f7e88fc081a460dd3f4afb24aa9fb7fa2917
 -R 5805b6f3882ce897a61c4ce87076bc70
++P b5acda0445db39d58229d65a361d539db30f3833 b61a76a53af04f731fe7617f7b6b4fb2aef6587b
++R c25239c8ec2046d490b64494ae9d6208
  U drh
- Z 69d0b611617bf66f9b720723d912b28c
 -Z 83d974f3e6b84b4810ac6511db96428d
++Z bf5f3fb5150b87e28dd1ca0cfe21c8ad
diff --cc manifest.uuid
index 04285f7349,b421fc183b..f2650fe019
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b5acda0445db39d58229d65a361d539db30f3833
 -b61a76a53af04f731fe7617f7b6b4fb2aef6587b
++2d4458af59c697ad453996815d14442230654670