Merge recent enhancements from trunk, including test scripts enhancements and

the removal of limits on the number of terms in a VALUES clause.

FossilOrigin-Name: 5a2dec55bfadc328b430a5231a037b37831a5530

diff --cc Makefile.in
index ffc1aa526762edcbf1e3eb9f298390c1f5fc660b,42caa69835bc665484ebc72c8b57359ff9a3e0bd..b0913767b635d5d9003ff495bc80a9a40b542600
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -22,12 -22,15 +22,16 @@@ TOP = @srcdir
  #
  BCC = @BUILD_CC@ @BUILD_CFLAGS@
  
- # C Compile and options for use in building executables that 
+ # TCC is the C Compile and options for use in building executables that 
  # will run on the target platform.  (BCC and TCC are usually the
- # same unless your are cross-compiling.)
+ # same unless your are cross-compiling.)  Separate CC and CFLAGS macros
+ # are provide so that these aspects of the build process can be changed
+ # on the "make" command-line.  Ex:  "make CC=clang CFLAGS=-fsanitize=undefined"
  #
- TCC = @CC@ @CPPFLAGS@ @CFLAGS@ -I. -I${TOP}/src -I${TOP}/ext/rtree -I${TOP}/ext/icu
+ CC = @CC@
+ CFLAGS = @CPPFLAGS@ @CFLAGS@
 -TCC = $(CC) $(CFLAGS) -I. -I${TOP}/src -I${TOP}/ext/rtree -I${TOP}/ext/fts3
++TCC = ${CC} ${CFLAGS} -I. -I${TOP}/src -I${TOP}/ext/rtree -I${TOP}/ext/icu
 +TCC += -I${TOP}/ext/fts3 -I${TOP}/ext/async -I${TOP}/ext/session
  
  # Define this for the autoconf-based build, so that the code knows it can
  # include the generated config.h

diff --cc manifest
index d8e4212b73c7e5216080cca2c5d2a84f00620e92,86064253cbf066660f35035c2c2b743d4554a27d..078c0b994111b32e8d8cf38330ceaa77e28f0d4f
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sthe\sfix\sto\sPRAGMA\sdata_version\sand\stesting\simprovements\sfrom\strunk.
- D 2014-12-31T14:27:29.243
 -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\srecent\senhancements\sfrom\strunk,\sincluding\stest\sscripts\senhancements\sand\nthe\sremoval\sof\slimits\son\sthe\snumber\sof\sterms\sin\sa\sVALUES\sclause.
++D 2015-01-08T20:06:06.740
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in a297ef2900c99073c8b74555f718d3e5cfc44b9a
 -F Makefile.in b40b4c2a3a187c41ee657d3f0e0e0dfe8fd860b5
++F Makefile.in a90b70e00180a16aae961b712583c854b265b1d5
  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 0e2e16ee46e5a33032ee3741dd120499daa721e2
 -F src/main.c b0a7f3f9ff70106b7735f38c602d1b3ca56eb065
++F src/main.c 1b20d9b1b74d4c4183d7654a796b62f46e8b1cae
  F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
@@@ -245,17 -228,17 +245,17 @@@ F src/printf.c 9e75a6a0b55bf61cfff7d7e1
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c f6c46d3434439ab2084618d603e6d6dbeb0d6ada
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c f377fb8a5c73c10678ea74f3400f7913943e3d75
+ F src/select.c e4c38c75e36f28aed80a69a725d888751bfd53df
 -F src/shell.c 45d9c9bd7cde07845af957f2d849933b990773cf
 -F src/sqlite.h.in ed799ff5c814227c7957eb4f4a217f67fdc0da48
 +F src/shell.c 81e4f2b57396db0714bc73d1f95cf3970f5dcc10
- F src/sqlite.h.in cf011109d67863c1e621d7b22c5c16d8d70c3bfd
++F src/sqlite.h.in 08c35d8b77e65a54fd7e9819a7d8ceaf63a65d50
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h 69c302a3b13d06ebaada7f85497106077df00a24
 -F src/sqliteInt.h 5d5716d8b33a61606c6ee10112f4b6df56f42725
++F src/sqliteInt.h 892f2d3ba1f3b94572259addfc5a25f8db18c316
  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 041c4edf2f9c49a329add297e26ee86a83852f51
+ F src/test1.c 460d39e7abbcd0c61c9788c06e0d925f4d1e6a22
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -301,21 -284,21 +301,21 @@@ F src/test_thread.c 1e133a40b50e9c035b0
  F src/test_vfs.c f84075a388527892ff184988f43b69ce69b8083c
  F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
- F src/threads.c 6de09362b657f19ba83e5fa521ee715787ce9fee
+ F src/threads.c 2fb3ea4d70d5acf68b539c2489b4adace61cc01b
  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
 -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 80e40d889ebb536cb7a5ac4c12fa2a4662bc9181
+ F src/vdbesort.c 560bdfd9eb3ae3205196e0d64ccd1de925caa6c7
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
  F src/vtab.c c08ec66f45919eaa726bf88aa53eb08379d607f9
  F src/wal.c 85353539f2d9d0c91ebd057c32525b1e1aa3335e
@@@ -518,8 -501,8 +518,8 @@@ F test/fkey1.test e1d1fa84cde579185ea01
  F test/fkey2.test 1db212cda86b0d3ce72714001f7b6381c321341c
  F test/fkey3.test 76d475c80b84ee7a5d062e56ccb6ea68882e2b49
  F test/fkey4.test 86446017011273aad8f9a99c1a65019e7bd9ca9d
- F test/fkey5.test 8a1fde4e7721ae00b05b3178888833726ca2df8d
+ F test/fkey5.test 488601fbda8350619b3029487e56830447056fd2
 -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
@@@ -798,8 -781,8 +798,8 @@@ F test/pageropt.test 6b8f6a123a5572c195
  F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
  F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
- F test/percentile.test b98fc868d71eb5619d42a1702e9ab91718cbed54
- F test/permutations.test 252900b9a89018e6f9458831ae90521e1456593c
+ F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
 -F test/permutations.test fa2b4e56d1427dd3763053d78ce2f132376bb695
++F test/permutations.test eccbf3203f155846298ad5b1a7255c4dd49ac325
  F test/pragma.test aa16dedfe01c02c8895169012f7dfde9c163f0d5
  F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
@@@ -857,8 -840,8 +857,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/session.test 78fa2365e93d3663a6e933f86e7afc395adf18be
  F test/shared.test 1da9dbad400cee0d93f252ccf76e1ae007a63746
  F test/shared2.test 03eb4a8d372e290107d34b6ce1809919a698e879
  F test/shared3.test fcd65cb11d189eff5f5c85cc4fad246fb0933108
@@@ -1252,7 -1235,7 +1253,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 315243e49d30abd0eb31e3795ecf492aee179e4b cf48eb608af9102a8def2a5b7f5f7b348548116f
- R 3c78b315e0de46f71ce8985baa898853
 -P 826fd311e7e2849aefbd81724dcb4a5644cfa126
 -R 3faebdda7f25c90fe0938a6de3f393ba
++P 86e39123c1bca457672bc63eff00a823745077e5 50b5a8af843fff93452cd1c8f82152124a1d864a
++R 67779bbdb7710c0ef643df0ef1caefea
  U drh
- Z c5bac6e43352272a84a70be7a0122952
 -Z 770e2b1cc0fe0d2202d8e9974f70c6d8
++Z d1795e9058f081650515c9a852afa236

diff --cc manifest.uuid
index d24cefb4a8683b40cea7e46cc714f732a34050c2,52c980db7cda330c4b1120fb3333bcdb15aa07e1..59e1ebafa443af36e735f9b71710181355023ddd
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 86e39123c1bca457672bc63eff00a823745077e5
 -50b5a8af843fff93452cd1c8f82152124a1d864a
++5a2dec55bfadc328b430a5231a037b37831a5530

diff --cc src/main.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc test/permutations.test
Simple merge