Merge the latest trunk changes, and especially the fix for allowing

strings as identifiers in CREATE INDEX statements.

FossilOrigin-Name: a9b84885aa572b7f92e5aafa246af328d13e3e6e

diff --cc manifest
index d8ae9b24e46bf46ceaf4efd3b344bf32d409134a,ccdfa438a518504d814d0b2e9f09b87fe2e64255..87bca7f67e0e8532ab8c92a0ff695f92e50ea9c0
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Remove\sthe\sEXCLUSIVE\sand\sCONCURRENT\stokens\sfrom\sthe\stokenizer.\s\sLet\sthe\nBEGIN\sstatement\sbe\sfollowed\sby\san\sID,\sbut\sthrow\sa\ssyntax\serror\sif\sthe\sID\nis\sanything\sother\sthan\sEXCLUSIVE\sor\sCONCURRENT.
- D 2015-09-04T16:39:16.988
 -C Continue\sto\ssupport\sthe\s(broken)\slegacy\ssyntax\sof\sallowing\sstrings\sfor\ncolumn\snames\sin\sCREATE\sINDEX\sstatements\sand\sin\sUNIQUE\sand\sPRIMARY\sKEY\nconstraints.
 -D 2015-09-04T12:54:01.394
++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
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -279,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 3f6176b3af04b85715559d435097c556ba473801
 +F src/btree.c 7663d05467277379fd29ae44eb82bcbdee7f618f
 +F src/btree.h 00d4cdb747c4172a5566faf037116985dbbc377e
 +F src/btreeInt.h df0e92901c6fbb01aa8fab3cfbcdaaba2654fd04
- F src/build.c 565d84cf1d80e054e15907641985584bbd5eadf6
++F src/build.c 1f4fc82459d47ffb5a8ee3823fd648059b6508be
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
@@@ -324,12 -326,12 +326,12 @@@ F src/os_setup.h c9d4553b5aaa6f73391448
  F src/os_unix.c 76f493ed71c4154338049dee1bf6e47f69c74a55
  F src/os_win.c 40b3af7a47eb1107d0d69e592bec345a3b7b798a
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c 4784012f80b2197c61ff6eaf4f5c7026d93253fd
 -F src/pager.h 6d435f563b3f7fcae4b84433b76a6ac2730036e2
 -F src/parse.y f599aa5e871a493330d567ced93de696f61f48f7
 +F src/pager.c 06e10a0b736ba22df52e0f56fa67a42de41a0445
 +F src/pager.h 244606cccd4293a2bc4be20bb37bf730028c5c18
 +F src/parse.y 0dcce0ae4e106cdaad4053f73b3bc2dedca9c6d6
  F src/pcache.c 24be750c79272e0ca7b6e007bc94999700f3e5ef
  F src/pcache.h 9968603796240cdf83da7e7bef76edf90619cea9
- F src/pcache1.c e1529369c047ac645e6a28196f25b7e936c46b82
+ F src/pcache1.c bf2afe64a3dedb8643c8dcbd94a145cc80ab2a67
  F src/pragma.c d71b813e67bf03f3116b9dd5164fbfd81ec673a2
  F src/pragma.h 631a91c8b0e6ca8f051a1d8a4a0da4150e04620a
  F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
@@@ -1383,7 -1382,7 +1385,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 c490bfb150c66763226a35e30ba289abbf29906d
- R 1a77cff5bf225c8f1af4050df926d2bd
 -P d648ddd93de039820f5abe064c7bc1318cd9d6b1
 -R d6ad877a8d4dd88a7ffbb10ce1648f9a
++P c0bf92eca4d3d4666e8a0476ef30fa8123de1cb0 3d3df79bfaf9dbc7aa711c08a19d2f6dbe744b32
++R ee966f158d53b77675f43896974b25d9
  U drh
- Z 4bd187d1d0f74fd2a4074d09ae209a9a
 -Z fa2f98c7a26d464055290dbf8522fd2e
++Z b1cc08beaad97d2b36ffef8ab5faa1b6

diff --cc manifest.uuid
index 9cb3d0d03ef91c6a63d892638557f909a6d3eb76,fac9e6626880451575887443a005b6504ab309a9..384767e1e3c252fa292b3b8d36cc480f6c3358fc
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c0bf92eca4d3d4666e8a0476ef30fa8123de1cb0
 -3d3df79bfaf9dbc7aa711c08a19d2f6dbe744b32
++a9b84885aa572b7f92e5aafa246af328d13e3e6e

diff --cc src/build.c
Simple merge