From: dan <dan@noemail.net>
Date: Wed, 16 Mar 2016 20:53:33 +0000 (+0000)
Subject: Merge the changes on the reusable-pragma branch into this one.
X-Git-Tag: version-3.12.0~28^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db8d320d63385542d22617801a0328a184fca3f5;p=thirdparty%2Fsqlite.git

Merge the changes on the reusable-pragma branch into this one.

FossilOrigin-Name: 6c4a17b963916d19c9433d7a251338042f32e9fa
---

db8d320d63385542d22617801a0328a184fca3f5
diff --cc manifest
index 7c682009be,2fb10eeede..4ea9b53d9e
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Have\sfts5\scache\sthe\sdecoded\sstructure\sof\sfts5\sindexes\sin\smemory.\sUse\s"PRAGMA\sdata_version"\sto\sdetect\sstale\scaches.
- D 2016-03-16T19:48:10.873
 -C Some\spragmas\scan\sbe\sreused\swithout\san\sautomatic\sreprepare.
 -D 2016-03-16T20:44:45.683
++C Merge\sthe\schanges\son\sthe\sreusable-pragma\sbranch\sinto\sthis\sone.
++D 2016-03-16T20:53:33.830
  F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@@@ -102,11 -102,11 +102,11 @@@ F ext/fts5/fts5Int.h 4e507abebae0d7d3ac
  F ext/fts5/fts5_aux.c daa57fb45216491814520bbb587e97bf81ced458
  F ext/fts5/fts5_buffer.c 4c1502d4c956cd092c89ce4480867f9d8bf325cd
  F ext/fts5/fts5_config.c 5af9c360e99669d29f06492c370892394aba0857
- F ext/fts5/fts5_expr.c be309fb227003c931107bfcc12d5be4f2fd2bb8c
+ F ext/fts5/fts5_expr.c 35e9d92c89e7c7ea0759b73d24da1ecb7630a24b
  F ext/fts5/fts5_hash.c f3a7217c86eb8f272871be5f6aa1b6798960a337
 -F ext/fts5/fts5_index.c d4f0c12e4f04bbc3a06b6da052039f2ce3e45438
 -F ext/fts5/fts5_main.c b8501e1a6a11591c53b18ce7aea7e5386cfb0421
 -F ext/fts5/fts5_storage.c f8343db90d8c95a4d4b52f6676e354b4649ffd6e
 +F ext/fts5/fts5_index.c 317040cb17cdad05e973376b39239b29c75f90b5
 +F ext/fts5/fts5_main.c b4a0fc5bf17f2f1f056ee76cdd7d2af08b360f55
 +F ext/fts5/fts5_storage.c a3361410422e69639ca2bcd5a56a0933dadf84d2
  F ext/fts5/fts5_tcl.c f8731e0508299bd43f1a2eff7dbeaac870768966
  F ext/fts5/fts5_test_mi.c 783b86697ebf773c18fc109992426c0173a055bc
  F ext/fts5/fts5_test_tok.c db08af63673c3a7d39f053b36fd6e065017706be
@@@ -1456,10 -1456,10 +1456,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 45f7f0c80bd91a0c7ff859c27fd9e82e551bd83e
- R 7875ababc9def91b1b2c4626dd7ef0ad
- T *branch * fts5-data-version
- T *sym-fts5-data-version *
 -P 10a3e2a01db9f80452a2a3369fd25b6fd9798274
 -R 2716c51dfa2bfe8ed5e18127e51ae3c8
 -T *branch * reusable-pragma
 -T *sym-reusable-pragma *
--T -sym-trunk *
 -U drh
 -Z 7789d1f13489cbc314e26c9b80a11a2d
++P 33ef2210ef19e55c8d460bfe9d3dc146034c8acc db1ce7e13e656fcd2766f1b1f225cbfefe8f73ad
++R 9bcd2375f3bee3eec21a0e0d6e512aed
 +U dan
- Z 015dc4987d82758ea8c0d324359dc366
++Z 9f0b8bb8494a2ee2e21e8a8509116058
diff --cc manifest.uuid
index 3d6ceeb2ed,7ffbbd6257..71f9d7efce
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 33ef2210ef19e55c8d460bfe9d3dc146034c8acc
 -db1ce7e13e656fcd2766f1b1f225cbfefe8f73ad
++6c4a17b963916d19c9433d7a251338042f32e9fa