From: drh <drh@noemail.net>
Date: Thu, 10 May 2012 13:03:28 +0000 (+0000)
Subject: Merge the table constraint parser fixes from trunk.
X-Git-Tag: version-3.7.13~11^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=882f87d826c8ee73e05451c845b7f4abcac626ba;p=thirdparty%2Fsqlite.git

Merge the table constraint parser fixes from trunk.

FossilOrigin-Name: 12bb31dd6f0d8544406710d6f02f0b7c0fe6c537
---

882f87d826c8ee73e05451c845b7f4abcac626ba
diff --cc manifest
index 74be1eb244,aff02237ad..44371ce294
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sparser\sadjustments\sfrom\sthe\strunk.
- D 2012-05-07T22:29:19.267
 -C Further\schanges\sto\sconstraint\sparsing\sto\ssupport\slegacy\ssyntax.
 -D 2012-05-08T11:17:33.934
++C Merge\sthe\stable\sconstraint\sparser\sfixes\sfrom\strunk.
++D 2012-05-10T13:03:28.296
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -160,10 -160,10 +160,10 @@@ F src/os.h 38aabd5e3ecd4162332076f55bb0
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
  F src/os_unix.c 424d46e0edab969293c2223f09923b2178171f47
 -F src/os_win.c 412d6434133c7c81dc48b7702f3ea5e61c309e5c
 +F src/os_win.c ce348d158b43883c5b1495f68be3f654b7d0c503
  F src/pager.c bb5635dde0b152797836d1c72275284724bb563c
  F src/pager.h ef1eaf8593e78f73885c1dfac27ad83bee23bdc5
- F src/parse.y ad29af00e73d3afd84820f5738e072c506d8d77b
+ F src/parse.y de06f412a4b3a2978071215f657fd1cd70700444
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
  F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c
  F src/pcache1.c b30b1c35908346ecc43d8d9d17f2ddf6817f8f60
@@@ -995,7 -996,7 +996,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 7a7466f400e94d8c9e745efb2973300474a74d2a a1c014d8a87c8940b3a037d8d8cc4d5678809802
- R a126029cbfae96483a4a3fa9957d3824
- U mistachkin
- Z d637f78c0ac64fee5d74ee1a4bdcab4c
 -P a1c014d8a87c8940b3a037d8d8cc4d5678809802
 -R b6207703cdccfd3ac416f9da168138e7
++P 0d8b920b2c195f3735608e7a08f5d23724cdf806 38bf90af1ede6ee64ef7be66392e895e60c9126e
++R 81f25e7b03bf459323ea9dac500cee2e
+ U drh
 -Z c70e51594d9a44ff78a8a89d0fd856a7
++Z ac42bf5c0e1cb57eb129f61107981da1
diff --cc manifest.uuid
index 4098cbfab1,007ef38e63..181609fbfe
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0d8b920b2c195f3735608e7a08f5d23724cdf806
 -38bf90af1ede6ee64ef7be66392e895e60c9126e
++12bb31dd6f0d8544406710d6f02f0b7c0fe6c537