From: drh <drh@noemail.net>
Date: Tue, 25 Oct 2016 17:28:49 +0000 (+0000)
Subject: Merge recent trunk changes, and especially the PRAGMA index_info enhancement
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7fdaca40b7922c4c0cfc2ca2ef8af01d94eef729;p=thirdparty%2Fsqlite.git

Merge recent trunk changes, and especially the PRAGMA index_info enhancement
which is needed on this branch.

FossilOrigin-Name: c3570e462a41586487c4ab3bd08129affe8bed3c
---

7fdaca40b7922c4c0cfc2ca2ef8af01d94eef729
diff --cc manifest
index a38df93cf5,c7ce587e80..035b02b58a
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C First\sattempt\sat\sa\sutility\sprogram\sto\scompute\ssqlite_stat1\swithout\sdoing\na\sfull\stable\sscan.
- D 2016-10-25T13:57:40.551
 -C Enhance\sthe\s"PRAGMA\sindex_info"\sand\s"PRAGMA\sindex_xinfo"\sstatements\sso\sthat\nthey\swork\son\sWITHOUT\sROWID\stables\sand\sprovide\sinformation\sabout\sthe\sunderlying\nindex\sbtree\sthat\simplements\sthe\sWITHOUT\sROWID\stable.
 -D 2016-10-25T15:39:58.696
++C Merge\srecent\strunk\schanges,\sand\sespecially\sthe\sPRAGMA\sindex_info\senhancement\nwhich\sis\sneeded\son\sthis\sbranch.
++D 2016-10-25T17:28:49.402
  F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 5151cc64c4c05f3455f4f692ad11410a810d937f
@@@ -330,10 -330,10 +330,10 @@@ F src/auth.c 930b376a9c56998557367e6f7f
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
- F src/btree.c da29550955aba3930c31d550e32be689c7efb3ce
 -F src/btree.c 6ae1c17347fb2888b2b28a260b947b7717a9fca9
 -F src/btree.h d05b2fcc290991a8a3d9ea1816ddd55a4359dcde
++F src/btree.c c0921ff5144702aecc69207025c99d9182d8baf0
 +F src/btree.h 012576c1d0000e96ccc785c6fe22b4be8211f0d9
  F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
 -F src/build.c 59dcfdc1ee55439d069af301ef7f2e84421b5102
 +F src/build.c e22e66fb34e1e50bb7869a510923bfe58db3071a
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 72c9d01cf446069234e9b54db6fec3e1fc063f58
@@@ -380,8 -380,8 +380,8 @@@ F src/parse.y 07f68096c97093793ed04d69d
  F src/pcache.c 5ff2a08f76a9c1b22f43eb063b7068fb085465ac
  F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
  F src/pcache1.c e3967219b2a92b9edcb9324a4ba75009090d3953
- F src/pragma.c 7e3bbf3c8d28a91d76f5cb91a7733fde43f13fe0
 -F src/pragma.c 18a2b0aa050396725e8ebb74b055d5afa802b54f
 -F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
++F src/pragma.c 6ca8fb0a4da012c4ec4e92c76d868dca97ac6a03
 +F src/pragma.h 74d46e32bdc7abb2d01710162ff96cfb483699b6
  F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a
  F src/printf.c a5f0ca08ddede803c241266abb46356ec748ded1
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
@@@ -454,11 -454,11 +454,11 @@@ F src/update.c 8179e699dbd45b92934fd02d
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c 3e2da6101888d073e79ecc6af5e0a2f70fa1e498
  F src/vacuum.c 913970b9d86dd6c2b8063ef1af421880f1464ec3
 -F src/vdbe.c c93ae647b3b302234f3593fd686577216aa22543
 +F src/vdbe.c 55ea5eb95860106a8f665231f8d0c6b55dbf8974
  F src/vdbe.h c044be7050ac6bf596eecc6ab159f5dbc020a3b7
- F src/vdbeInt.h 0a18713d0a2fec6807d076bd333d9bf3e57530cd
- F src/vdbeapi.c 8272f9342c39ab8d7eb4b9decc6caa7bc75b7d83
- F src/vdbeaux.c 7229203e4e4a3b6eaeeddc807c2287d912c0da74
+ F src/vdbeInt.h d8a56a491b752dbb5f671963b8c861ec72ea875e
+ F src/vdbeapi.c 97129bec6b1553da50d8e73f523c278bda66d9f6
+ F src/vdbeaux.c 52d9b840859f260ce8418be9333dd77c902e1c74
  F src/vdbeblob.c 3e82a797b60c3b9fed7b8de8c539ca7607874937
  F src/vdbemem.c fcdd73a2001a673f48a244a77b1038928ae729c9
  F src/vdbesort.c 91fda3909326860382b0ca8aa251e609c6a9d62c
@@@ -1528,7 -1527,10 +1528,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 04fe12b590ab67e40cd079b5e614b787f5f525ad
- R bd47d064e2ed9e25c0899a770a248208
 -P b115856408b6aa5538be67beb619d7aff0630bea
 -R 169c1df42ad3211c7cffa140b51fc0ef
 -T *branch * index-info-on-table
 -T *sym-index-info-on-table *
 -T -sym-trunk *
++P 7b83581a43384fe81dc319482e03be0df45ab25d fe49fb03133fec8bed51c2e2c1b6848ab9fc563e
++R dc40a5d5b8b329a8e831d814ba1f0d9d
  U drh
- Z d3e8fe3b1d555eec50042b333c79640e
 -Z c67713b53054dcc5980cf7c3020b1123
++Z b7c4393dfca2a201afed4cf76221890b
diff --cc manifest.uuid
index 19d3391591,bee5cddb5b..6148524a44
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7b83581a43384fe81dc319482e03be0df45ab25d
 -fe49fb03133fec8bed51c2e2c1b6848ab9fc563e
++c3570e462a41586487c4ab3bd08129affe8bed3c