Merge the fix to PRAGMA data_version and testing improvements from trunk.

FossilOrigin-Name: 86e39123c1bca457672bc63eff00a823745077e5

diff --cc Makefile.in
Simple merge

diff --cc manifest
index 8178a6b504c6bccecdba305f84ddcad317579e7f,18d0f09e4c44e2ab5a2edc37055e8439be3fcd3d..d8e4212b73c7e5216080cca2c5d2a84f00620e92
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sthe\sPRAGMA\sdata_version\sredefinition\sand\sother\sfixes\sfrom\strunk.
- D 2014-12-22T18:48:48.561
 -C Make\ssure\sPRAGMA\sdata_version\sis\supdated\seven\sif\sthe\scache\sis\sempty\swhen\nanother\sconnection\schanges\sthe\sdatabase.
 -D 2014-12-31T14:18:48.679
++C Merge\sthe\sfix\sto\sPRAGMA\sdata_version\sand\stesting\simprovements\sfrom\strunk.
++D 2014-12-31T14:27:29.243
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 0869fe2a3b7853f048a945fd9cdf671a329b7351
 -F Makefile.in 7cd23e4fc91004a6bd081623e1bc6932e44828c0
++F Makefile.in a297ef2900c99073c8b74555f718d3e5cfc44b9a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc b363b90fe1bfc3b87d190f2f728a126c00d9ce09
 +F Makefile.msc 883be4b5950a20bc7e4d72a49ffc5e5905728b54
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
  F VERSION d846487aff892625eb8e75960234e7285f0462fe
@@@ -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 569d43f0a07b26bfdf12d8571453100e0c18868e
 -F src/main.c fa2128ef7d6a3dcd6770b2b1f3c284b696f11a2a
++F src/main.c 0e2e16ee46e5a33032ee3741dd120499daa721e2
  F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
@@@ -246,16 -229,16 +246,16 @@@ 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 47cb601ed2b2ea7f01119e2763185c809d8e82fa
 +F src/shell.c 81e4f2b57396db0714bc73d1f95cf3970f5dcc10
- F src/sqlite.h.in fdd032d889da139009700d7d9b8d0d43c1900c90
++F src/sqlite.h.in cf011109d67863c1e621d7b22c5c16d8d70c3bfd
  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 e7a09215315a978057fb42c640f890160dbcc45e
 -F src/tclsqlite.c c6a21c64da1490e14d53cdc2062d1e2e57942622
 +F src/tclsqlite.c 95452a59e1afd0cbce10d5243c480b0d5e1e5f59
- F src/test1.c 56e33bf6b1827c6ca7520c189131ddd778fb2267
+ F src/test1.c 041c4edf2f9c49a329add297e26ee86a83852f51
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -308,17 -291,17 +308,17 @@@ 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 db4cf9f69c415318fbc19c2e0d2efd693fbe51af
 +F src/vdbeblob.c cb7359c2d99df92c35cdaedc12af6d4f83854cb7
 +F src/vdbemem.c 96e41193b4affd9ebc0eea2fa628879dac88c744
- F src/vdbesort.c c150803a3e98fbc68bd07772cbbd4328a0a7212d
+ F src/vdbesort.c 80e40d889ebb536cb7a5ac4c12fa2a4662bc9181
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
  F src/vtab.c c08ec66f45919eaa726bf88aa53eb08379d607f9
- F src/wal.c 847692349eb6e1fb8543dbc97e69ddbfa4cc7ea7
+ F src/wal.c 85353539f2d9d0c91ebd057c32525b1e1aa3335e
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
  F src/where.c d46de821bc604a4fd36fa3928c086950e91aafb1
@@@ -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 5e60eb6ca8429453ab20525dc6ac93d9c41dac6e
 -F test/permutations.test e1c603ec095e29de3d1f1566d704ea270f9c3f89
++F test/permutations.test 252900b9a89018e6f9458831ae90521e1456593c
  F test/pragma.test aa16dedfe01c02c8895169012f7dfde9c163f0d5
  F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
- F test/pragma3.test 3da08d907ba027c50ede8d6e95418f32898971a5
+ F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/printf2.test b4acd4bf8734243257f01ddefa17c4fb090acc8a
  F test/progress.test a282973d1d17f08071bc58a77d6b80f2a81c354d
@@@ -1219,8 -1201,8 +1219,8 @@@ F tool/mkopts.tcl 66ac10d240cc6e86abd37
  F tool/mkpragmatab.tcl 07a5124cf2dbafa1b375eefcf8ac4227028b0f8b
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 88a1e3b0c769773fb7a9ebb363ffc603a4ac21d8
- F tool/mksqlite3c.tcl a2f61b529778ffe620531352c03b5cdc6fd03c0a
 -F tool/mksqlite3c.tcl e94bdc37b531bba50d421e82efbe3738d0c1e950
 -F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
++F tool/mksqlite3c.tcl da1b2f86cb5b3fb0200826137d5f480dc089c7ea
 +F tool/mksqlite3h.tcl 2d0f1b3768f8d000b7881217d5fd4c776eb27467
  F tool/mksqlite3internalh.tcl b6514145a7d5321b47e64e19b8116cc44f973eb1
  F tool/mkvsix.tcl 52a4c613707ac34ae9c226e5ccc69cb948556105
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
@@@ -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 d4f82af0a4a9db222e3405cff05c41157e7bd5d9 7a97826f33460f3b4f3890c9cf97116c3355eeda
- R 9a054ca44b6e0d7ecf483bae22df2dab
 -P 94101011966243d599519a69c99c202ea31b928d
 -R ce88be0f3eb17006a4da57569dcf8731
++P 315243e49d30abd0eb31e3795ecf492aee179e4b cf48eb608af9102a8def2a5b7f5f7b348548116f
++R 3c78b315e0de46f71ce8985baa898853
  U drh
- Z 6ad5f73c282563e802f6faa1901969e7
 -Z eb99526801ba8c2c5e7e84b0513387c7
++Z c5bac6e43352272a84a70be7a0122952

diff --cc manifest.uuid
index 0039e73cdcdf2b61cbd8ad1ed45a09c1fe99f4b6,a48eb4758523bff0c4c19a06e6db8e42664e3a6e..d24cefb4a8683b40cea7e46cc714f732a34050c2
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 315243e49d30abd0eb31e3795ecf492aee179e4b
 -cf48eb608af9102a8def2a5b7f5f7b348548116f
++86e39123c1bca457672bc63eff00a823745077e5

diff --cc src/main.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc test/permutations.test
Simple merge

diff --cc tool/mksqlite3c.tcl
Simple merge