From: mistachkin <mistachkin@noemail.net>
Date: Mon, 7 May 2012 22:29:19 +0000 (+0000)
Subject: Merge parser adjustments from the trunk.
X-Git-Tag: version-3.7.13~11^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b60803f4b9ef30fd3a0d27c8285e3935f0c5ddbf;p=thirdparty%2Fsqlite.git

Merge parser adjustments from the trunk.

FossilOrigin-Name: 0d8b920b2c195f3735608e7a08f5d23724cdf806
---

b60803f4b9ef30fd3a0d27c8285e3935f0c5ddbf
diff --cc manifest
index 09a5f3495a,a098cfa41d..74be1eb244
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sWindows\sdirectory\schecking\schanges\sfrom\strunk.
- D 2012-05-07T20:28:19.785
 -C Adjust\sthe\sparser\sso\sthat\scertain\slegacy\sschema\sconstructs\s(that\sare\snot\nvalid\saccording\sto\sthe\ssyntax\sdiagram)\scontinue\sto\sbe\saccepted,\sso\sthat\nolder\sdatabases\sthat\shappen\sto\suse\sthose\sconstructs\sare\sstill\sreadable.\nThis\sfixes\san\sissue\sintroduced\sby\scheck-in\s[1b75f301affac6]
 -D 2012-05-07T19:21:36.465
++C Merge\sparser\sadjustments\sfrom\sthe\strunk.
++D 2012-05-07T22:29:19.267
  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 eb054bb40a5bf90d3422a01ed0e5df229461727a
+ F src/parse.y ad29af00e73d3afd84820f5738e072c506d8d77b
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
  F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c
  F src/pcache1.c b30b1c35908346ecc43d8d9d17f2ddf6817f8f60
@@@ -995,7 -995,7 +995,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P be4ab188cffbe97ae4f1f0520591bb7f0df185de a4555a53eab3f5d2f142c78a6b71189544e80ae6
- R d4541eb715733c4ea776ae24939baa95
 -P a4555a53eab3f5d2f142c78a6b71189544e80ae6
 -R b1ed928fe6d7cc7f56cb67cfef4cacc0
 -U drh
 -Z a9d5fb0a817384840c4a8fbe0a536a67
++P 7a7466f400e94d8c9e745efb2973300474a74d2a a1c014d8a87c8940b3a037d8d8cc4d5678809802
++R a126029cbfae96483a4a3fa9957d3824
 +U mistachkin
- Z 7ca602c491f736ecdcb3f782ba71db3e
++Z d637f78c0ac64fee5d74ee1a4bdcab4c
diff --cc manifest.uuid
index d7340ec524,f24cea68b2..4098cbfab1
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7a7466f400e94d8c9e745efb2973300474a74d2a
 -a1c014d8a87c8940b3a037d8d8cc4d5678809802
++0d8b920b2c195f3735608e7a08f5d23724cdf806