From: dan <dan@noemail.net>
Date: Fri, 16 Dec 2016 16:13:45 +0000 (+0000)
Subject: Merge the pragma-as-vtab change into this branch.
X-Git-Tag: version-3.16.0~35^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c17f6255a4122a0e0642067c7edc8663d3473c07;p=thirdparty%2Fsqlite.git

Merge the pragma-as-vtab change into this branch.

FossilOrigin-Name: 4ba45e722371ca4343e3563e7e1c2896b48c9a87
---

c17f6255a4122a0e0642067c7edc8663d3473c07
diff --cc manifest
index 36ecb42102,4d0b8539bf..fd8c4d7b2f
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sthe\s-groupbyparent\soption\sto\sthe\s".fkey_missing_indexes"\scommand.
- D 2016-12-15T06:01:40.711
 -C Fix\san\serror\sin\sthe\sway\sthe\s"schema"\sargument\sto\ssome\spragma\svirtual\stables\nis\shandled.
 -D 2016-12-16T04:20:27.559
++C Merge\sthe\spragma-as-vtab\schange\sinto\sthis\sbranch.
++D 2016-12-16T16:13:45.218
  F Makefile.in c194b58fe00c370a48ac6ae6945e92a7781db1c8
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@@ -1537,7 -1536,7 +1537,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 7df23aca1f7c7b769d614d740b3fda3073f46ba9
- R 109aa4e43fd004b2c710d444b0c58b6c
 -P 01afc515970a868c6a36d9a598453d0fde9e39ca
 -R a742a8093b3e07485d2949a360f59e06
 -U drh
 -Z b26c88cbc10f1352d564598308e683f5
++P 976c51b4836dfba2ce9b246334a85bda08ac526f 546821e29edb0282a4b1d8f49512e36027a6bf6d
++R 30e9fb459cb16eb6392de3bdb60521ee
 +U dan
- Z 2faf32103da4e43d54e82bc173d9e560
++Z 8d92568d6acf97185670c4652b437304
diff --cc manifest.uuid
index 9760c01f9e,e8e79b2cfb..f61f9ac100
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 976c51b4836dfba2ce9b246334a85bda08ac526f
 -546821e29edb0282a4b1d8f49512e36027a6bf6d
++4ba45e722371ca4343e3563e7e1c2896b48c9a87