From: drh <drh@noemail.net>
Date: Wed, 19 Aug 2015 12:52:51 +0000 (+0000)
Subject: Merge changes from trunk.
X-Git-Tag: version-3.9.0~215^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b89c92a615f007e303792072517d80980bed4850;p=thirdparty%2Fsqlite.git

Merge changes from trunk.

FossilOrigin-Name: dddd792dedf0c73ebe74b4ff8d303e6216c16b6a
---

b89c92a615f007e303792072517d80980bed4850
diff --cc manifest
index 6bf5e47402,f60e23602b..3b447c0494
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Initial\simplementation\sof\seponymous\svirtual\stable\sinstances.
- D 2015-08-19T02:32:25.892
 -C Simplification\sto\serror\shandling\sin\saddModuleArgument()\sin\sthe\svirtual\stable\nprocessing.
 -D 2015-08-19T12:45:57.389
++C Merge\schanges\sfrom\strunk.
++D 2015-08-19T12:52:51.679
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2fc9ca6bf5949d415801c007ed3004a4bdb7c380
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -407,7 -407,7 +407,7 @@@ F src/vdbeblob.c 4f2e8e075d238392df98c5
  F src/vdbemem.c ae38a0d35ae71cf604381a887c170466ba518090
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
- F src/vtab.c be5a43432b78ddea55bd9f81f23e791da7282814
 -F src/vtab.c 964dffd59c756874a2d73f74039344e63af6d80f
++F src/vtab.c fddb32423d824831fbc42b8358ffadc2437edd97
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
  F src/wal.c 6fb6b68969e4692593c2552c4e7bff5882de2cb8
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
@@@ -1373,10 -1374,7 +1374,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 02448a9fccd4532daa667e4ba6ff1dbb7f68008a
- R ae3efec9cf124146c8c51adef7f17b8d
- T *branch * eponymous-vtab
- T *sym-eponymous-vtab *
- T -sym-trunk *
 -P dec14a3980dcf6c61b0b9ac4ba82fa963ac346d4
 -R 9e79c5c3619781e4dd0837447f8e7872
++P c1f43a7799a9298abea01b2f8531fc7cdadc4594 c573b0a1aa3ba509234f07520fa94d008bcbb330
++R 04d75ba2dfa13388a455ec59c68a148d
  U drh
- Z fd6dce9accc0175e77ceea23601f0413
 -Z 95e599ba5e8b06b741ae2fef900bf405
++Z d53ae36484d8828c21b5f9a23ee68eb5
diff --cc manifest.uuid
index 4dbd4bdb65,78e94e2abc..0f7de90c02
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c1f43a7799a9298abea01b2f8531fc7cdadc4594
 -c573b0a1aa3ba509234f07520fa94d008bcbb330
++dddd792dedf0c73ebe74b4ff8d303e6216c16b6a