From: drh <drh@noemail.net>
Date: Thu, 10 May 2012 12:17:18 +0000 (+0000)
Subject: Merge in the windows AV-defense enhancements for open() and the table
X-Git-Tag: version-3.13.0~148^2~238
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=caee673b0d506d1e5d77a68692b67392323dbb1a;p=thirdparty%2Fsqlite.git

Merge in the windows AV-defense enhancements for open() and the table
constraint parser fixes for legacy schemas, all from trunk.

FossilOrigin-Name: 323570b8bd52c7e1b0c8c7a0e4f57f6fdebead11
---

caee673b0d506d1e5d77a68692b67392323dbb1a
diff --cc manifest
index aafc8db59d,aff02237ad..244bbf8c03
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Update\sthe\ssessions\sbranch\swith\sall\sthe\slatest\schanges\sfrom\strunk.
- D 2012-05-04T23:31:14.883
 -C Further\schanges\sto\sconstraint\sparsing\sto\ssupport\slegacy\ssyntax.
 -D 2012-05-08T11:17:33.934
++C Merge\sin\sthe\swindows\sAV-defense\senhancements\sfor\sopen()\sand\sthe\stable\nconstraint\sparser\sfixes\sfor\slegacy\sschemas,\sall\sfrom\strunk.
++D 2012-05-10T12:17:18.151
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -187,9 -175,9 +187,9 @@@ F src/resolve.c 748e75299faff345f34f0e5
  F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
  F src/select.c d7b9018b7dd2e821183d69477ab55c39b8272335
  F src/shell.c 04399b2f9942bd02ed5ffee3b84bcdb39c52a1e6
- F src/sqlite.h.in ad55acc42422c461719f3adaee434836ab00677b
 -F src/sqlite.h.in b8c6d77179cee6e4b8d6eb9f3c2917626d58acd3
++F src/sqlite.h.in 786cc6ee67ac7e19bfcbba5b840fffae449efe02
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
 -F src/sqliteInt.h c5e917c4f1453f3972b1fd0c81105dfe4f09cc32
 +F src/sqliteInt.h 572c5e6aca50256bdbc34919ece5f660dabf25cc
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -1008,7 -996,7 +1009,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 2b7a91e61794ce9ffe210bad584454e52c79924e bfa61e781cb442be641486e7e55a1518e888d830
- R bed2e7cce64395c916783d9e3080c791
 -P a1c014d8a87c8940b3a037d8d8cc4d5678809802
 -R b6207703cdccfd3ac416f9da168138e7
++P 0f347fbfc7d8821f56f1ae0d1a9472a375631e65 38bf90af1ede6ee64ef7be66392e895e60c9126e
++R 21dedc1a34649558aea7c289d84ec993
  U drh
- Z 95959a45df2928e15269c2ba6866d087
 -Z c70e51594d9a44ff78a8a89d0fd856a7
++Z bf3857ddf912fd88e60d600cf99c392f
diff --cc manifest.uuid
index 80a7fa99b7,007ef38e63..594a95aba4
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0f347fbfc7d8821f56f1ae0d1a9472a375631e65
 -38bf90af1ede6ee64ef7be66392e895e60c9126e
++323570b8bd52c7e1b0c8c7a0e4f57f6fdebead11