Merge the PRAGMA data_version redefinition and other fixes from trunk.

FossilOrigin-Name: 315243e49d30abd0eb31e3795ecf492aee179e4b

diff --cc Makefile.msc
Simple merge

diff --cc manifest
index 539be39fa87a2ce1a2445f92a54d197ae887b345,8ae7e71d4a82544adccc9b8adeda14714956ec6a..8178a6b504c6bccecdba305f84ddcad317579e7f
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
- 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
 -C Redefine\sthe\sway\sPRAGMA\sdata_version\sworks:\s\sIt\scontinues\sto\schange\swhen\nany\sother\sconnection\scommits,\sincluding\sshared-cache\sconnections,\sbut\sdoes\snot\nchange\sif\sthe\slocal\sconnection\scommits.
 -D 2014-12-22T18:41:21.243
++C Merge\sthe\sPRAGMA\sdata_version\sredefinition\sand\sother\sfixes\sfrom\strunk.
++D 2014-12-22T18:48:48.561
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 6c4f961fa91d0b4fa121946a19f9e5eac2f2f809
 +F Makefile.in 0869fe2a3b7853f048a945fd9cdf671a329b7351
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 212dc90adfad8988134bf3d901a78270d7a9c267
 -F Makefile.msc b363b90fe1bfc3b87d190f2f728a126c00d9ce09
++F Makefile.msc 883be4b5950a20bc7e4d72a49ffc5e5905728b54
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
- F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
+ F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
  F VERSION d846487aff892625eb8e75960234e7285f0462fe
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
@@@ -190,15 -173,15 +190,15 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 7ddee9c7d505e07e959a575b18498f17c71e53ea
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
- F src/btree.c b2b2bd0aa02430fe86bc891295db919fcafb0d64
+ F src/btree.c 1de0560426ecde85ff3ea95d7c94261d7652e284
  F src/btree.h 94277c1d30c0b75705974bcc8b0c05e79c03d474
- F src/btreeInt.h 3363e18fd76f69a27a870b25221b2345b3fd4d21
+ F src/btreeInt.h a3d0ae1d511365e1a2b76ad10960dbe55c286f34
  F src/build.c 162d84e4833b03f9d07192ef06057b0226f6e543
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
- F src/complete.c c4ba6e0626bb94bc77a0861735f3382fcf7cc818
+ F src/complete.c 198a0066ba60ab06fc00fba1998d870a4d575463
  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 e0444b61bed271a76840cbe6182df93a9baa3f12
@@@ -212,7 -195,7 +212,7 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
  F src/loadext.c 86bd4e2fccd520b748cba52492ab60c4a770f660
- F src/main.c ef3c25ce021d5ab6ffd29fcf993183bd31e2f9aa
 -F src/main.c ee498c89735ba7b581fbd58d2ad2e7679a0475b2
++F src/main.c 569d43f0a07b26bfdf12d8571453100e0c18868e
  F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
@@@ -246,15 -229,15 +246,15 @@@ F src/random.c ba2679f80ec82c4190062d75
  F src/resolve.c f6c46d3434439ab2084618d603e6d6dbeb0d6ada
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c f377fb8a5c73c10678ea74f3400f7913943e3d75
 -F src/shell.c 45d9c9bd7cde07845af957f2d849933b990773cf
 -F src/sqlite.h.in 116dc731361549ee3fc79dcebace11b57d24dcfd
 +F src/shell.c 81e4f2b57396db0714bc73d1f95cf3970f5dcc10
 +F src/sqlite.h.in fdd032d889da139009700d7d9b8d0d43c1900c90
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
 -F src/sqliteInt.h d36da9a07130cae13cbfee0986bf20028cb01465
 +F src/sqliteInt.h 69c302a3b13d06ebaada7f85497106077df00a24
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
- F src/table.c f142bba7903e93ca8d113a5b8877a108ad1a27dc
+ F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
 -F src/tclsqlite.c c6a21c64da1490e14d53cdc2062d1e2e57942622
 +F src/tclsqlite.c 95452a59e1afd0cbce10d5243c480b0d5e1e5f59
  F src/test1.c 56e33bf6b1827c6ca7520c189131ddd778fb2267
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
@@@ -302,9 -285,9 +302,9 @@@ F src/test_vfs.c f84075a388527892ff1849
  F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 6de09362b657f19ba83e5fa521ee715787ce9fee
- F src/tokenize.c cc9016e5007fc5e76789079616d2f26741bcc689
+ F src/tokenize.c e00458c9938072b0ea711c850b8dcf4ddcb5fe18
  F src/trigger.c 25571661fdeae8c7f975ff40ffec205520a3f92f
 -F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
 +F src/update.c d207deb7a031f698104bee879de0632b611e72dd
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 3b627daa45c7308c1e36e3dbaa3f9ce7e5c7fa73
  F src/vacuum.c 9b30ec729337dd012ed88d4c292922c8ef9cf00c
@@@ -799,10 -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/pragma3.test 3da08d907ba027c50ede8d6e95418f32898971a5
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/printf2.test b4acd4bf8734243257f01ddefa17c4fb090acc8a
  F test/progress.test a282973d1d17f08071bc58a77d6b80f2a81c354d
@@@ -1252,7 -1234,7 +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 9817a2864eebe2dc90ce505fe0faa8b069ff48ff de50f25ce3226fa4929b8236c72c88b739859d5f
- R 86fc2b8e0d7a1d7a54ccc5d8e79b042d
 -P ef4b734d1ff3dbb9c802c60dc1384033fdfd87e5
 -R 717423e0d3aaa97f5eb5c0e7357ce13c
++P d4f82af0a4a9db222e3405cff05c41157e7bd5d9 7a97826f33460f3b4f3890c9cf97116c3355eeda
++R 9a054ca44b6e0d7ecf483bae22df2dab
  U drh
- Z 22a0372b728dfee7ca4ae6444bd43345
 -Z 78337e4052167193689952903ddb287b
++Z 6ad5f73c282563e802f6faa1901969e7

diff --cc manifest.uuid
index 52697866002d70bfe1dba214f65e87976dec90c6,327aa0952b520ab9d96ce803ccf9d3b7f313084f..0039e73cdcdf2b61cbd8ad1ed45a09c1fe99f4b6
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d4f82af0a4a9db222e3405cff05c41157e7bd5d9
 -7a97826f33460f3b4f3890c9cf97116c3355eeda
++315243e49d30abd0eb31e3795ecf492aee179e4b

diff --cc src/main.c
Simple merge