From: drh <drh@noemail.net>
Date: Mon, 7 Sep 2015 20:22:22 +0000 (+0000)
Subject: Merge parser enhancements and other improvements and bug fixes from trunk.
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=9a5a469c7adb13aeefd070e55df3313a260ef80e;p=thirdparty%2Fsqlite.git

Merge parser enhancements and other improvements and bug fixes from trunk.

FossilOrigin-Name: 9cf3e51bcce1268dbb22cc8fa77160db3cb72746
---

9a5a469c7adb13aeefd070e55df3313a260ef80e
diff --cc manifest
index 87bca7f67e,8495e41bfe..41f481d4e4
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\schanges,\sand\sespecially\sthe\sfix\sfor\sallowing\nstrings\sas\sidentifiers\sin\sCREATE\sINDEX\sstatements.
- D 2015-09-04T17:22:03.833
 -C Enhance\sthe\sLemon\sparser\sgenerator\sto\sadd\sSHIFTREDUCE\sstates\sthat\sreduce\sthe\nsizes\sof\ssome\sof\sthe\sparser\stables.
 -D 2015-09-07T20:11:30.937
++C Merge\sparser\senhancements\sand\sother\simprovements\sand\sbug\sfixes\sfrom\strunk.
++D 2015-09-07T20:22:22.153
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -281,10 -281,10 +281,10 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 4d9134dc988a87838c06056c89c0e8c4700a0452
  F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
 -F src/btree.c 4084d9eed2817331f6e6a82230ba30e448cad497
 -F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
 -F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
 -F src/build.c 5566b3410080a54e5c302c55d3de53fd080cfc7d
 +F src/btree.c 7663d05467277379fd29ae44eb82bcbdee7f618f
 +F src/btree.h 00d4cdb747c4172a5566faf037116985dbbc377e
 +F src/btreeInt.h df0e92901c6fbb01aa8fab3cfbcdaaba2654fd04
- F src/build.c 1f4fc82459d47ffb5a8ee3823fd648059b6508be
++F src/build.c 0620be86a9ad5acbeb3b3d757c06559d4fd26c27
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
@@@ -344,7 -344,7 +344,7 @@@ F src/shell.c 6332ef06db1390ef812cfdff1
  F src/sqlite.h.in 378bebc8fe6a88bade25e5f23b7e6123fdc64b00
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h f700e6a9dd1fdcccc9951ab022b366fb66b9e413
- F src/sqliteInt.h 8657f11e821b15500810020f529f452113fe6532
 -F src/sqliteInt.h dba8add0b95fcea1047af7a6875a1e305fcb96d7
++F src/sqliteInt.h 56a362369786fd1b49dbf6d49b6d7f8167af540d
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -395,31 -395,31 +395,31 @@@ F src/test_vfs.c 3b65d42e18b262805716bd
  F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 6bbcc9fe50c917864d48287b4792d46d6e873481
- F src/tokenize.c 57cb3720f53f84d811def2069c2b169b6be539a5
- F src/treeview.c 46036cbbceada0836833531b2d963edbca3d9cfa
+ F src/tokenize.c 83c6ed569423a3af83a83973b444cf7123be33a6
+ F src/treeview.c 154f0acc622fa3514de8777dcedf4c8a8802b4ce
  F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f
- F src/update.c 795fba8ebadeb194285b0a73a07f7ad5ae4d0410
+ F src/update.c 3c5bc9570df3bfafa0db36828406a8a14e4c426e
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c fc612367108b74573c5fd13a85d0a23027f438bd
 -F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 -F src/vdbe.c 6d85be995bd2308a5aa2a68c7b564c5d4cc1a6fb
 +F src/vacuum.c 983cc3754718ef169a6ea9aef86798bd28106f21
 +F src/vdbe.c 8e1d159743af4b17fce88037a46d68b280aaa729
  F src/vdbe.h 4bc88bd0e06f8046ee6ab7487c0015e85ad949ad
  F src/vdbeInt.h 8b54e01ad0463590e7cffabce0bc36da9ee4f816
  F src/vdbeapi.c bda74ef4b5103d7b4a4be36f936d3cf2b56a7d6f
 -F src/vdbeaux.c fd00b489ab3f44f2dca1e4344faf289b7bfcf649
 +F src/vdbeaux.c 4988b83d1e1989ee554b2fa4ca18f3606a78437c
- F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
- F src/vdbemem.c ae38a0d35ae71cf604381a887c170466ba518090
+ F src/vdbeblob.c 1d7b97115e7bbac4c318db416d2ca83fc779544a
+ F src/vdbemem.c 19b3036aa4d676e7103b0fb5efd6327da455f915
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c 2ecfe020c10e0a0c7b078203fdba2fae844744bc
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
 -F src/wal.c 8cd07f1f99e1a81346db1c9da879bef6c6f97cf6
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 +F src/wal.c 5a86298540935981eea840050f66e516dbe536af
 +F src/wal.h 361b16891d2772294b138054c84f5a3bad6e9d05
  F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
- F src/where.c f0e08e4f1f66ba1a0f5b70c5161cb031ce1fb858
- F src/whereInt.h 901c17c1e3c82745ad9b85b4471543fa59c980e9
- F src/wherecode.c c0d9b1c7c7c827998016809851d2ddc529de0fee
- F src/whereexpr.c 1a308d1ee5144890d21ea9cf70d49bc96a83432b
+ F src/where.c ed1cd1cb0434bca9f4a5379582c637bf393b34ac
+ F src/whereInt.h 292d3ac90da4eab1e03ac8452f1add746bcafaa1
+ F src/wherecode.c 6ac8599523f4840d9efac335329f627ebf3f79fd
+ F src/whereexpr.c 2473e4350e30f9b55d1c6a8f66ca23c689f23f1d
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1385,7 -1383,8 +1386,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P c0bf92eca4d3d4666e8a0476ef30fa8123de1cb0 3d3df79bfaf9dbc7aa711c08a19d2f6dbe744b32
- R ee966f158d53b77675f43896974b25d9
 -P b6ffb7e471e51ff69668154ad2c8790e466c9d37 e9d604b4306a86faae315ac3cba59bf07d1b665c
 -R c7dbe034ff98374fe795187c44f7caee
 -T +closed e9d604b4306a86faae315ac3cba59bf07d1b665c
++P a9b84885aa572b7f92e5aafa246af328d13e3e6e 99b992fa840707711d99f8d05b62412f7008cd93
++R 1f63598c79312b65d8d15c45f84006b8
  U drh
- Z b1cc08beaad97d2b36ffef8ab5faa1b6
 -Z 0877e196b03066e842bcbf4d8e5b634a
++Z f300497e9766a2b3b13269e90f17caa1
diff --cc manifest.uuid
index 384767e1e3,299179057e..aa27636526
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a9b84885aa572b7f92e5aafa246af328d13e3e6e
 -99b992fa840707711d99f8d05b62412f7008cd93
++9cf3e51bcce1268dbb22cc8fa77160db3cb72746