From: drh <drh@noemail.net>
Date: Thu, 10 May 2012 12:09:34 +0000 (+0000)
Subject: Merge in the legacy table constraint parsing fixes from trunk.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5fbe8d658f757c89e1387fe2adf535a8b04a797a;p=thirdparty%2Fsqlite.git

Merge in the legacy table constraint parsing fixes from trunk.

FossilOrigin-Name: e87702834ed50882fadb3dee66cafb7438f5e577
---

5fbe8d658f757c89e1387fe2adf535a8b04a797a
diff --cc manifest
index e47f4f26f5,aff02237ad..bb694bbab2
--- a/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Added\ssupport\sfor\sSQLITE_ENABLE_PERSIST_WAL\scompile\stime\smacro,\sretrieving\slastErrno\sfrom\sWAL\sfile\sand\ssetting\slast\serrno\swhen\swrites\sfail\sdue\sto\sspace\sconstraints
- D 2012-05-09T22:36:25.742
 -C Further\schanges\sto\sconstraint\sparsing\sto\ssupport\slegacy\ssyntax.
 -D 2012-05-08T11:17:33.934
++C Merge\sin\sthe\slegacy\stable\sconstraint\sparsing\sfixes\sfrom\strunk.
++D 2012-05-10T12:09:34.455
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
 +F Makefile.in 957c9693400fca6cb8b533b589e69ddee7bcb27c
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc 7849a871b6cdb20fd51baee6bbe5965a03326be4
  F Makefile.vxworks 3b7fe7a0571fdadc61363ebc1b23732d2d6363ca
@@@ -162,11 -159,11 +162,11 @@@ F src/os.c 4c8c8d72a6c58ad2fde4865783e8
  F src/os.h 59beba555b65a450bd1d804220532971d4299f60
  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/pager.c bb5635dde0b152797836d1c72275284724bb563c
 -F src/pager.h ef1eaf8593e78f73885c1dfac27ad83bee23bdc5
 +F src/os_unix.c f8c943a0f9c4e2e7fae9facb3a243cb58cc8ceb5
- F src/os_win.c 12e76b4aa5426022939f92e894a5c20dd40be7f4
++F src/os_win.c 24b57b4aec07ec78ae759244ab6d9759a70fe29b
 +F src/pager.c c296b3035a5a45d138e7370a3292ba07617adbf9
 +F src/pager.h 42926ac0fe69e9d7e17a54e6b37417e581a429d7
- F src/parse.y eb054bb40a5bf90d3422a01ed0e5df229461727a
+ F src/parse.y de06f412a4b3a2978071215f657fd1cd70700444
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
  F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c
  F src/pcache1.c b30b1c35908346ecc43d8d9d17f2ddf6817f8f60
@@@ -176,12 -173,11 +176,12 @@@ F src/printf.c 7ffb4ebb8b341f67e049695b
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 748e75299faff345f34f0e5bd02a2bac8aa69fcd
  F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
 -F src/select.c d7b9018b7dd2e821183d69477ab55c39b8272335
 +F src/select.c cf2f8f771bab6417e51a0f17b086a87bb74d624c
  F src/shell.c 04399b2f9942bd02ed5ffee3b84bcdb39c52a1e6
- F src/sqlite.h.in c8d096addc2814b900ee2e2b3b1f22ba56502d5f
 -F src/sqlite.h.in b8c6d77179cee6e4b8d6eb9f3c2917626d58acd3
++F src/sqlite.h.in b20e122611fc5a3113e298d38feabcb5796479a0
 +F src/sqlite3_private.h 97a1e15b3a078bb583622da01a2e9bc96c6edf14
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
 -F src/sqliteInt.h c5e917c4f1453f3972b1fd0c81105dfe4f09cc32
 +F src/sqliteInt.h ec90f0d797bbc93dd849629f18513b57bfd9a787
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -1000,7 -996,7 +1001,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 2a99c0074aaabb4916d82464427be079d44d65e6
- R f9d69863cbb167dfcb5b19e9da7a6e71
- U adam
- Z 11d754e5694ab5d4ff0658638a828bc2
 -P a1c014d8a87c8940b3a037d8d8cc4d5678809802
 -R b6207703cdccfd3ac416f9da168138e7
++P 654792941011c96db879f6b779e99b1c65c587af 38bf90af1ede6ee64ef7be66392e895e60c9126e
++R 534451f0241ae0938558ac8c70cc8e52
+ U drh
 -Z c70e51594d9a44ff78a8a89d0fd856a7
++Z 6974b18838cd42ad04a4c660e23059ae
diff --cc manifest.uuid
index 5d51223e6c,007ef38e63..d70503a8bf
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 654792941011c96db879f6b779e99b1c65c587af
 -38bf90af1ede6ee64ef7be66392e895e60c9126e
++e87702834ed50882fadb3dee66cafb7438f5e577