From: drh <drh@noemail.net>
Date: Sat, 31 Jan 2015 02:34:23 +0000 (+0000)
Subject: Merge in support for the index_xinfo pragma.
X-Git-Tag: version-3.8.11~252^2~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=161a6845f9525fca8661ccefc75a1c6435c0b4fd;p=thirdparty%2Fsqlite.git

Merge in support for the index_xinfo pragma.

FossilOrigin-Name: f9b6dc77021ee421bffd5697d5d337d3bbd07eb9
---

161a6845f9525fca8661ccefc75a1c6435c0b4fd
diff --cc manifest
index 0d5c8c8888,effa8658b4..109bbd6537
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\sSQLITE_TESTCTRL_IMPOSTER\schanges\sfrom\strunk.
- D 2015-01-30T21:00:10.049
 -C Add\sthe\s"index_xinfo"\spragma.\s\sAdd\snew\scolumns\sto\sthe\s"index_info"\sand\n"index_list"\spragmas.
 -D 2015-01-31T02:00:01.018
++C Merge\sin\ssupport\sfor\sthe\sindex_xinfo\spragma.
++D 2015-01-31T02:34:23.039
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5407a688f4d77a05c18a8142be8ae5a2829dd610
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -238,7 -223,7 +238,7 @@@ F src/parse.y c5d0d964f9ac023e8154cad51
  F src/pcache.c d210cf90d04365a74f85d21374dded65af67b0cb
  F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
  F src/pcache1.c 1e77432b40b7d3288327d9cdf399dcdfd2b6d3bf
- F src/pragma.c 92eba8211c341cbaee420dc1b91087096199befa
 -F src/pragma.c f4d0326361cc875ecd9c92100c5b17363a6a671a
++F src/pragma.c e49831e54c72894cce08702fe2e127e5c53d90f0
  F src/prepare.c 173a5a499138451b2561614ecb87d78f9f4644b9
  F src/printf.c 05edc41450d0eb2c05ef7db113bf32742ae65325
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
@@@ -801,8 -785,8 +801,8 @@@ F test/pagesize.test 1dd51367e752e742f5
  F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
 -F test/permutations.test f9cc1dd987986c9d4949211c7a4ed55ec9aecba1
 +F test/permutations.test 1c2fd1e06f1000c93400bb49df4fff97bccff9e6
- F test/pragma.test aa16dedfe01c02c8895169012f7dfde9c163f0d5
+ F test/pragma.test 66776f48f533c7248d04c1473deb3ebb792daacd
  F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
@@@ -1218,7 -1202,7 +1218,7 @@@ F tool/logest.c eef612f8adf4d0993dafed0
  F tool/mkautoconfamal.sh d1a2da0e15b2ed33d60af35c7e9d483f13a8eb9f
  F tool/mkkeywordhash.c dfff09dbbfaf950e89af294f48f902181b144670
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
- F tool/mkpragmatab.tcl b80cb9d1faf69e7757a6a66f7188c0f84d06ee8f
 -F tool/mkpragmatab.tcl 4a3b465f0a800d22ca419daad34389c6a44858c2
++F tool/mkpragmatab.tcl 5a401a3f5461fedb2e3230eb9908a18d485fefea
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 9ef48e1748dce7b844f67e2450ff9dfeb0fb4ab5
  F tool/mksqlite3c.tcl cfde806851c413db7689b9cb74a4eeb92539c601
@@@ -1254,7 -1238,10 +1254,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 36436dde74ce2536a9a430b4458216499ad113bf 42d5601739c90434e5adfda8fa99ef7b903877db
- R 8701f18a4ed2282b10e5999d74aa1b13
 -P 42d5601739c90434e5adfda8fa99ef7b903877db
 -R 6dd4b55c378d1f90a678654a5a3c72aa
 -T *branch * index_xinfo
 -T *sym-index_xinfo *
 -T -sym-trunk *
++P 3ed6eb2fab5d95709ef392170339e6dd5ba13971 30f51d7b3b292191e8351223242e708bb7f3dfa6
++R 50758dde054ce12d446bde117108ee7b
  U drh
- Z 76979458fdcef8860d5505bc7f40ac6e
 -Z 111ada8400958c014924f86391246d25
++Z ec35f224c29e962e36a2b69233e35843
diff --cc manifest.uuid
index 41edd762be,6dcf9f25fb..6038dc4c5d
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3ed6eb2fab5d95709ef392170339e6dd5ba13971
 -30f51d7b3b292191e8351223242e708bb7f3dfa6
++f9b6dc77021ee421bffd5697d5d337d3bbd07eb9
diff --cc src/pragma.c
index 51c8d6feed,d1aaa4c913..a2913abdbd
--- a/src/pragma.c
+++ b/src/pragma.c
@@@ -492,7 -481,7 +496,7 @@@ static const struct sPragmaNames 
      /* iArg:      */ SQLITE_WriteSchema|SQLITE_RecoveryMode },
  #endif
  };
- /* Number of pragmas: 58 on by default, 73 total. */
 -/* Number of pragmas: 59 on by default, 72 total. */
++/* Number of pragmas: 59 on by default, 74 total. */
  /* End of the automatically generated pragma table.
  ***************************************************************************/