From 14965665602dfea528cd712b0ed5073de06a00d8 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 5 Mar 2014 15:04:36 +0000 Subject: [PATCH 1/7] Add a test case for the problem fixed by [1d134ba2ed]. FossilOrigin-Name: d4fbc05df9501a09623d420fcd5b2bce3a57201b --- manifest | 14 +++++++------- manifest.uuid | 2 +- test/capi3.test | 18 ++++++++++++++++++ 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 89fddcc445..d10be5fe63 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C When\sconverting\sa\sresult\stype\sfrom\sTEXT\sto\sBLOB\susing\sthe\nsqlite3_value_blob()\sinterface,\scontinue\sto\sreport\sSQLITE_TEXT\sas\nthe\strue\stype\sfrom\ssqlite3_value_text()\sas\slong\sas\sthat\stext\sis\sstill\nvalid.\s\sThe\smaintains\slegacy\sbehavior\sfrom\sbefore\sthe\snoMemType\schange. -D 2014-03-05T14:40:22.888 +C Add\sa\stest\scase\sfor\sthe\sproblem\sfixed\sby\s[1d134ba2ed]. +D 2014-03-05T15:04:36.099 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -361,7 +361,7 @@ F test/btreefault.test c2bcb542685eea44621275cfedbd8a13f65201e3 F test/busy.test 76b4887f8b9160ba903c1ac22e8ff406ad6ae2f0 F test/cache.test 13bc046b26210471ca6f2889aceb1ea52dc717de F test/capi2.test 011c16da245fdc0106a2785035de6b242c05e738 -F test/capi3.test 6cdd49656bd62a296924f4d2fcfd05cd2a298369 +F test/capi3.test 71bcf2fbd36a9732f617766dfd752552c8e491b5 F test/capi3b.test efb2b9cfd127efa84433cd7a2d72ce0454ae0dc4 F test/capi3c.test a21869e4d50d5dbb7e566e328fc0bc7c2efa6a32 F test/capi3d.test 6d0fc0a86d73f42dd19a7d8b7761ab9bc02277d0 @@ -1155,7 +1155,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P 12cbebb997705e37769460e00a4aaa52c12f305e -R d261f37d595757cff592b0cc63c2909e -U drh -Z 2ff0e0e9e50bbeda593af44f5801ea80 +P 1d134ba2edbdb8c0cf9e99590a69cd17e0b874a9 +R 374319ceadfe35c573eb8d6fe8e86cec +U dan +Z 517538463510fd631bac600f6056aa59 diff --git a/manifest.uuid b/manifest.uuid index dbbf09faa4..621c82a8e9 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -1d134ba2edbdb8c0cf9e99590a69cd17e0b874a9 \ No newline at end of file +d4fbc05df9501a09623d420fcd5b2bce3a57201b \ No newline at end of file diff --git a/test/capi3.test b/test/capi3.test index f0234e8897..cbaa5c5e5b 100644 --- a/test/capi3.test +++ b/test/capi3.test @@ -16,6 +16,7 @@ set testdir [file dirname $argv0] source $testdir/tester.tcl +set ::testprefix capi3 # Do not use a codec for tests in this file, as the database file is # manipulated directly using tcl scripts (using the [hexio_write] command). @@ -1221,6 +1222,23 @@ do_test capi3-19.1 { sqlite3_prepare_tkt3134 db } {} +# Test that calling sqlite3_column_blob() on a TEXT value does not change +# the return type of subsequent calls to sqlite3_column_type(). +# +do_execsql_test 20.1 { + CREATE TABLE t4(x); + INSERT INTO t4 VALUES('abcdefghij'); +} +do_test 20.2 { + set stmt [sqlite3_prepare db "SELECT * FROM t4" -1 dummy] + sqlite3_step $stmt +} {SQLITE_ROW} +do_test 20.3 { sqlite3_column_type $stmt 0 } {TEXT} +do_test 20.4 { sqlite3_column_blob $stmt 0 } {abcdefghij} +do_test 20.5 { sqlite3_column_type $stmt 0 } {TEXT} +do_test 20.6 { sqlite3_finalize $stmt } SQLITE_OK + + # Tests of the interface when no VFS is registered. # if {![info exists tester_do_binarylog]} { From 6d1626eb7ccd6dd78c13c2f67bdc624a93278a3b Mon Sep 17 00:00:00 2001 From: drh Date: Wed, 5 Mar 2014 15:52:43 +0000 Subject: [PATCH 2/7] Count the number of elements in a SrcList object using an "int" rather than a "u8", to avoid overflows and to work around an issue in the C compiler on AIX. FossilOrigin-Name: eee2a13f2caa48b7b8a693680edc2bbc9275292c --- manifest | 16 ++++++++-------- manifest.uuid | 2 +- src/build.c | 4 ++-- src/sqliteInt.h | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/manifest b/manifest index d10be5fe63..f61d243cff 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sa\stest\scase\sfor\sthe\sproblem\sfixed\sby\s[1d134ba2ed]. -D 2014-03-05T15:04:36.099 +C Count\sthe\snumber\sof\selements\sin\sa\sSrcList\sobject\susing\san\s"int"\srather\sthan\na\s"u8",\sto\savoid\soverflows\sand\sto\swork\saround\san\sissue\sin\sthe\sC\scompiler\son\nAIX. +D 2014-03-05T15:52:43.396 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -166,7 +166,7 @@ F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7 F src/btree.c ad795be588e394a0921796f87cc27717359738cc F src/btree.h 9e0f97c01b972f779eb7655cfb4f8727fd6dc26f F src/btreeInt.h 0be66063468a520e4d66b80c7a1dc26d04ee6ea4 -F src/build.c 00ce613bc2256e525c9195cb10d0df7bcc48d1f0 +F src/build.c 04acd702f9c3ffd6670cf50be89d3561cb886fe6 F src/callback.c 174e3c8656bc29f91d710ab61550d16eea34be98 F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac F src/ctime.c 77779efbe78dd678d84bfb4fc2e87b6b6ad8dccd @@ -221,7 +221,7 @@ F src/shell.c 7bf07bcacb181ecc3fc3ccacfdfeb4084aee67ed F src/sqlite.h.in a2ef671f92747a5a1c8a47bad5c585a8dd9eca80 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc -F src/sqliteInt.h bf529055591dd81ec92a84d35dba0854642f6cc2 +F src/sqliteInt.h 7497e95a42f3ec87bf524f1b7231836ac69ed5b0 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e @@ -1155,7 +1155,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P 1d134ba2edbdb8c0cf9e99590a69cd17e0b874a9 -R 374319ceadfe35c573eb8d6fe8e86cec -U dan -Z 517538463510fd631bac600f6056aa59 +P d4fbc05df9501a09623d420fcd5b2bce3a57201b +R 9cc9aba61da37a98f68738296ca8fbec +U drh +Z ce6864cda23669740d5f0005c13c1ece diff --git a/manifest.uuid b/manifest.uuid index 621c82a8e9..65508caffb 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d4fbc05df9501a09623d420fcd5b2bce3a57201b \ No newline at end of file +eee2a13f2caa48b7b8a693680edc2bbc9275292c \ No newline at end of file diff --git a/src/build.c b/src/build.c index 5b6c87f220..44767fa5a1 100644 --- a/src/build.c +++ b/src/build.c @@ -3485,7 +3485,7 @@ SrcList *sqlite3SrcListEnlarge( } pSrc = pNew; nGot = (sqlite3DbMallocSize(db, pNew) - sizeof(*pSrc))/sizeof(pSrc->a[0])+1; - pSrc->nAlloc = (u8)nGot; + pSrc->nAlloc = nGot; } /* Move existing slots that come after the newly inserted slots @@ -3493,7 +3493,7 @@ SrcList *sqlite3SrcListEnlarge( for(i=pSrc->nSrc-1; i>=iStart; i--){ pSrc->a[i+nExtra] = pSrc->a[i]; } - pSrc->nSrc += (i8)nExtra; + pSrc->nSrc += nExtra; /* Zero the newly allocated slots */ memset(&pSrc->a[iStart], 0, sizeof(pSrc->a[0])*nExtra); diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 90e83206ad..cdead4bd2f 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -2018,8 +2018,8 @@ typedef u64 Bitmask; ** contains more than 63 columns and the 64-th or later column is used. */ struct SrcList { - u8 nSrc; /* Number of tables or subqueries in the FROM clause */ - u8 nAlloc; /* Number of entries allocated in a[] below */ + int nSrc; /* Number of tables or subqueries in the FROM clause */ + u32 nAlloc; /* Number of entries allocated in a[] below */ struct SrcList_item { Schema *pSchema; /* Schema to which this item is fixed */ char *zDatabase; /* Name of database holding this table */ From 13ef14afc1f8e97734cee3a1af8dcb571016a830 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 5 Mar 2014 16:15:07 +0000 Subject: [PATCH 3/7] Add tests to join.test to verify that it is not possible to use more than 64 tables in a join. FossilOrigin-Name: ef1a998625e1fc051732228844388d6c59665382 --- manifest | 14 +++++++------- manifest.uuid | 2 +- test/join.test | 26 ++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index f61d243cff..324e9afc4e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Count\sthe\snumber\sof\selements\sin\sa\sSrcList\sobject\susing\san\s"int"\srather\sthan\na\s"u8",\sto\savoid\soverflows\sand\sto\swork\saround\san\sissue\sin\sthe\sC\scompiler\son\nAIX. -D 2014-03-05T15:52:43.396 +C Add\stests\sto\sjoin.test\sto\sverify\sthat\sit\sis\snot\spossible\sto\suse\smore\sthan\s64\stables\sin\sa\sjoin. +D 2014-03-05T16:15:07.836 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -630,7 +630,7 @@ F test/ioerr3.test d3cec5e1a11ad6d27527d0d38573fbff14c71bdd F test/ioerr4.test f130fe9e71008577b342b8874d52984bd04ede2c F test/ioerr5.test 2edfa4fb0f896f733071303b42224df8bedd9da4 F test/ioerr6.test a395a6ab144b26a9e3e21059a1ab6a7149cca65b -F test/join.test 8d63cc4d230a7affafa4b6ab0b97c49b8ccb365c +F test/join.test 533dc4c1ca70d1c876a58df058307ab9c6931a05 F test/join2.test f2171c265e57ee298a27e57e7051d22962f9f324 F test/join3.test 6f0c774ff1ba0489e6c88a3e77b9d3528fb4fda0 F test/join4.test 1a352e4e267114444c29266ce79e941af5885916 @@ -1155,7 +1155,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P d4fbc05df9501a09623d420fcd5b2bce3a57201b -R 9cc9aba61da37a98f68738296ca8fbec -U drh -Z ce6864cda23669740d5f0005c13c1ece +P eee2a13f2caa48b7b8a693680edc2bbc9275292c +R e372b7c4ce133454234e558c8bea46b7 +U dan +Z bf5a892fb8860fb651f9bf5f3493984f diff --git a/manifest.uuid b/manifest.uuid index 65508caffb..5b0b84a8d1 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -eee2a13f2caa48b7b8a693680edc2bbc9275292c \ No newline at end of file +ef1a998625e1fc051732228844388d6c59665382 \ No newline at end of file diff --git a/test/join.test b/test/join.test index 88ac04f950..d25fa35115 100644 --- a/test/join.test +++ b/test/join.test @@ -641,4 +641,30 @@ do_test join-11.10 { execsql { SELECT * FROM t2 NATURAL JOIN t1 } } {1 one 2 two} +#------------------------------------------------------------------------- +# Test that at most 64 tables are allowed in a join. +# +do_execsql_test join-12.1 { + CREATE TABLE t14(x); + INSERT INTO t14 VALUES('abcdefghij'); +} + +proc jointest {tn nTbl res} { + set sql "SELECT 1 FROM [string repeat t14, [expr $nTbl-1]] t14;" + uplevel [list do_catchsql_test $tn $sql $res] +} + +jointest join-12.2 30 {0 1} +jointest join-12.3 63 {0 1} +jointest join-12.4 64 {0 1} +jointest join-12.5 65 {1 {at most 64 tables in a join}} +jointest join-12.6 66 {1 {at most 64 tables in a join}} +jointest join-12.7 127 {1 {at most 64 tables in a join}} +jointest join-12.8 128 {1 {at most 64 tables in a join}} +jointest join-12.9 1000 {1 {at most 64 tables in a join}} +jointest join-12.10 65534 {1 {at most 64 tables in a join}} +jointest join-12.11 65535 {1 {too many references to "t14": max 65535}} +jointest join-12.12 65536 {1 {too many references to "t14": max 65535}} +jointest join-12.13 65537 {1 {too many references to "t14": max 65535}} + finish_test From 03af2168db869a779d89001f141e6e1d68cda695 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 5 Mar 2014 17:29:34 +0000 Subject: [PATCH 4/7] Add SQLITE_OMIT_CTE to the list of compile options that might be returned by "PRAGMA compile_options". FossilOrigin-Name: f33f2b3f924347e3da26741d153749330cb645ec --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/ctime.c | 3 +++ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index 324e9afc4e..5674527ca1 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\stests\sto\sjoin.test\sto\sverify\sthat\sit\sis\snot\spossible\sto\suse\smore\sthan\s64\stables\sin\sa\sjoin. -D 2014-03-05T16:15:07.836 +C Add\sSQLITE_OMIT_CTE\sto\sthe\slist\sof\scompile\soptions\sthat\smight\sbe\sreturned\sby\s"PRAGMA\scompile_options". +D 2014-03-05T17:29:34.044 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -169,7 +169,7 @@ F src/btreeInt.h 0be66063468a520e4d66b80c7a1dc26d04ee6ea4 F src/build.c 04acd702f9c3ffd6670cf50be89d3561cb886fe6 F src/callback.c 174e3c8656bc29f91d710ab61550d16eea34be98 F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac -F src/ctime.c 77779efbe78dd678d84bfb4fc2e87b6b6ad8dccd +F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a F src/date.c 593c744b2623971e45affd0bde347631bdfa4625 F src/delete.c cdd57149543bb28304d8f717c243f2a86b1fc280 F src/expr.c 014b8087a15c4c314bdd798cb1cb0b32693f8b40 @@ -1155,7 +1155,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P eee2a13f2caa48b7b8a693680edc2bbc9275292c -R e372b7c4ce133454234e558c8bea46b7 +P ef1a998625e1fc051732228844388d6c59665382 +R 466a7e3f69162573de9bfcfa517638a1 U dan -Z bf5a892fb8860fb651f9bf5f3493984f +Z 7d97bf825e792d4219e6e7e5c97b5b1b diff --git a/manifest.uuid b/manifest.uuid index 5b0b84a8d1..9df8f288b0 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ef1a998625e1fc051732228844388d6c59665382 \ No newline at end of file +f33f2b3f924347e3da26741d153749330cb645ec \ No newline at end of file diff --git a/src/ctime.c b/src/ctime.c index c863cbed50..286f66e061 100644 --- a/src/ctime.c +++ b/src/ctime.c @@ -215,6 +215,9 @@ static const char * const azCompileOpt[] = { #ifdef SQLITE_OMIT_COMPOUND_SELECT "OMIT_COMPOUND_SELECT", #endif +#ifdef SQLITE_OMIT_CTE + "OMIT_CTE", +#endif #ifdef SQLITE_OMIT_DATETIME_FUNCS "OMIT_DATETIME_FUNCS", #endif From fc5717cc99b61237fcc56087b99d4b5d1b4c4fb7 Mon Sep 17 00:00:00 2001 From: drh Date: Wed, 5 Mar 2014 19:04:46 +0000 Subject: [PATCH 5/7] Fix a harmless compiler warning on MSVC. FossilOrigin-Name: 0723effc9ccae7c660fb847b36ce9324e0cb5042 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/build.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index 5674527ca1..ab256e6e6d 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sSQLITE_OMIT_CTE\sto\sthe\slist\sof\scompile\soptions\sthat\smight\sbe\sreturned\sby\s"PRAGMA\scompile_options". -D 2014-03-05T17:29:34.044 +C Fix\sa\sharmless\scompiler\swarning\son\sMSVC. +D 2014-03-05T19:04:46.223 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -166,7 +166,7 @@ F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7 F src/btree.c ad795be588e394a0921796f87cc27717359738cc F src/btree.h 9e0f97c01b972f779eb7655cfb4f8727fd6dc26f F src/btreeInt.h 0be66063468a520e4d66b80c7a1dc26d04ee6ea4 -F src/build.c 04acd702f9c3ffd6670cf50be89d3561cb886fe6 +F src/build.c 0d50ef95aad63f4c4fc47f3fa2670d4557c45db0 F src/callback.c 174e3c8656bc29f91d710ab61550d16eea34be98 F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a @@ -1155,7 +1155,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P ef1a998625e1fc051732228844388d6c59665382 -R 466a7e3f69162573de9bfcfa517638a1 -U dan -Z 7d97bf825e792d4219e6e7e5c97b5b1b +P f33f2b3f924347e3da26741d153749330cb645ec +R bec805b30a62102ab84493bc76693952 +U drh +Z 267f872091e9a8fb36e5f21325487fbe diff --git a/manifest.uuid b/manifest.uuid index 9df8f288b0..8aca077064 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f33f2b3f924347e3da26741d153749330cb645ec \ No newline at end of file +0723effc9ccae7c660fb847b36ce9324e0cb5042 \ No newline at end of file diff --git a/src/build.c b/src/build.c index 44767fa5a1..10077e5018 100644 --- a/src/build.c +++ b/src/build.c @@ -3473,7 +3473,7 @@ SrcList *sqlite3SrcListEnlarge( assert( iStart<=pSrc->nSrc ); /* Allocate additional space if needed */ - if( pSrc->nSrc+nExtra>pSrc->nAlloc ){ + if( (u32)pSrc->nSrc+nExtra>pSrc->nAlloc ){ SrcList *pNew; int nAlloc = pSrc->nSrc+nExtra; int nGot; From a6eaa635cc1cc1d00619fc51aed9ce585c2a68b5 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 5 Mar 2014 19:13:32 +0000 Subject: [PATCH 6/7] Avoid running a couple of test cases that use realloc() extensively if SQLITE_MEMDEBUG is defined. FossilOrigin-Name: e406d4bb786a34cdd5dd23ed39f35dfce3e1cabd --- manifest | 14 +++++++------- manifest.uuid | 2 +- test/join.test | 17 +++++++++++++---- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/manifest b/manifest index ab256e6e6d..9c71992df0 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sharmless\scompiler\swarning\son\sMSVC. -D 2014-03-05T19:04:46.223 +C Avoid\srunning\sa\scouple\sof\stest\scases\sthat\suse\srealloc()\sextensively\sif\sSQLITE_MEMDEBUG\sis\sdefined. +D 2014-03-05T19:13:32.745 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -630,7 +630,7 @@ F test/ioerr3.test d3cec5e1a11ad6d27527d0d38573fbff14c71bdd F test/ioerr4.test f130fe9e71008577b342b8874d52984bd04ede2c F test/ioerr5.test 2edfa4fb0f896f733071303b42224df8bedd9da4 F test/ioerr6.test a395a6ab144b26a9e3e21059a1ab6a7149cca65b -F test/join.test 533dc4c1ca70d1c876a58df058307ab9c6931a05 +F test/join.test 559b81eb56ae350246f9c25986aa52c81c725c7e F test/join2.test f2171c265e57ee298a27e57e7051d22962f9f324 F test/join3.test 6f0c774ff1ba0489e6c88a3e77b9d3528fb4fda0 F test/join4.test 1a352e4e267114444c29266ce79e941af5885916 @@ -1155,7 +1155,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P f33f2b3f924347e3da26741d153749330cb645ec -R bec805b30a62102ab84493bc76693952 -U drh -Z 267f872091e9a8fb36e5f21325487fbe +P 0723effc9ccae7c660fb847b36ce9324e0cb5042 +R fd55c551a93656dfa35ae57a4e3f4bce +U dan +Z 8fe6d9b1a050fe779092fc8bd960685b diff --git a/manifest.uuid b/manifest.uuid index 8aca077064..94a1773c6e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0723effc9ccae7c660fb847b36ce9324e0cb5042 \ No newline at end of file +e406d4bb786a34cdd5dd23ed39f35dfce3e1cabd \ No newline at end of file diff --git a/test/join.test b/test/join.test index d25fa35115..28d9ddf8b2 100644 --- a/test/join.test +++ b/test/join.test @@ -662,9 +662,18 @@ jointest join-12.6 66 {1 {at most 64 tables in a join}} jointest join-12.7 127 {1 {at most 64 tables in a join}} jointest join-12.8 128 {1 {at most 64 tables in a join}} jointest join-12.9 1000 {1 {at most 64 tables in a join}} -jointest join-12.10 65534 {1 {at most 64 tables in a join}} -jointest join-12.11 65535 {1 {too many references to "t14": max 65535}} -jointest join-12.12 65536 {1 {too many references to "t14": max 65535}} -jointest join-12.13 65537 {1 {too many references to "t14": max 65535}} + +# If SQLite is built with SQLITE_MEMDEBUG, then the huge number of realloc() +# calls made by the following test cases are too time consuming to run. +# Without SQLITE_MEMDEBUG, realloc() is fast enough that these are not +# a problem. +ifcapable pragma&&compileoption_diags { + if {[lsearch [db eval {PRAGMA compile_options}] MEMDEBUG]<0} { + jointest join-12.10 65534 {1 {at most 64 tables in a join}} + jointest join-12.11 65535 {1 {too many references to "t14": max 65535}} + jointest join-12.12 65536 {1 {too many references to "t14": max 65535}} + jointest join-12.13 65537 {1 {too many references to "t14": max 65535}} + } +} finish_test From dc90d3d8af0c560869ce2dd1ed576ff6745ac58c Mon Sep 17 00:00:00 2001 From: drh Date: Wed, 5 Mar 2014 19:36:52 +0000 Subject: [PATCH 7/7] Always include the ctype.h header in the spellfix.c extension. FossilOrigin-Name: bfd75f471a607b442d8cd8a7070491a158e8fb1a --- ext/misc/spellfix.c | 2 +- manifest | 14 +++++++------- manifest.uuid | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ext/misc/spellfix.c b/ext/misc/spellfix.c index d33740bf6d..a62d24c592 100644 --- a/ext/misc/spellfix.c +++ b/ext/misc/spellfix.c @@ -26,8 +26,8 @@ SQLITE_EXTENSION_INIT1 # define NEVER(X) 0 typedef unsigned char u8; typedef unsigned short u16; -# include #endif +#include #ifndef SQLITE_OMIT_VIRTUALTABLE diff --git a/manifest b/manifest index 9c71992df0..c073f282a9 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Avoid\srunning\sa\scouple\sof\stest\scases\sthat\suse\srealloc()\sextensively\sif\sSQLITE_MEMDEBUG\sis\sdefined. -D 2014-03-05T19:13:32.745 +C Always\sinclude\sthe\sctype.h\sheader\sin\sthe\sspellfix.c\sextension. +D 2014-03-05T19:36:52.892 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -114,7 +114,7 @@ F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342 F ext/misc/percentile.c bcbee3c061b884eccb80e21651daaae8e1e43c63 F ext/misc/regexp.c af92cdaa5058fcec1451e49becc7ba44dba023dc F ext/misc/rot13.c 1ac6f95f99b575907b9b09c81a349114cf9be45a -F ext/misc/spellfix.c 3548c433f473c2054e080b6382771636fcaa2c4c +F ext/misc/spellfix.c 93f3961074cebe63c31fcefe62ca2a032ee8dfed F ext/misc/totype.c 4a167594e791abeed95e0a8db028822b5e8fe512 F ext/misc/vfslog.c fe40fab5c077a40477f7e5eba994309ecac6cc95 F ext/misc/vtshim.c babb0dc2bf116029e3e7c9a618b8a1377045303e @@ -1155,7 +1155,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P 0723effc9ccae7c660fb847b36ce9324e0cb5042 -R fd55c551a93656dfa35ae57a4e3f4bce -U dan -Z 8fe6d9b1a050fe779092fc8bd960685b +P e406d4bb786a34cdd5dd23ed39f35dfce3e1cabd +R dbf6df7a91f37410ffccbad9151ed0f2 +U drh +Z 435f844ac1ec54f913d9ebdd6e1ebde0 diff --git a/manifest.uuid b/manifest.uuid index 94a1773c6e..96b73158b8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e406d4bb786a34cdd5dd23ed39f35dfce3e1cabd \ No newline at end of file +bfd75f471a607b442d8cd8a7070491a158e8fb1a \ No newline at end of file