Merge the testing enhancements and the unlimited VALUES enhancement from trunk.

FossilOrigin-Name: cc7808427f8e9df8e2810a6681b2ddd93e578c67

diff --cc Makefile.in
Simple merge

diff --cc manifest
index 52400a5679a1f57649f27710f6655124b0021eef,86064253cbf066660f35035c2c2b743d4554a27d..9c2e8fd09cfd2155fdf71730019e2f69c0a8121d
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\sthe\slatest\schanges\sfrom\strunk\sinto\sthe\sapple-osx\sbranch.
- D 2015-01-02T19:17:44.843
 -C Try\sto\sfix\sup\sthe\s"valgrindtest"\starget\sin\sMakefile.in\sso\sthat\sit\savoids\nmisuse\stesting\sthat\scan\strigger\sfalse\serrors.
 -D 2015-01-08T16:47:51.547
++C Merge\sthe\stesting\senhancements\sand\sthe\sunlimited\sVALUES\senhancement\sfrom\strunk.
++D 2015-01-08T19:55:13.561
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 65378d227c542010f7405d1a9c5fee763b393cb1
 -F Makefile.in b40b4c2a3a187c41ee657d3f0e0e0dfe8fd860b5
++F Makefile.in 549f625e1b0b2e63c026e707aefc1b7916d732b4
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc b363b90fe1bfc3b87d190f2f728a126c00d9ce09
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
@@@ -216,12 -213,12 +216,12 @@@ F src/os.c 5822c2b843a77219bba1e28887cd
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c 68823f4a3c0010eec238252b12f3802979f0adaa
 -F src/os_unix.c 949cdedc74dbf3c17f2c9743064ce307026f871e
 -F src/os_win.c 91d3d08e33ec0258d180d4c8255492f47d15e007
++F src/os_unix.c 56858043a9603c7d724d77c992afa8e64c2f0a0d
 +F src/os_win.c 659d2ea531c671e5322d896f61011253786e8e70
  F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21
 -F src/pager.c 4120a49ecd37697e28f5ed807f470b9c0b88410c
 -F src/pager.h c3476e7c89cdf1c6914e50a11f3714e30b4e0a77
 +F src/pager.c 694caffb16891a96608193968d7c9a8fa9a71240
 +F src/pager.h 5ead19acf64a16b7b663476bd36c60d26f03a696
- F src/parse.y 5dfead8aed90cb0c7c1115898ee2266804daff45
+ F src/parse.y c5d0d964f9ac023e8154cad512e54b0b6058e086
  F src/pcache.c b83d160ce81ca101f98f0d27498e6d6bd49f1599
  F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
  F src/pcache1.c 1e77432b40b7d3288327d9cdf399dcdfd2b6d3bf
@@@ -231,18 -228,17 +231,18 @@@ F src/printf.c 9e75a6a0b55bf61cfff7d7e1
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c f6c46d3434439ab2084618d603e6d6dbeb0d6ada
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 4f48f3b05e5c8aa272a13b79645a0b308caef9dc
 -F src/select.c e4c38c75e36f28aed80a69a725d888751bfd53df
++F src/select.c eb792a4eb88e316a8450d7e11d154fe945889371
  F src/shell.c 45d9c9bd7cde07845af957f2d849933b990773cf
 -F src/sqlite.h.in ed799ff5c814227c7957eb4f4a217f67fdc0da48
 +F src/sqlite.h.in fd69431f2facc8cfadf1c9eb9b365c4c028dbae6
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h b04caf7cc326c31c8925a0aec3824500e64cd182
 -F src/sqliteInt.h 5d5716d8b33a61606c6ee10112f4b6df56f42725
++F src/sqliteInt.h 8f8bc296bbe093567ff368b473b64452a6957b18
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
  F src/tclsqlite.c c6a21c64da1490e14d53cdc2062d1e2e57942622
- F src/test1.c 2cec956c56461b4066dfd7610cccd30542caa865
 -F src/test1.c 460d39e7abbcd0c61c9788c06e0d925f4d1e6a22
++F src/test1.c da07829e5fb676d2b738931d70ecfcc8818c0f61
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -295,18 -291,18 +295,18 @@@ F src/update.c 3c4ecc282accf12d39edb8d5
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 3b627daa45c7308c1e36e3dbaa3f9ce7e5c7fa73
  F src/vacuum.c 9b30ec729337dd012ed88d4c292922c8ef9cf00c
 -F src/vdbe.c 1a9e671c9cfc259e4d2affc71f7df4a4c00a842c
 +F src/vdbe.c 9f43973c08d115f5fbe46fe30663e536018d7b43
  F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
  F src/vdbeInt.h 9bb69ff2447c34b6ccc58b34ec35b615f86ead78
 -F src/vdbeapi.c 4bc511a46b9839392ae0e90844a71dc96d9dbd71
 -F src/vdbeaux.c 07ef87c6d4b5abdf13ff33babb10205702fdab0a
 +F src/vdbeapi.c ad6b1bde19d27ec5b278af4a8182ff60fdae5bc3
 +F src/vdbeaux.c 65d2516652fa8d171085a2ae4a04f76545c633c1
  F src/vdbeblob.c 4af4bfb71f6df7778397b4a0ebc1879793276778
  F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
- F src/vdbesort.c fc1aa0d1a8b539bf3a272945d02c9f9ede93039b
+ F src/vdbesort.c 560bdfd9eb3ae3205196e0d64ccd1de925caa6c7
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
  F src/vtab.c c08ec66f45919eaa726bf88aa53eb08379d607f9
 -F src/wal.c 85353539f2d9d0c91ebd057c32525b1e1aa3335e
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 +F src/wal.c 895b26c4c5fe9139f676d9bd64cf7e72563b6705
 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
  F src/where.c d46de821bc604a4fd36fa3928c086950e91aafb1
  F src/whereInt.h d3633e9b592103241b74b0ec76185f3e5b8b62e0
@@@ -698,13 -694,12 +698,13 @@@ F test/lock.test 87af515b0c4cf928576d0f
  F test/lock2.test 5242d8ac4e2d59c403aebff606af449b455aceff
  F test/lock3.test f271375930711ae044080f4fe6d6eda930870d00
  F test/lock4.test e175ae13865bc87680607563bafba21f31a26f12
 -F test/lock5.test c6c5e0ebcb21c61a572870cc86c0cb9f14cede38
 -F test/lock6.test ad5b387a3a8096afd3c68a55b9535056431b0cf5
 +F test/lock5.test 1f1e0fd1670deef8c0a76e8f895bd5e124133ca4
 +F test/lock6.test 83434ae8ca1d1c5e2eaf74d4e44aa24ab62b291c
  F test/lock7.test 49f1eaff1cdc491cc5dee3669f3c671d9f172431
  F test/lock_common.tcl 0c270b121d40959fa2f3add382200c27045b3d95
 +F test/lock_proxy.test 95be9c32d79be25cf643b4e41a0aa0e53aa21621
  F test/lookaside.test 93f07bac140c5bb1d49f3892d2684decafdc7af2
- F test/main.test 3991157c720c2b2b9ec27254d940f06ab81aab84
 -F test/main.test 16131264ea0c2b93b95201f0c92958e85f2ba11a
++F test/main.test 3595944ab7fbb3637a499d3eff2b60c89e26adbb
  F test/make-where7.tcl 05c16b5d4f5d6512881dfec560cb793915932ef9
  F test/malloc.test 96939d2d1a6f39667bbebe5bc27c6525f2ab614e
  F test/malloc3.test e3b32c724b5a124b57cb0ed177f675249ad0c66a
@@@ -773,9 -768,9 +773,9 @@@ F test/orderby4.test 4d39bfbaaa3ae64d02
  F test/orderby5.test 8f08a54836d21fb7c70245360751aedd1c2286fb
  F test/orderby6.test 8b38138ab0972588240b3fca0985d2e400432859
  F test/orderby7.test 3d1383d52ade5b9eb3a173b3147fdd296f0202da
- F test/oserror.test 50417780d0e0d7cd23cf12a8277bb44024765df3
+ F test/oserror.test 14fec2796c2b6fe431c7823750e8a18a761176d7
  F test/ovfl.test 4f7ca651cba5c059a12d8c67dddd49bec5747799
 -F test/pager1.test 1acbdb14c5952a72dd43129cabdbf69aaa3ed1fa
 +F test/pager1.test 1c39b52a036afd0813fdd47c9d2ebc83dec8fd90
  F test/pager2.test 67b8f40ae98112bcdba1f2b2d03ea83266418c71
  F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
  F test/pager4.test a122e9e6925d5b23b31e3dfef8c6a44bbf19590e
@@@ -784,11 -779,11 +784,11 @@@ F test/pagerfault2.test caf4c7facb914fd
  F test/pagerfault3.test 1003fcda009bf48a8e22a516e193b6ef0dd1bbd8
  F test/pageropt.test 6b8f6a123a5572c195ad4ae40f2987007923bbd6
  F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
 -F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
 +F test/pcache.test 488061b5dd685df2234d690370285c9b4813377b
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
- F test/permutations.test 3a58611f8b703d385015bbe1710c722ff900f2ee
+ F test/permutations.test fa2b4e56d1427dd3763053d78ce2f132376bb695
 -F test/pragma.test aa16dedfe01c02c8895169012f7dfde9c163f0d5
 +F test/pragma.test 7d7823c30925e6c18da6bf7bb4436b762188527f
  F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
@@@ -845,8 -840,9 +845,9 @@@ F test/selectC.test 871fb55d884d3de5943
  F test/selectD.test b0f02a04ef7737decb24e08be2c39b9664b43394
  F test/selectE.test fc02a1eb04c8eb537091482644b7d778ae8759b7
  F test/selectF.test 21c94e6438f76537b72532fa9fd4710cdd455fc3
+ F test/selectG.test e8600e379589e85e9fefd2fe4d44a4cdd63f6982
  F test/server1.test 46803bd3fe8b99b30dbc5ff38ffc756f5c13a118
 -F test/shared.test 1da9dbad400cee0d93f252ccf76e1ae007a63746
 +F test/shared.test 13376ba3be1c5685ab1ec184189adabd15fa70be
  F test/shared2.test 03eb4a8d372e290107d34b6ce1809919a698e879
  F test/shared3.test fcd65cb11d189eff5f5c85cc4fad246fb0933108
  F test/shared4.test 72d90821e8d2fc918a08f16d32880868d8ee8e9d
@@@ -1239,7 -1235,7 +1240,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 2c1d8ddab23b36dbdd30ff82401925f97ffc5d76 acb0d1e8324f19da3d4d577d58748848de1bcef7
- R 2e33f5472a6c606a9db08c44aa76f0c6
 -P 826fd311e7e2849aefbd81724dcb4a5644cfa126
 -R 3faebdda7f25c90fe0938a6de3f393ba
++P df3cdf9f0690f2724c7e4e0adb2e3bd4b1a4dd26 50b5a8af843fff93452cd1c8f82152124a1d864a
++R 6a22cf025bcb83d27f721f2fa6249f59
  U drh
- Z 39744d0c72d16dbee8746b4f50f84428
 -Z 770e2b1cc0fe0d2202d8e9974f70c6d8
++Z 4eed5f9ecc66c188c6b2f3aad302150d

diff --cc manifest.uuid
index b154455e3ba5ef9fe6585490a7fd4aa93791bdef,52c980db7cda330c4b1120fb3333bcdb15aa07e1..88aec4945d50ab72e05c8df6cf8dffd2f564c2e3
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- df3cdf9f0690f2724c7e4e0adb2e3bd4b1a4dd26
 -50b5a8af843fff93452cd1c8f82152124a1d864a
++cc7808427f8e9df8e2810a6681b2ddd93e578c67

diff --cc src/os_unix.c
index 4161d7cdbd4e902b057d23142f1e16baffe2d467,3fcb0cff2476c98029c173b1f829681b4bcede88..9345bc92d8b17b3981bf3a7619cb95e4a845700c
--- 1/src/os_unix.c
--- 2/src/os_unix.c
+++ b/src/os_unix.c
@@@ -1671,7 -1361,7 +1671,7 @@@ static void verifyDbFile(unixFile *pFil
      return;
    }
    if( fileHasMoved(pFile) ){
--    sqlite3_log(SQLITE_WARNING, "file renamed while open: %s", pFile->zPath);
++    sqlite3_log(SQLITE_WARNING, "file renamed while open: [%s]", pFile->zPath);
      pFile->ctrlFlags |= UNIXFILE_WARNED;
      return;
    }
@@@ -4130,12 -3717,9 +4130,13 @@@ static int fcntlSizeHint(unixFile *pFil
        ** that do not have a real fallocate() call.
        */
        int nBlk = buf.st_blksize;  /* File-system block size */
+       int nWrite = 0;             /* Number of bytes written by seekAndWrite */
        i64 iWrite;                 /* Next offset to write to */
  
 +      if( robust_ftruncate(pFile->h, nSize) ){
 +        storeLastErrno(pFile, errno);
 +        return unixLogError(SQLITE_IOERR_TRUNCATE, "ftruncate", pFile->zPath);
 +      }
        iWrite = ((buf.st_size + 2*nBlk - 1)/nBlk)*nBlk-1;
        assert( iWrite>=buf.st_size );
        assert( (iWrite/nBlk)==((buf.st_size+nBlk-1)/nBlk) );

diff --cc src/select.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc test/main.test
Simple merge