From: drh <drh@noemail.net>
Date: Sat, 20 Dec 2014 14:58:32 +0000 (+0000)
Subject: Merge the PRAGMA data_version command and the enhancements to FK query planning
X-Git-Tag: version-3.13.0~148^2~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e465ac29cd73791676a5fcceeac3d55647bf98bd;p=thirdparty%2Fsqlite.git

Merge the PRAGMA data_version command and the enhancements to FK query planning
from trunk into the sessions branch.

FossilOrigin-Name: d4f82af0a4a9db222e3405cff05c41157e7bd5d9
---

e465ac29cd73791676a5fcceeac3d55647bf98bd
diff --cc manifest
index 7b78e82923,b4b2c48ca5..539be39fa8
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sthreading\sfixes\sfrom\strunk\sinto\sthe\ssessions\sbranch.
- D 2014-12-16T01:05:38.517
 -C Add\sthe\s"PRAGMA\sdata_version"\scommand\sfor\schecking\sto\ssee\sif\sa\sdatabase\shas\nbeen\smodified.
 -D 2014-12-20T14:50:28.363
++C Merge\sthe\sPRAGMA\sdata_version\scommand\sand\sthe\senhancements\sto\sFK\squery\splanning\nfrom\strunk\sinto\sthe\ssessions\sbranch.
++D 2014-12-20T14:58:32.049
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 6c4f961fa91d0b4fa121946a19f9e5eac2f2f809
 +F Makefile.in 0869fe2a3b7853f048a945fd9cdf671a329b7351
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 10720782f88648bf2b5dcedf4c1524b067d43e47
 +F Makefile.msc 212dc90adfad8988134bf3d901a78270d7a9c267
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION d846487aff892625eb8e75960234e7285f0462fe
@@@ -198,10 -181,10 +198,10 @@@ F src/callback.c 7b44ce59674338ad48b0e8
  F src/complete.c c4ba6e0626bb94bc77a0861735f3382fcf7cc818
  F src/ctime.c df19848891c8a553c80e6f5a035e768280952d1a
  F src/date.c 93594514aae68de117ca4a2a0d6cc63eddf26744
 -F src/delete.c 0750b1eb4d96cd3fb2c798599a3a7c85e92f1417
 +F src/delete.c 20a360262b62051afacb44122b3593a8bd9be131
  F src/expr.c 00da3072f362b06f39ce4052baa1d4ce2bb36d1c
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c da985ae673efef2c712caef825a5d2edb087ead7
+ F src/fkey.c e0444b61bed271a76840cbe6182df93a9baa3f12
  F src/func.c 6d3c4ebd72aa7923ce9b110a7dc15f9b8c548430
  F src/global.c 6ded36dda9466fc1c9a3c5492ded81d79bf3977d
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
@@@ -308,13 -291,13 +308,13 @@@ F src/update.c d207deb7a031f698104bee87
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 3b627daa45c7308c1e36e3dbaa3f9ce7e5c7fa73
  F src/vacuum.c 9b30ec729337dd012ed88d4c292922c8ef9cf00c
 -F src/vdbe.c 1a9e671c9cfc259e4d2affc71f7df4a4c00a842c
 -F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
 -F src/vdbeInt.h 9bb69ff2447c34b6ccc58b34ec35b615f86ead78
 -F src/vdbeapi.c 4bc511a46b9839392ae0e90844a71dc96d9dbd71
 -F src/vdbeaux.c 07ef87c6d4b5abdf13ff33babb10205702fdab0a
 -F src/vdbeblob.c 4af4bfb71f6df7778397b4a0ebc1879793276778
 -F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
 +F src/vdbe.c c02217423a807dc97c743f5fff493cd55dffa77d
 +F src/vdbe.h b434bb75fbec973d18d49225a59833ae39ee2afc
 +F src/vdbeInt.h dc69f0351bef56456fdba3e09d3387ba4f1b1520
 +F src/vdbeapi.c 90aeb4b3f1dc86d6576a2ce2d5bad12761329bd5
- F src/vdbeaux.c ccf6b7ca6c7361bdb71d12385b4cff70b395486c
++F src/vdbeaux.c db4cf9f69c415318fbc19c2e0d2efd693fbe51af
 +F src/vdbeblob.c cb7359c2d99df92c35cdaedc12af6d4f83854cb7
 +F src/vdbemem.c 96e41193b4affd9ebc0eea2fa628879dac88c744
  F src/vdbesort.c c150803a3e98fbc68bd07772cbbd4328a0a7212d
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
  F src/vtab.c c08ec66f45919eaa726bf88aa53eb08379d607f9
@@@ -519,8 -502,9 +519,9 @@@ F test/fkey2.test 1db212cda86b0d3ce7271
  F test/fkey3.test 76d475c80b84ee7a5d062e56ccb6ea68882e2b49
  F test/fkey4.test 86446017011273aad8f9a99c1a65019e7bd9ca9d
  F test/fkey5.test 8a1fde4e7721ae00b05b3178888833726ca2df8d
 -F test/fkey6.test abb59f866c1b44926fd02d1fdd217d831fe04f48
 +F test/fkey6.test 6697550baa38505c9952eff130ab26a2d156c0cc
  F test/fkey7.test 72e915890ee4a005daaf3002cb208e8fe973ac13
+ F test/fkey8.test 8f08203458321e6c19a263829de4cfc936274ab0
  F test/fkey_malloc.test 594a7ea1fbab553c036c70813cd8bd9407d63749
  F test/format4.test 1f0cac8ff3895e9359ed87e41aaabee982a812eb
  F test/fts-9fd058691.test 78b887e30ae6816df0e1fed6259de4b5a64ad33c
@@@ -798,9 -782,10 +799,10 @@@ F test/pagesize.test 1dd51367e752e742f5
  F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test b98fc868d71eb5619d42a1702e9ab91718cbed54
 -F test/permutations.test 4e12d43f4639ea8a0e366d9c64e0009afe2eb544
 +F test/permutations.test 5e60eb6ca8429453ab20525dc6ac93d9c41dac6e
  F test/pragma.test aa16dedfe01c02c8895169012f7dfde9c163f0d5
  F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
+ F test/pragma3.test 1935dfdd0082250df4cf4caed52bdfef527c34ff
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/printf2.test b4acd4bf8734243257f01ddefa17c4fb090acc8a
  F test/progress.test a282973d1d17f08071bc58a77d6b80f2a81c354d
@@@ -1214,11 -1198,11 +1216,11 @@@ F tool/logest.c eef612f8adf4d0993dafed0
  F tool/mkautoconfamal.sh 5dc5010e2e748a9e1bba67baca5956a2c2deda7b
  F tool/mkkeywordhash.c dfff09dbbfaf950e89af294f48f902181b144670
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
- F tool/mkpragmatab.tcl cce51d8f60c7f145d8fccabe6b5dfdedf31c5f5c
+ F tool/mkpragmatab.tcl 07a5124cf2dbafa1b375eefcf8ac4227028b0f8b
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 88a1e3b0c769773fb7a9ebb363ffc603a4ac21d8
 -F tool/mksqlite3c.tcl e72c0c97fe1a105fa9616483e652949be2199fe6
 -F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
 +F tool/mksqlite3c.tcl a2f61b529778ffe620531352c03b5cdc6fd03c0a
 +F tool/mksqlite3h.tcl 2d0f1b3768f8d000b7881217d5fd4c776eb27467
  F tool/mksqlite3internalh.tcl b6514145a7d5321b47e64e19b8116cc44f973eb1
  F tool/mkvsix.tcl 52a4c613707ac34ae9c226e5ccc69cb948556105
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
@@@ -1250,7 -1234,8 +1252,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 f0940c73bd13cb49a3d229ce2517736324392cfb ae43539e62e76676a3daf561b629a1b9b4e2d2c9
- R 70e65d4afe346251f33a1427d3dba81d
 -P da27a09d1d991583b59997f6cc67efa28ffd9d6a 44ee538374940c50198949f2cbb9213ba2375b6a
 -R 6a9e76520ab206bdf596f781a2c88e65
 -T +closed 44ee538374940c50198949f2cbb9213ba2375b6a
++P 9817a2864eebe2dc90ce505fe0faa8b069ff48ff de50f25ce3226fa4929b8236c72c88b739859d5f
++R 86fc2b8e0d7a1d7a54ccc5d8e79b042d
  U drh
- Z b3f332559d7fcfb0fb904c707a0ec975
 -Z 9a9f87b94c56980445c2924a0392e880
++Z 22a0372b728dfee7ca4ae6444bd43345
diff --cc manifest.uuid
index ffdfe86a52,59533b96a3..5269786600
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9817a2864eebe2dc90ce505fe0faa8b069ff48ff
 -de50f25ce3226fa4929b8236c72c88b739859d5f
++d4f82af0a4a9db222e3405cff05c41157e7bd5d9