From 1fce2b14fb5047ef190b68cd6d84bc431ab639e1 Mon Sep 17 00:00:00 2001 From: dan Date: Mon, 20 Jun 2011 12:24:26 +0000 Subject: [PATCH 01/15] Update some test cases in fts4aa.test. FossilOrigin-Name: 65e5f7706d3b6784f9cce315478d7623d6d7e7d9 --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/fts4aa.test | 17 +++++++---------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/manifest b/manifest index bc116c5db3..8f235c6a0b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sproblem\swhere\sFTS\stest\scode\swas\snot\sbeing\sincluded\sin\sthe\stestfixture\sbuild\swhen\sSQLITE_ENABLE_FTS4\swas\sdefined. -D 2011-06-20T11:15:06.397 +C Update\ssome\stest\scases\sin\sfts4aa.test. +D 2011-06-20T12:24:26.051 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -482,7 +482,7 @@ F test/fts3rnd.test 1320d8826a845e38a96e769562bf83d7a92a15d0 F test/fts3shared.test 8bb266521d7c5495c0ae522bb4d376ad5387d4a2 F test/fts3snippet.test a12f22a3ba4dd59751a57c79b031d07ab5f51ddd F test/fts3sort.test 63d52c1812904b751f9e1ff487472e44833f5402 -F test/fts4aa.test eadf85621c0a113d4c7ad3ccbf8441130e007b8f +F test/fts4aa.test b99ad4d9a43a00efd096ef4d0b082de58d848d41 F test/func.test 6c5ce11e3a0021ca3c0649234e2d4454c89110ca F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f F test/func3.test 7ba2ca5a1e9bca900ba2c230cf04bd67184bc1bc @@ -946,7 +946,7 @@ F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d -P d138b0e65953c529619d64e662bdb5478d7d79c3 -R 3d60296c03d3d0e2521fbba8cb89cf3f +P e539d08a4dda073dc67dc39a104f89374d3bd8e9 +R b083bc1ea242b4cf982414de51a9029e U dan -Z 36fbe60e74554514c6ed759d1d5c5a4c +Z ae813637c1aa99808ee254198982947e diff --git a/manifest.uuid b/manifest.uuid index 9a1cc9d18c..7bb69a8a8c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e539d08a4dda073dc67dc39a104f89374d3bd8e9 \ No newline at end of file +65e5f7706d3b6784f9cce315478d7623d6d7e7d9 \ No newline at end of file diff --git a/test/fts4aa.test b/test/fts4aa.test index c6fa3b9cd4..f20d07660b 100644 --- a/test/fts4aa.test +++ b/test/fts4aa.test @@ -21,10 +21,6 @@ ifcapable !fts3 { finish_test return } -if {[db eval {SELECT sqlite_compileoption_used('ENABLE_FTS4')}]==0} { - finish_test - return -} do_test fts4aa-1.0 { db eval { @@ -1589,19 +1585,19 @@ db func mit mit do_test fts4aa-2.1 { db eval { - SELECT docid, mit(matchinfo(t1)) FROM t1 WHERE t1 MATCH 'melchizedek'; + SELECT docid, mit(matchinfo(t1, 'pcxnal')) FROM t1 WHERE t1 MATCH 'melchizedek'; } } {1014018 {1 1 1 1 1 1533 25 20}} do_test fts4aa-2.2 { db eval { - SELECT docid, mit(matchinfo(t1)) FROM t1 + SELECT docid, mit(matchinfo(t1, 'pcxnal')) FROM t1 WHERE t1 MATCH 'spake hebrew' ORDER BY docid; } } {1039014 {2 1 1 40 40 1 6 6 1533 25 42} 1039017 {2 1 1 40 40 1 6 6 1533 25 26}} do_test fts4aa-2.3 { db eval { - SELECT docid, mit(matchinfo(t1)) FROM t1 + SELECT docid, mit(matchinfo(t1, 'pcxnal')) FROM t1 WHERE t1 MATCH 'laban overtook jacob' ORDER BY docid; } @@ -1613,7 +1609,7 @@ do_test fts4aa-9.1 { SELECT hex(size) FROM t1_docsize; SELECT hex(value) FROM t1_stat; } -} {17 0117} +} {17 01176F} do_test fts4aa-9.2 { db eval { @@ -1626,11 +1622,12 @@ do_test fts4aa-9.3 { } } {} do_test fts4aa-9.4 { + # Note: Token 'in' is being deferred in the following query. db eval { - SELECT docid, mit(matchinfo(t1)) FROM t1 + SELECT docid, mit(matchinfo(t1, 'pcxnal')) FROM t1 WHERE t1 MATCH 'joseph died in egypt' ORDER BY docid; } -} {1050026 {4 1 1 1 1 1 1 1 2 2 1 1 1 1 1 23 23}} +} {1050026 {4 1 1 1 1 1 1 1 2 1 1 1 1 1 1 23 23}} finish_test From ced174b1891e07a6ab68ab31be54b9008a5f2c12 Mon Sep 17 00:00:00 2001 From: drh Date: Mon, 20 Jun 2011 15:24:22 +0000 Subject: [PATCH 02/15] Enable crnl to nl translation for the mksqlite3c.tcl script. FossilOrigin-Name: 161379d205455a7a4927a76efd4da75a98182854 --- manifest | 14 +++++++------- manifest.uuid | 2 +- tool/mksqlite3c.tcl | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index 8f235c6a0b..317e3f3664 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Update\ssome\stest\scases\sin\sfts4aa.test. -D 2011-06-20T12:24:26.051 +C Enable\scrnl\sto\snl\stranslation\sfor\sthe\smksqlite3c.tcl\sscript. +D 2011-06-20T15:24:22.735 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -919,7 +919,7 @@ F tool/lempar.c 01ca97f87610d1dac6d8cd96ab109ab1130e76dc F tool/mkkeywordhash.c d2e6b4a5965e23afb80fbe74bb54648cd371f309 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97 -F tool/mksqlite3c.tcl b23027b185d3e7c7a1803c6f977f68bebd7bc3ec +F tool/mksqlite3c.tcl 1fa0ed9cfdc768bf5de7e65fda8d97a46dd2a7e6 F tool/mksqlite3h.tcl 78013ad79a5e492e5f764f3c7a8ef834255061f8 F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87 F tool/omittest.tcl b1dd290c1596e0f31fd335160a74ec5dfea3df4a @@ -946,7 +946,7 @@ F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d -P e539d08a4dda073dc67dc39a104f89374d3bd8e9 -R b083bc1ea242b4cf982414de51a9029e -U dan -Z ae813637c1aa99808ee254198982947e +P 65e5f7706d3b6784f9cce315478d7623d6d7e7d9 +R 007272672581ae30c53290e580616a46 +U drh +Z 7e79762a0452996acbedf9f219efade9 diff --git a/manifest.uuid b/manifest.uuid index 7bb69a8a8c..a60cc2ee65 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -65e5f7706d3b6784f9cce315478d7623d6d7e7d9 \ No newline at end of file +161379d205455a7a4927a76efd4da75a98182854 \ No newline at end of file diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl index b56eaea0c2..a834cab2f1 100644 --- a/tool/mksqlite3c.tcl +++ b/tool/mksqlite3c.tcl @@ -47,7 +47,7 @@ close $in # set out [open sqlite3.c w] # Force the output to use unix line endings, even on Windows. -# fconfigure $out -translation lf +fconfigure $out -translation lf set today [clock format [clock seconds] -format "%Y-%m-%d %H:%M:%S UTC" -gmt 1] puts $out [subst \ {/****************************************************************************** From 051eb38a2685e73bad5c42ceacb533a517589a3d Mon Sep 17 00:00:00 2001 From: drh Date: Mon, 20 Jun 2011 17:24:29 +0000 Subject: [PATCH 03/15] Fix various harmless compiler warnings in FTS3 and RTREE. FossilOrigin-Name: fe62179efdea40887e23a16f898060b879013824 --- ext/fts3/fts3.c | 2 +- ext/fts3/fts3_snippet.c | 2 +- ext/fts3/fts3_term.c | 1 + ext/fts3/fts3_test.c | 2 -- ext/fts3/fts3_tokenizer.c | 2 +- ext/rtree/rtree.c | 24 ++++++++++++------------ manifest | 22 +++++++++++----------- manifest.uuid | 2 +- 8 files changed, 28 insertions(+), 29 deletions(-) diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c index b67cb8c5a1..fb77bfba01 100644 --- a/ext/fts3/fts3.c +++ b/ext/fts3/fts3.c @@ -1094,7 +1094,7 @@ static int fts3InitVtab( /* Fill in the azColumn array */ for(iCol=0; iColaMatchinfo[0] = (u32)nDoc; } diff --git a/ext/fts3/fts3_term.c b/ext/fts3/fts3_term.c index da9bf4543b..d3eb690bdd 100644 --- a/ext/fts3/fts3_term.c +++ b/ext/fts3/fts3_term.c @@ -21,6 +21,7 @@ #include #include +#include typedef struct Fts3termTable Fts3termTable; typedef struct Fts3termCursor Fts3termCursor; diff --git a/ext/fts3/fts3_test.c b/ext/fts3/fts3_test.c index 333891a5bd..c5f72d84f4 100644 --- a/ext/fts3/fts3_test.c +++ b/ext/fts3/fts3_test.c @@ -279,8 +279,6 @@ static int fts3_configure_incr_load_cmd( #ifdef SQLITE_ENABLE_FTS3 extern int test_fts3_node_chunksize; extern int test_fts3_node_chunk_threshold; - int iArg1; - int iArg2; Tcl_Obj *pRet; if( objc!=1 && objc!=3 ){ diff --git a/ext/fts3/fts3_tokenizer.c b/ext/fts3/fts3_tokenizer.c index 87a9a3d430..c4ad6a5c75 100644 --- a/ext/fts3/fts3_tokenizer.c +++ b/ext/fts3/fts3_tokenizer.c @@ -156,7 +156,7 @@ int sqlite3Fts3InitTokenizer( ){ int rc; char *z = (char *)zArg; - int n; + int n = 0; char *zCopy; char *zEnd; /* Pointer to nul-term of zCopy */ sqlite3_tokenizer_module *m; diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c index 66a10df1c3..915b07f166 100644 --- a/ext/rtree/rtree.c +++ b/ext/rtree/rtree.c @@ -1565,11 +1565,11 @@ static int ChooseLeaf( for(ii=0; rc==SQLITE_OK && ii<(pRtree->iDepth-iHeight); ii++){ int iCell; - sqlite3_int64 iBest; + sqlite3_int64 iBest = 0; - float fMinGrowth; - float fMinArea; - float fMinOverlap; + float fMinGrowth = 0.0; + float fMinArea = 0.0; + float fMinOverlap = 0.0; int nCell = NCELL(pNode); RtreeCell cell; @@ -1999,9 +1999,9 @@ static int splitNodeStartree( int *aSpare; int ii; - int iBestDim; - int iBestSplit; - float fBestMargin; + int iBestDim = 0; + int iBestSplit = 0; + float fBestMargin = 0.0; int nByte = (pRtree->nDim+1)*(sizeof(int*)+nCell*sizeof(int)); @@ -2023,9 +2023,9 @@ static int splitNodeStartree( for(ii=0; iinDim; ii++){ float margin = 0.0; - float fBestOverlap; - float fBestArea; - int iBestLeft; + float fBestOverlap = 0.0; + float fBestArea = 0.0; + int iBestLeft = 0; int nLeft; for( @@ -2340,7 +2340,7 @@ static int deleteCell(Rtree *, RtreeNode *, int, int); static int removeNode(Rtree *pRtree, RtreeNode *pNode, int iHeight){ int rc; int rc2; - RtreeNode *pParent; + RtreeNode *pParent = 0; int iCell; assert( pNode->nRef==1 ); @@ -2991,7 +2991,7 @@ static int getNodeSize( int rc; char *zSql; if( isCreate ){ - int iPageSize; + int iPageSize = 0; zSql = sqlite3_mprintf("PRAGMA %Q.page_size", pRtree->zDb); rc = getIntFromStmt(db, zSql, &iPageSize); if( rc==SQLITE_OK ){ diff --git a/manifest b/manifest index 317e3f3664..c5a9933f56 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Enable\scrnl\sto\snl\stranslation\sfor\sthe\smksqlite3c.tcl\sscript. -D 2011-06-20T15:24:22.735 +C Fix\svarious\sharmless\scompiler\swarnings\sin\sFTS3\sand\sRTREE. +D 2011-06-20T17:24:29.807 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -62,7 +62,7 @@ F ext/fts2/mkfts2amal.tcl 974d5d438cb3f7c4a652639262f82418c1e4cff0 F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a F ext/fts3/README.tokenizers 998756696647400de63d5ba60e9655036cb966e9 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d -F ext/fts3/fts3.c f919a7966426e539b3f39f696bc94269e3726033 +F ext/fts3/fts3.c e9c4b571212229ace32dc98e5e69e619efd3e2c2 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe F ext/fts3/fts3Int.h 8ece4390eb44e7179bb05c59d40f447663f5c077 F ext/fts3/fts3_aux.c 0ebfa7b86cf8ff6a0861605fcc63b83ec1b70691 @@ -71,10 +71,10 @@ F ext/fts3/fts3_hash.c aad95afa01cf2a5ffaa448e4b0ab043880cd1efb F ext/fts3/fts3_hash.h 8331fb2206c609f9fc4c4735b9ab5ad6137c88ec F ext/fts3/fts3_icu.c 6c8f395cdf9e1e3afa7fadb7e523dbbf381c6dfa F ext/fts3/fts3_porter.c 8d946908f4812c005d3d33fcbe78418b1f4eb70c -F ext/fts3/fts3_snippet.c a44b38a07d39701ab6d20d7d89fcafe193bf3680 -F ext/fts3/fts3_term.c 51e384269edcc015e8b555fdad2338f053388975 -F ext/fts3/fts3_test.c b66f6c17f3430b3078d0bc5a77ecb124e5ffc901 -F ext/fts3/fts3_tokenizer.c 90ba6cdd8bb1b3686ab7a3d72333131e13c8fdb2 +F ext/fts3/fts3_snippet.c 58b2ba2b934c1e2a2f6ac857d7f3c7e1a14b4532 +F ext/fts3/fts3_term.c a5457992723455a58804cb75c8cbd8978db5c2ef +F ext/fts3/fts3_test.c c0aae3219df989d3e827d07846097adf8cb09945 +F ext/fts3/fts3_tokenizer.c 6089986ebcfc19d4b7aabd2b92773368efa4354f F ext/fts3/fts3_tokenizer.h 13ffd9fcb397fec32a05ef5cd9e0fa659bf3dbd3 F ext/fts3/fts3_tokenizer1.c 0dde8f307b8045565cf63797ba9acfaff1c50c68 F ext/fts3/fts3_write.c 5774a7ee9632355ebf1ec4b7a5071fc9ab9eb956 @@ -84,7 +84,7 @@ F ext/icu/README.txt bf8461d8cdc6b8f514c080e4e10dc3b2bbdfefa9 F ext/icu/icu.c eb9ae1d79046bd7871aa97ee6da51eb770134b5a F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761 -F ext/rtree/rtree.c 4b8438444927191b55de18e00df43b2e02aacbda +F ext/rtree/rtree.c 19ed115ba75b8e0815f572cfaa7f864b89523a90 F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e F ext/rtree/rtree1.test 28e1b8da4da98093ce3210187434dd760a8d89d8 F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba @@ -946,7 +946,7 @@ F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d -P 65e5f7706d3b6784f9cce315478d7623d6d7e7d9 -R 007272672581ae30c53290e580616a46 +P 161379d205455a7a4927a76efd4da75a98182854 +R 101f851ee84fff388935071d5ee10aa7 U drh -Z 7e79762a0452996acbedf9f219efade9 +Z d31f9f2e52718650f4fd972489a8ff5b diff --git a/manifest.uuid b/manifest.uuid index a60cc2ee65..89279bb143 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -161379d205455a7a4927a76efd4da75a98182854 \ No newline at end of file +fe62179efdea40887e23a16f898060b879013824 \ No newline at end of file From 4f529e87fe436948a062ab2aca13a785536e59df Mon Sep 17 00:00:00 2001 From: shaneh Date: Mon, 20 Jun 2011 17:41:41 +0000 Subject: [PATCH 04/15] Update a couple test scripts to account for more floating point variation under various Windows-based versions of TCL. Update a couple test scripts to account for more floating point display variation in Windows-based versions of TCL. FossilOrigin-Name: a4a8402bfec381dd23b7a96c2f4b52c0dd728a7a --- manifest | 16 +-- manifest.uuid | 2 +- test/enc4.test | 276 ++++++++++++++++++++++++------------------------ test/tester.tcl | 3 +- 4 files changed, 148 insertions(+), 149 deletions(-) diff --git a/manifest b/manifest index c5a9933f56..97a1e5a811 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\svarious\sharmless\scompiler\swarnings\sin\sFTS3\sand\sRTREE. -D 2011-06-20T17:24:29.807 +C Update\sa\scouple\stest\sscripts\sto\saccount\sfor\smore\sfloating\spoint\svariation\sunder\svarious\sWindows-based\sversions\sof\sTCL.\nUpdate\sa\scouple\stest\sscripts\sto\saccount\sfor\smore\sfloating\spoint\sdisplay\svariation\sin\sWindows-based\sversions\sof\sTCL. +D 2011-06-20T17:41:41.693 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -387,7 +387,7 @@ F test/e_vacuum.test 6c09c2af7f2f140518f371c5342100118f779dcf F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea F test/enc2.test 6d91a5286f59add0cfcbb2d0da913b76f2242398 F test/enc3.test 5c550d59ff31dccdba5d1a02ae11c7047d77c041 -F test/enc4.test 4b575ef09e0eff896e73bd24076f96c2aa6a42de +F test/enc4.test b145fa25feb56ea1d51a5bc43ca268c0cf691a67 F test/eqp.test f14fadd76da53405e9885e2431cacf7191d83cdb F test/eval.test bc269c365ba877554948441e91ad5373f9f91be3 F test/exclusive.test 53e1841b422e554cecf0160f937c473d6d0e3062 @@ -695,7 +695,7 @@ F test/tclsqlite.test 8c154101e704170c2be10f137a5499ac2c6da8d3 F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c F test/temptable.test f42121a0d29a62f00f93274464164177ab1cc24a F test/temptrigger.test b0273db072ce5f37cf19140ceb1f0d524bbe9f05 -F test/tester.tcl 76222602e59047c6ef119473c7a2ea7c6ee73d09 +F test/tester.tcl 78e63a11eaaec5c2b3c74977d61bf70666d8393f F test/thread001.test a3e6a7254d1cb057836cb3145b60c10bf5b7e60f F test/thread002.test afd20095e6e845b405df4f2c920cb93301ca69db F test/thread003.test b824d4f52b870ae39fc5bae4d8070eca73085dca @@ -946,7 +946,7 @@ F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d -P 161379d205455a7a4927a76efd4da75a98182854 -R 101f851ee84fff388935071d5ee10aa7 -U drh -Z d31f9f2e52718650f4fd972489a8ff5b +P fe62179efdea40887e23a16f898060b879013824 +R f84c264b9f26192970f8ac141b9cac46 +U shaneh +Z 139c54968e5481310a6c6f5918c1c65b diff --git a/manifest.uuid b/manifest.uuid index 89279bb143..9cdf11bf87 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -fe62179efdea40887e23a16f898060b879013824 \ No newline at end of file +a4a8402bfec381dd23b7a96c2f4b52c0dd728a7a \ No newline at end of file diff --git a/test/enc4.test b/test/enc4.test index de2a1b88d0..7de6e849f9 100644 --- a/test/enc4.test +++ b/test/enc4.test @@ -1,139 +1,137 @@ -# 2010 Sept 29 -# -# The author disclaims copyright to this source code. In place of -# a legal notice, here is a blessing: -# -# May you do good and not evil. -# May you find forgiveness for yourself and forgive others. -# May you share freely, never taking more than you give. -# -#*********************************************************************** -# This file implements regression tests for SQLite library. The focus of -# this file is testing the SQLite routines used for converting between the -# various suported unicode encodings (UTF-8, UTF-16, UTF-16le and -# UTF-16be). -# -# $Id: enc4.test,v 1.0 2010/09/29 08:29:32 shaneh Exp $ - -set testdir [file dirname $argv0] -source $testdir/tester.tcl - -# If UTF16 support is disabled, ignore the tests in this file -# -ifcapable {!utf16} { - finish_test - return -} - -db close - -# The three unicode encodings understood by SQLite. -set encodings [list UTF-8 UTF-16le UTF-16be] - -# initial value to use in SELECT -set inits [list 1 1.0 1. 1e0] - -# vals -set vals [list\ -"922337203685477580792233720368547758079223372036854775807"\ -"100000000000000000000000000000000000000000000000000000000"\ -"1.0000000000000000000000000000000000000000000000000000000"\ -] - -set i 1 -foreach enc $encodings { - - file delete -force test.db - sqlite3 db test.db - db eval "PRAGMA encoding = \"$enc\"" - - do_test enc4-$i.1 { - db eval {PRAGMA encoding} - } $enc - - set j 1 - foreach init $inits { - - do_test enc4-$i.$j.2 { - set S [sqlite3_prepare_v2 db "SELECT $init+?" -1 dummy] - sqlite3_expired $S - } {0} - - set k 1 - foreach val $vals { - for {set x 1} {$x<18} {incr x} { - set part [expr $init + [string range $val 0 [expr $x-1]]] - regsub {e\+0} $part {e+} part - regsub {^1e} $part {1.0e} part - - do_test enc4-$i.$j.$k.3.$x { - sqlite3_reset $S - sqlite3_bind_text $S 1 $val $x - sqlite3_step $S - sqlite3_column_text $S 0 - } [list $part] - - do_test enc4-$i.$j.$k.4.$x { - sqlite3_reset $S - sqlite3_bind_text16 $S 1 [encoding convertto unicode $val] [expr $x*2] - sqlite3_step $S - sqlite3_column_text $S 0 - } [list $part] - } - - incr k - } - - do_test enc4-$i.$j.5 { - sqlite3_finalize $S - } {SQLITE_OK} - - incr j - } - - db close - incr i -} - -file delete -force test.db -sqlite3 db test.db - -do_test enc4-4.1 { - db eval "select 1+1." -} {2.0} - -do_test enc4-4.2.1 { - set S [sqlite3_prepare_v2 db "SELECT 1+1." -1 dummy] - sqlite3_step $S - sqlite3_column_text $S 0 -} {2.0} - -do_test enc4-4.2.2 { - sqlite3_finalize $S -} {SQLITE_OK} - -do_test enc4-4.3.1 { - set S [sqlite3_prepare_v2 db "SELECT 1+?" -1 dummy] - sqlite3_bind_text $S 1 "1." 2 - sqlite3_step $S - sqlite3_column_text $S 0 -} {2.0} - -do_test enc4-4.3.2 { - sqlite3_finalize $S -} {SQLITE_OK} - -do_test enc4-4.4.1 { - set S [sqlite3_prepare_v2 db "SELECT 1+?" -1 dummy] - sqlite3_bind_text $S 1 "1.0" 2 - sqlite3_step $S - sqlite3_column_text $S 0 -} {2.0} - -do_test enc4-4.4.2 { - sqlite3_finalize $S -} {SQLITE_OK} - -db close - -finish_test +# 2010 Sept 29 +# +# The author disclaims copyright to this source code. In place of +# a legal notice, here is a blessing: +# +# May you do good and not evil. +# May you find forgiveness for yourself and forgive others. +# May you share freely, never taking more than you give. +# +#*********************************************************************** +# This file implements regression tests for SQLite library. The focus of +# this file is testing the SQLite routines used for converting between the +# various suported unicode encodings (UTF-8, UTF-16, UTF-16le and +# UTF-16be). +# +# $Id: enc4.test,v 1.0 2010/09/29 08:29:32 shaneh Exp $ + +set testdir [file dirname $argv0] +source $testdir/tester.tcl + +# If UTF16 support is disabled, ignore the tests in this file +# +ifcapable {!utf16} { + finish_test + return +} + +db close + +# The three unicode encodings understood by SQLite. +set encodings [list UTF-8 UTF-16le UTF-16be] + +# initial value to use in SELECT +set inits [list 1 1.0 1. 1e0] + +# vals +set vals [list\ +"922337203685477580792233720368547758079223372036854775807"\ +"100000000000000000000000000000000000000000000000000000000"\ +"1.0000000000000000000000000000000000000000000000000000000"\ +] + +set i 1 +foreach enc $encodings { + + file delete -force test.db + sqlite3 db test.db + db eval "PRAGMA encoding = \"$enc\"" + + do_test enc4-$i.1 { + db eval {PRAGMA encoding} + } $enc + + set j 1 + foreach init $inits { + + do_test enc4-$i.$j.2 { + set S [sqlite3_prepare_v2 db "SELECT $init+?" -1 dummy] + sqlite3_expired $S + } {0} + + set k 1 + foreach val $vals { + for {set x 1} {$x<16} {incr x} { + set part [expr $init + [string range $val 0 [expr $x-1]]] + + do_realnum_test enc4-$i.$j.$k.3.$x { + sqlite3_reset $S + sqlite3_bind_text $S 1 $val $x + sqlite3_step $S + sqlite3_column_text $S 0 + } [list $part] + + do_realnum_test enc4-$i.$j.$k.4.$x { + sqlite3_reset $S + sqlite3_bind_text16 $S 1 [encoding convertto unicode $val] [expr $x*2] + sqlite3_step $S + sqlite3_column_text $S 0 + } [list $part] + } + + incr k + } + + do_test enc4-$i.$j.5 { + sqlite3_finalize $S + } {SQLITE_OK} + + incr j + } + + db close + incr i +} + +file delete -force test.db +sqlite3 db test.db + +do_test enc4-4.1 { + db eval "select 1+1." +} {2.0} + +do_test enc4-4.2.1 { + set S [sqlite3_prepare_v2 db "SELECT 1+1." -1 dummy] + sqlite3_step $S + sqlite3_column_text $S 0 +} {2.0} + +do_test enc4-4.2.2 { + sqlite3_finalize $S +} {SQLITE_OK} + +do_test enc4-4.3.1 { + set S [sqlite3_prepare_v2 db "SELECT 1+?" -1 dummy] + sqlite3_bind_text $S 1 "1." 2 + sqlite3_step $S + sqlite3_column_text $S 0 +} {2.0} + +do_test enc4-4.3.2 { + sqlite3_finalize $S +} {SQLITE_OK} + +do_test enc4-4.4.1 { + set S [sqlite3_prepare_v2 db "SELECT 1+?" -1 dummy] + sqlite3_bind_text $S 1 "1.0" 2 + sqlite3_step $S + sqlite3_column_text $S 0 +} {2.0} + +do_test enc4-4.4.2 { + sqlite3_finalize $S +} {SQLITE_OK} + +db close + +finish_test diff --git a/test/tester.tcl b/test/tester.tcl index a53723b9a1..5a936bd9c9 100644 --- a/test/tester.tcl +++ b/test/tester.tcl @@ -355,7 +355,8 @@ proc do_test {name cmd expected} { } proc realnum_normalize {r} { - string map {1.#INF inf} [regsub -all {(e[+-])0+} $r {\1}] + # different TCL versions display floating point values differently. + string map {1.#INF inf Inf inf .0e e} [regsub -all {(e[+-])0+} $r {\1}] } proc do_realnum_test {name cmd expected} { uplevel [list do_test $name [ From dbe4b88aacfc1092dcdf4d34ce0dcfc32647fb95 Mon Sep 17 00:00:00 2001 From: drh Date: Mon, 20 Jun 2011 18:00:17 +0000 Subject: [PATCH 05/15] Rework the autoconf script to better deal with utime() and dlopen(). FossilOrigin-Name: f69ed286ffb3f62f5cb5c1f7df55fa4d2468b472 --- config.h.in | 3 ++ configure | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 3 +- manifest | 20 ++++++------ manifest.uuid | 2 +- src/os_unix.c | 8 ++++- 6 files changed, 112 insertions(+), 14 deletions(-) diff --git a/config.h.in b/config.h.in index 812c532690..11f22803f4 100644 --- a/config.h.in +++ b/config.h.in @@ -75,6 +75,9 @@ /* Define to 1 if you have the `usleep' function. */ #undef HAVE_USLEEP +/* Define to 1 if you have the utime() library function. */ +#undef HAVE_UTIME + /* Define to the sub-directory in which libtool stores uninstalled libraries. */ #undef LT_OBJDIR diff --git a/configure b/configure index 6cd191260f..e0985011af 100755 --- a/configure +++ b/configure @@ -12145,7 +12145,8 @@ done -for ac_func in usleep fdatasync localtime_r gmtime_r localtime_s + +for ac_func in usleep fdatasync localtime_r gmtime_r localtime_s utime do as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -13440,6 +13441,93 @@ fi if test "${use_loadextension}" = "yes" ; then OPT_FEATURE_FLAGS="" + { $as_echo "$as_me:$LINENO: checking for library containing dlopen" >&5 +$as_echo_n "checking for library containing dlopen... " >&6; } +if test "${ac_cv_search_dlopen+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +for ac_lib in '' dl; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_search_dlopen=$ac_res +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_dlopen+set}" = set; then + break +fi +done +if test "${ac_cv_search_dlopen+set}" = set; then + : +else + ac_cv_search_dlopen=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_dlopen" >&5 +$as_echo "$ac_cv_search_dlopen" >&6; } +ac_res=$ac_cv_search_dlopen +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + else OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" fi diff --git a/configure.ac b/configure.ac index 464ed1ef11..46afeb7527 100644 --- a/configure.ac +++ b/configure.ac @@ -127,7 +127,7 @@ AC_CHECK_HEADERS([sys/types.h stdlib.h stdint.h inttypes.h]) ######### # Figure out whether or not we have these functions # -AC_CHECK_FUNCS([usleep fdatasync localtime_r gmtime_r localtime_s]) +AC_CHECK_FUNCS([usleep fdatasync localtime_r gmtime_r localtime_s utime]) ######### # By default, we use the amalgamation (this may be changed below...) @@ -619,6 +619,7 @@ AC_ARG_ENABLE(load-extension, AC_HELP_STRING([--enable-load-extension], [use_loadextension=$enableval],[use_loadextension=no]) if test "${use_loadextension}" = "yes" ; then OPT_FEATURE_FLAGS="" + AC_SEARCH_LIBS(dlopen, dl) else OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" fi diff --git a/manifest b/manifest index 97a1e5a811..8f371b541a 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Update\sa\scouple\stest\sscripts\sto\saccount\sfor\smore\sfloating\spoint\svariation\sunder\svarious\sWindows-based\sversions\sof\sTCL.\nUpdate\sa\scouple\stest\sscripts\sto\saccount\sfor\smore\sfloating\spoint\sdisplay\svariation\sin\sWindows-based\sversions\sof\sTCL. -D 2011-06-20T17:41:41.693 +C Rework\sthe\sautoconf\sscript\sto\sbetter\sdeal\swith\sutime()\sand\sdlopen(). +D 2011-06-20T18:00:17.162 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -21,10 +21,10 @@ F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/src_logo.gif 9341ef09f0e53cd44c0c9b6fc3c16f7f3d6c2ad9 F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977 -F config.h.in 868fdb48c028421a203470e15c69ada15b9ba673 +F config.h.in 405a958bdb3af382a809dccb08a44694923ddd61 F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55 -F configure 1c31f231ba59b71ff81dbf5c7c7594fdc83803d5 x -F configure.ac 87a3c71bbe9c925381c154413eea7f3cdc397244 +F configure f9e97ee7cdc9848e2f3f5ef015fdf861f46fb1bf x +F configure.ac 298a759c086e72c013da459c2aec02a104f4224f F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538 F doc/pager-invariants.txt 870107036470d7c419e93768676fae2f8749cf9e @@ -165,7 +165,7 @@ F src/os.c 22ac61d06e72a0dac900400147333b07b13d8e1d F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9 F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440 -F src/os_unix.c fd4e9588ff0ce09720721ce739ab2682202875ae +F src/os_unix.c 07acbb3e074e52b48a4248c06f66c9a91db1a0ce F src/os_win.c 218b899469e570d46eb8147c2383075f7c026230 F src/pager.c 120550e7ef01dafaa2cbb4a0528c0d87c8f12b41 F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1 @@ -946,7 +946,7 @@ F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d -P fe62179efdea40887e23a16f898060b879013824 -R f84c264b9f26192970f8ac141b9cac46 -U shaneh -Z 139c54968e5481310a6c6f5918c1c65b +P a4a8402bfec381dd23b7a96c2f4b52c0dd728a7a +R 16536365517218923dc08762ed8b0c16 +U drh +Z f0e3294585f4569580d0a1d0b238c6dc diff --git a/manifest.uuid b/manifest.uuid index 9cdf11bf87..998e3d0b0a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a4a8402bfec381dd23b7a96c2f4b52c0dd728a7a \ No newline at end of file +f69ed286ffb3f62f5cb5c1f7df55fa4d2468b472 \ No newline at end of file diff --git a/src/os_unix.c b/src/os_unix.c index 5860ae71a9..682e74c958 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -138,6 +138,10 @@ # include #endif +#ifdef HAVE_UTIME +# include +#endif + /* ** Allowed values of unixFile.fsFlags */ @@ -1939,8 +1943,10 @@ static int dotlockLock(sqlite3_file *id, int eFileLock) { */ if( pFile->eFileLock > NO_LOCK ){ pFile->eFileLock = eFileLock; -#if !OS_VXWORKS /* Always update the timestamp on the old file */ +#ifdef HAVE_UTIME + utime(zLockFile, NULL); +#else utimes(zLockFile, NULL); #endif return SQLITE_OK; From 57489b354d1b076ca9fd4afaa4a11d414b10a325 Mon Sep 17 00:00:00 2001 From: drh Date: Mon, 20 Jun 2011 18:27:23 +0000 Subject: [PATCH 06/15] Fix compiler warnings in lemon by removing some of the code added by Ryan Gordon in [1e8b842039cc0]. FossilOrigin-Name: 76b18b2be072b9ea242df4c9535059f7b43f564b --- manifest | 12 ++++++------ manifest.uuid | 2 +- tool/lemon.c | 37 ------------------------------------- 3 files changed, 7 insertions(+), 44 deletions(-) diff --git a/manifest b/manifest index 8f371b541a..759693be1c 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Rework\sthe\sautoconf\sscript\sto\sbetter\sdeal\swith\sutime()\sand\sdlopen(). -D 2011-06-20T18:00:17.162 +C Fix\scompiler\swarnings\sin\slemon\sby\sremoving\ssome\sof\sthe\scode\sadded\sby\nRyan\sGordon\sin\s[1e8b842039cc0]. +D 2011-06-20T18:27:23.761 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -914,7 +914,7 @@ F tool/fragck.tcl 5265a95126abcf6ab357f7efa544787e5963f439 F tool/genfkey.README cf68fddd4643bbe3ff8e31b8b6d8b0a1b85e20f4 F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5 F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce -F tool/lemon.c 2f182cf58a44a29107ad0027e4e696c79cbb9ad6 +F tool/lemon.c d51c68d405ff7f9bad99268ca3c20a198eb983ed F tool/lempar.c 01ca97f87610d1dac6d8cd96ab109ab1130e76dc F tool/mkkeywordhash.c d2e6b4a5965e23afb80fbe74bb54648cd371f309 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e @@ -946,7 +946,7 @@ F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d -P a4a8402bfec381dd23b7a96c2f4b52c0dd728a7a -R 16536365517218923dc08762ed8b0c16 +P f69ed286ffb3f62f5cb5c1f7df55fa4d2468b472 +R 85fd773d96f76df373ae8654723885fd U drh -Z f0e3294585f4569580d0a1d0b238c6dc +Z 8273f766e9b20e2bd5443eed5877e83e diff --git a/manifest.uuid b/manifest.uuid index 998e3d0b0a..ab322380b7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f69ed286ffb3f62f5cb5c1f7df55fa4d2468b472 \ No newline at end of file +76b18b2be072b9ea242df4c9535059f7b43f564b \ No newline at end of file diff --git a/tool/lemon.c b/tool/lemon.c index 0a50524854..bd2938be25 100644 --- a/tool/lemon.c +++ b/tool/lemon.c @@ -41,23 +41,6 @@ extern int access(const char *path, int mode); #endif static int showPrecedenceConflict = 0; -static const char **made_files = NULL; -static int made_files_count = 0; -static int successful_exit = 0; -static void LemonAtExit(void) -{ - /* if we failed, delete (most) files we made, to unconfuse build tools. */ - int i; - for (i = 0; i < made_files_count; i++) { - if (!successful_exit) { - remove(made_files[i]); - } - } - free(made_files); - made_files_count = 0; - made_files = NULL; -} - static char *msort(char*,char**,int(*)(const char*,const char*)); /* @@ -1433,8 +1416,6 @@ int main(int argc, char **argv) int exitcode; struct lemon lem; - atexit(LemonAtExit); - OptInit(argv,options,stderr); if( version ){ printf("Lemon version 1.0\n"); @@ -1537,7 +1518,6 @@ int main(int argc, char **argv) /* return 0 on success, 1 on failure. */ exitcode = ((lem.errorcnt > 0) || (lem.nconflict > 0)) ? 1 : 0; - successful_exit = (exitcode == 0); exit(exitcode); return (exitcode); } @@ -2761,23 +2741,6 @@ PRIVATE FILE *file_open( lemp->errorcnt++; return 0; } - - /* Add files we create to a list, so we can delete them if we fail. This - ** is to keep makefiles from getting confused. We don't include .out files, - ** though: this is debug information, and you don't want it deleted if there - ** was an error you need to track down. - */ - if(( *mode=='w' ) && (strcmp(suffix, ".out") != 0)){ - const char **ptr = (const char **) - realloc(made_files, sizeof (const char **) * (made_files_count + 1)); - const char *fname = Strsafe(lemp->outname); - if ((ptr == NULL) || (fname == NULL)) { - free(ptr); - memory_error(); - } - made_files = ptr; - made_files[made_files_count++] = fname; - } return fp; } From 7fd33929818c8c01954449ab70a79045a3055b79 Mon Sep 17 00:00:00 2001 From: drh Date: Mon, 20 Jun 2011 19:00:30 +0000 Subject: [PATCH 07/15] More compiler warning fixes. FossilOrigin-Name: ed2dda9329ca42e9c0be1986c78b091051e7598f --- ext/fts3/fts3.c | 4 ++-- ext/fts3/fts3Int.h | 2 +- ext/fts3/fts3_write.c | 2 +- ext/rtree/rtree.c | 26 +++++++++++++------------- manifest | 20 ++++++++++---------- manifest.uuid | 2 +- src/tclsqlite.c | 6 +++--- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c index fb77bfba01..05564f7849 100644 --- a/ext/fts3/fts3.c +++ b/ext/fts3/fts3.c @@ -4354,8 +4354,8 @@ int sqlite3Fts3EvalPhraseStats( if( pExpr->bDeferred && pExpr->pParent->eType!=FTSQUERY_NEAR ){ assert( pCsr->nDoc>0 ); for(iCol=0; iColnColumn; iCol++){ - aiOut[iCol*3 + 1] = pCsr->nDoc; - aiOut[iCol*3 + 2] = pCsr->nDoc; + aiOut[iCol*3 + 1] = (u32)pCsr->nDoc; + aiOut[iCol*3 + 2] = (u32)pCsr->nDoc; } }else{ rc = fts3EvalGatherStats(pCsr, pExpr); diff --git a/ext/fts3/fts3Int.h b/ext/fts3/fts3Int.h index acdaf3d5bb..1664379609 100644 --- a/ext/fts3/fts3Int.h +++ b/ext/fts3/fts3Int.h @@ -249,7 +249,7 @@ struct Fts3Cursor { u8 bDesc; /* True to sort in descending order */ int eEvalmode; /* An FTS3_EVAL_XX constant */ int nRowAvg; /* Average size of database rows, in pages */ - int nDoc; /* Documents in table */ + sqlite3_int64 nDoc; /* Documents in table */ int isMatchinfoNeeded; /* True when aMatchinfo[] needs filling in */ u32 *aMatchinfo; /* Information about most recent match */ diff --git a/ext/fts3/fts3_write.c b/ext/fts3/fts3_write.c index da84d6ca61..36f2249e12 100644 --- a/ext/fts3/fts3_write.c +++ b/ext/fts3/fts3_write.c @@ -1323,7 +1323,7 @@ int sqlite3Fts3MsrOvfl( if( !fts3SegReaderIsPending(pReader) && !fts3SegReaderIsRootOnly(pReader) ){ - int jj; + sqlite3_int64 jj; for(jj=pReader->iStartBlock; jj<=pReader->iLeafEndBlock; jj++){ int nBlob; rc = sqlite3Fts3ReadBlock(p, jj, 0, &nBlob, 0); diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c index 915b07f166..2375069e3e 100644 --- a/ext/rtree/rtree.c +++ b/ext/rtree/rtree.c @@ -1421,7 +1421,7 @@ static float cellArea(Rtree *pRtree, RtreeCell *p){ float area = 1.0; int ii; for(ii=0; ii<(pRtree->nDim*2); ii+=2){ - area = area * (DCOORD(p->aCoord[ii+1]) - DCOORD(p->aCoord[ii])); + area = (float)(area * (DCOORD(p->aCoord[ii+1]) - DCOORD(p->aCoord[ii]))); } return area; } @@ -1434,7 +1434,7 @@ static float cellMargin(Rtree *pRtree, RtreeCell *p){ float margin = 0.0; int ii; for(ii=0; ii<(pRtree->nDim*2); ii+=2){ - margin += (DCOORD(p->aCoord[ii+1]) - DCOORD(p->aCoord[ii])); + margin += (float)(DCOORD(p->aCoord[ii+1]) - DCOORD(p->aCoord[ii])); } return margin; } @@ -1519,7 +1519,7 @@ static float cellOverlap( o = 0.0; break; }else{ - o = o * (x2-x1); + o = o * (float)(x2-x1); } } overlap += o; @@ -1538,12 +1538,12 @@ static float cellOverlapEnlargement( int nCell, int iExclude ){ - float before; - float after; + double before; + double after; before = cellOverlap(pRtree, p, aCell, nCell, iExclude); cellUnion(pRtree, p, pInsert); after = cellOverlap(pRtree, p, aCell, nCell, iExclude); - return after-before; + return (float)(after-before); } #endif @@ -2488,19 +2488,19 @@ static int Reinsert( } aOrder[ii] = ii; for(iDim=0; iDimnDim; iDim++){ - aCenterCoord[iDim] += DCOORD(aCell[ii].aCoord[iDim*2]); - aCenterCoord[iDim] += DCOORD(aCell[ii].aCoord[iDim*2+1]); + aCenterCoord[iDim] += (float)DCOORD(aCell[ii].aCoord[iDim*2]); + aCenterCoord[iDim] += (float)DCOORD(aCell[ii].aCoord[iDim*2+1]); } } for(iDim=0; iDimnDim; iDim++){ - aCenterCoord[iDim] = aCenterCoord[iDim]/((float)nCell*2.0); + aCenterCoord[iDim] = (float)(aCenterCoord[iDim]/((float)nCell*2.0)); } for(ii=0; iinDim; iDim++){ - float coord = DCOORD(aCell[ii].aCoord[iDim*2+1]) - - DCOORD(aCell[ii].aCoord[iDim*2]); + float coord = (float)(DCOORD(aCell[ii].aCoord[iDim*2+1]) - + DCOORD(aCell[ii].aCoord[iDim*2])); aDistance[ii] += (coord-aCenterCoord[iDim])*(coord-aCenterCoord[iDim]); } } @@ -2599,10 +2599,10 @@ static int reinsertNodeContent(Rtree *pRtree, RtreeNode *pNode){ /* Find a node to store this cell in. pNode->iNode currently contains ** the height of the sub-tree headed by the cell. */ - rc = ChooseLeaf(pRtree, &cell, pNode->iNode, &pInsert); + rc = ChooseLeaf(pRtree, &cell, (int)pNode->iNode, &pInsert); if( rc==SQLITE_OK ){ int rc2; - rc = rtreeInsertCell(pRtree, pInsert, &cell, pNode->iNode); + rc = rtreeInsertCell(pRtree, pInsert, &cell, (int)pNode->iNode); rc2 = nodeRelease(pRtree, pInsert); if( rc==SQLITE_OK ){ rc = rc2; diff --git a/manifest b/manifest index 759693be1c..3183aad3c0 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\scompiler\swarnings\sin\slemon\sby\sremoving\ssome\sof\sthe\scode\sadded\sby\nRyan\sGordon\sin\s[1e8b842039cc0]. -D 2011-06-20T18:27:23.761 +C More\scompiler\swarning\sfixes. +D 2011-06-20T19:00:30.991 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -62,9 +62,9 @@ F ext/fts2/mkfts2amal.tcl 974d5d438cb3f7c4a652639262f82418c1e4cff0 F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a F ext/fts3/README.tokenizers 998756696647400de63d5ba60e9655036cb966e9 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d -F ext/fts3/fts3.c e9c4b571212229ace32dc98e5e69e619efd3e2c2 +F ext/fts3/fts3.c f63086fc75c3b70025f2917d211c1b5ea0d41113 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe -F ext/fts3/fts3Int.h 8ece4390eb44e7179bb05c59d40f447663f5c077 +F ext/fts3/fts3Int.h fa493ccbad78a2c99ad1c984f651c0c202e68536 F ext/fts3/fts3_aux.c 0ebfa7b86cf8ff6a0861605fcc63b83ec1b70691 F ext/fts3/fts3_expr.c 23791de01b3a5d313d76e02befd2601d4096bc2b F ext/fts3/fts3_hash.c aad95afa01cf2a5ffaa448e4b0ab043880cd1efb @@ -77,14 +77,14 @@ F ext/fts3/fts3_test.c c0aae3219df989d3e827d07846097adf8cb09945 F ext/fts3/fts3_tokenizer.c 6089986ebcfc19d4b7aabd2b92773368efa4354f F ext/fts3/fts3_tokenizer.h 13ffd9fcb397fec32a05ef5cd9e0fa659bf3dbd3 F ext/fts3/fts3_tokenizer1.c 0dde8f307b8045565cf63797ba9acfaff1c50c68 -F ext/fts3/fts3_write.c 5774a7ee9632355ebf1ec4b7a5071fc9ab9eb956 +F ext/fts3/fts3_write.c 194829c8fd024a448fc899e5ff02a8ed06595529 F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9 F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100 F ext/icu/README.txt bf8461d8cdc6b8f514c080e4e10dc3b2bbdfefa9 F ext/icu/icu.c eb9ae1d79046bd7871aa97ee6da51eb770134b5a F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761 -F ext/rtree/rtree.c 19ed115ba75b8e0815f572cfaa7f864b89523a90 +F ext/rtree/rtree.c b431c54d1ed05f04f2987e8a4fbb931acb40c312 F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e F ext/rtree/rtree1.test 28e1b8da4da98093ce3210187434dd760a8d89d8 F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba @@ -187,7 +187,7 @@ F src/sqliteInt.h 7b7ec2394b94fc4516930cd9dae37af0f9312215 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e -F src/tclsqlite.c c124d55e3e7d156c0fcc62c7f9906de8451547dc +F src/tclsqlite.c 5db825be61708b1a2b3f8f6e185e9b753829acef F src/test1.c efca486a25fb894988e7a82e84579a4e57388a02 F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31 F src/test3.c 124ff9735fb6bb7d41de180d6bac90e7b1509432 @@ -946,7 +946,7 @@ F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d -P f69ed286ffb3f62f5cb5c1f7df55fa4d2468b472 -R 85fd773d96f76df373ae8654723885fd +P 76b18b2be072b9ea242df4c9535059f7b43f564b +R 78c1df97ed01817ae07c84e5770b39c1 U drh -Z 8273f766e9b20e2bd5443eed5877e83e +Z 0807b7361b2e2ddd7ca414b20f006eb7 diff --git a/manifest.uuid b/manifest.uuid index ab322380b7..398fbf956a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -76b18b2be072b9ea242df4c9535059f7b43f564b \ No newline at end of file +ed2dda9329ca42e9c0be1986c78b091051e7598f \ No newline at end of file diff --git a/src/tclsqlite.c b/src/tclsqlite.c index 0e712f7d3f..ad4d27a126 100644 --- a/src/tclsqlite.c +++ b/src/tclsqlite.c @@ -761,7 +761,7 @@ static void tclSqlFunc(sqlite3_context *context, int argc, sqlite3_value**argv){ case SQLITE_INTEGER: { sqlite_int64 v = sqlite3_value_int64(pIn); if( v>=-2147483647 && v<=2147483647 ){ - pVal = Tcl_NewIntObj(v); + pVal = Tcl_NewIntObj((int)v); }else{ pVal = Tcl_NewWideIntObj(v); } @@ -1441,7 +1441,7 @@ static Tcl_Obj *dbEvalColumnValue(DbEvalContext *p, int iCol){ case SQLITE_INTEGER: { sqlite_int64 v = sqlite3_column_int64(pStmt, iCol); if( v>=-2147483647 && v<=2147483647 ){ - return Tcl_NewIntObj(v); + return Tcl_NewIntObj((int)v); }else{ return Tcl_NewWideIntObj(v); } @@ -2367,7 +2367,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){ } if( zNull && len>0 ){ pDb->zNull = Tcl_Alloc( len + 1 ); - strncpy(pDb->zNull, zNull, len); + memcpy(pDb->zNull, zNull, len); pDb->zNull[len] = '\0'; }else{ pDb->zNull = 0; From a1dd92c57fab8193a3ad7ea1e0338e1219f9c312 Mon Sep 17 00:00:00 2001 From: drh Date: Mon, 20 Jun 2011 20:15:53 +0000 Subject: [PATCH 08/15] Remove the SQLITE_OMIT_CONFLICT_CLAUSE preprocessor define which was no longer in use. FossilOrigin-Name: 9024955973e90661c99efa2aad1f8c421ee93802 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/test_config.c | 4 ---- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/manifest b/manifest index 3183aad3c0..b12666d52e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C More\scompiler\swarning\sfixes. -D 2011-06-20T19:00:30.991 +C Remove\sthe\sSQLITE_OMIT_CONFLICT_CLAUSE\spreprocessor\sdefine\swhich\swas\sno\nlonger\sin\suse. +D 2011-06-20T20:15:53.770 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -201,7 +201,7 @@ F src/test_async.c 0612a752896fad42d55c3999a5122af10dcf22ad F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de F src/test_btree.c 47cd771250f09cdc6e12dda5bc71bc0b3abc96e2 -F src/test_config.c 9a6aa8301a56906612b5e70f5b38e80cfb8af8e7 +F src/test_config.c 791a9acbf9a695cf9c12ff6bbe874dfde9a8c5f3 F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094 F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc F src/test_func.c cbdec5cededa0761daedde5baf06004a9bf416b5 @@ -946,7 +946,7 @@ F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d -P 76b18b2be072b9ea242df4c9535059f7b43f564b -R 78c1df97ed01817ae07c84e5770b39c1 +P ed2dda9329ca42e9c0be1986c78b091051e7598f +R 2e13d3ea53d110b2e8107877a848a618 U drh -Z 0807b7361b2e2ddd7ca414b20f006eb7 +Z f04a5198d0b0503bfb4459f637e20be0 diff --git a/manifest.uuid b/manifest.uuid index 398fbf956a..75b286af06 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ed2dda9329ca42e9c0be1986c78b091051e7598f \ No newline at end of file +9024955973e90661c99efa2aad1f8c421ee93802 \ No newline at end of file diff --git a/src/test_config.c b/src/test_config.c index 92f343f458..a2796c772a 100644 --- a/src/test_config.c +++ b/src/test_config.c @@ -225,11 +225,7 @@ static void set_options(Tcl_Interp *interp){ Tcl_SetVar2(interp, "sqlite_options", "compound", "1", TCL_GLOBAL_ONLY); #endif -#ifdef SQLITE_OMIT_CONFLICT_CLAUSE - Tcl_SetVar2(interp, "sqlite_options", "conflict", "0", TCL_GLOBAL_ONLY); -#else Tcl_SetVar2(interp, "sqlite_options", "conflict", "1", TCL_GLOBAL_ONLY); -#endif #if SQLITE_OS_UNIX Tcl_SetVar2(interp, "sqlite_options", "crashtest", "1", TCL_GLOBAL_ONLY); From 8a17be02f1f59c27051a1c984a63a3b5e00fba78 Mon Sep 17 00:00:00 2001 From: drh Date: Mon, 20 Jun 2011 20:39:12 +0000 Subject: [PATCH 09/15] Fix documentation typos. No changes to code. FossilOrigin-Name: 3276f3f7c90e356a9715f6b0a95cf48169f8d9f0 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/sqlite.h.in | 18 +++++++++--------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/manifest b/manifest index b12666d52e..baf7aa89b4 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Remove\sthe\sSQLITE_OMIT_CONFLICT_CLAUSE\spreprocessor\sdefine\swhich\swas\sno\nlonger\sin\suse. -D 2011-06-20T20:15:53.770 +C Fix\sdocumentation\stypos.\s\sNo\schanges\sto\scode. +D 2011-06-20T20:39:12.063 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -181,7 +181,7 @@ F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697 F src/select.c d9d440809025a58547e39f4f268c2a296bfb56ff F src/shell.c 0e0173b3e79d956368013e759f084caa7995ecb1 -F src/sqlite.h.in 2f51e4f58b2b4626fcbd9938580e730cb5fb4985 +F src/sqlite.h.in a4d0baabe4f86b3ab9cf56eda23dfd9d022ece0a F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754 F src/sqliteInt.h 7b7ec2394b94fc4516930cd9dae37af0f9312215 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d @@ -946,7 +946,7 @@ F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d -P ed2dda9329ca42e9c0be1986c78b091051e7598f -R 2e13d3ea53d110b2e8107877a848a618 +P 9024955973e90661c99efa2aad1f8c421ee93802 +R 96b31f6fed29106661e42f2100d8d49c U drh -Z f04a5198d0b0503bfb4459f637e20be0 +Z db5a97582df1de0a92a50868e533957b diff --git a/manifest.uuid b/manifest.uuid index 75b286af06..fa2a777437 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9024955973e90661c99efa2aad1f8c421ee93802 \ No newline at end of file +3276f3f7c90e356a9715f6b0a95cf48169f8d9f0 \ No newline at end of file diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 593e9148fe..1871675236 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -305,7 +305,7 @@ typedef int (*sqlite3_callback)(void*,int,char**, char**); ** argument. ^If the callback function of the 3rd argument to ** sqlite3_exec() is not NULL, then it is invoked for each result row ** coming out of the evaluated SQL statements. ^The 4th argument to -** to sqlite3_exec() is relayed through to the 1st argument of each +** sqlite3_exec() is relayed through to the 1st argument of each ** callback invocation. ^If the callback pointer to sqlite3_exec() ** is NULL, then no callback is ever invoked and result rows are ** ignored. @@ -897,7 +897,7 @@ typedef struct sqlite3_mutex sqlite3_mutex; ** method returns a Julian Day Number for the current date and time as ** a floating point value. ** ^The xCurrentTimeInt64() method returns, as an integer, the Julian -** Day Number multipled by 86400000 (the number of milliseconds in +** Day Number multiplied by 86400000 (the number of milliseconds in ** a 24-hour day). ** ^SQLite will use the xCurrentTimeInt64() method to get the current ** date and time if that method is available (if iVersion is 2 or @@ -1335,7 +1335,7 @@ struct sqlite3_mem_methods { ** ** [[SQLITE_CONFIG_PAGECACHE]]
SQLITE_CONFIG_PAGECACHE
**
^This option specifies a static memory buffer that SQLite can use for -** the database page cache with the default page cache implemenation. +** the database page cache with the default page cache implementation. ** This configuration should not be used if an application-define page ** cache implementation is loaded using the SQLITE_CONFIG_PCACHE option. ** There are three arguments to this option: A pointer to 8-byte aligned @@ -2433,12 +2433,12 @@ void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*); ** ^If [URI filename] interpretation is enabled, and the filename argument ** begins with "file:", then the filename is interpreted as a URI. ^URI ** filename interpretation is enabled if the [SQLITE_OPEN_URI] flag is -** is set in the fourth argument to sqlite3_open_v2(), or if it has +** set in the fourth argument to sqlite3_open_v2(), or if it has ** been enabled globally using the [SQLITE_CONFIG_URI] option with the ** [sqlite3_config()] method or by the [SQLITE_USE_URI] compile-time option. ** As of SQLite version 3.7.7, URI filename interpretation is turned off ** by default, but future releases of SQLite might enable URI filename -** intepretation by default. See "[URI filenames]" for additional +** interpretation by default. See "[URI filenames]" for additional ** information. ** ** URI filenames are parsed according to RFC 3986. ^If the URI contains an @@ -3257,7 +3257,7 @@ const void *sqlite3_column_decltype16(sqlite3_stmt*,int); ** ^[SQLITE_BUSY] means that the database engine was unable to acquire the ** database locks it needs to do its job. ^If the statement is a [COMMIT] ** or occurs outside of an explicit transaction, then you can retry the -** statement. If the statement is not a [COMMIT] and occurs within a +** statement. If the statement is not a [COMMIT] and occurs within an ** explicit transaction then you should rollback the transaction before ** continuing. ** @@ -3536,7 +3536,7 @@ sqlite3_value *sqlite3_column_value(sqlite3_stmt*, int iCol); ** CAPI3REF: Destroy A Prepared Statement Object ** ** ^The sqlite3_finalize() function is called to delete a [prepared statement]. -** ^If the most recent evaluation of the statement encountered no errors or +** ^If the most recent evaluation of the statement encountered no errors ** or if the statement is never been evaluated, then sqlite3_finalize() returns ** SQLITE_OK. ^If the most recent evaluation of statement S failed, then ** sqlite3_finalize(S) returns the appropriate [error code] or @@ -5450,7 +5450,7 @@ struct sqlite3_mutex_methods { ** ** ^If the argument to sqlite3_mutex_held() is a NULL pointer then ** the routine should return 1. This seems counter-intuitive since -** clearly the mutex cannot be held if it does not exist. But the +** clearly the mutex cannot be held if it does not exist. But ** the reason the mutex does not exist is because the build is not ** using mutexes. And we do not want the assert() containing the ** call to sqlite3_mutex_held() to fail, so a non-zero return is @@ -5959,7 +5959,7 @@ typedef struct sqlite3_pcache sqlite3_pcache; ** the page, or a NULL pointer. ** A "page", in this context, means a buffer of szPage bytes aligned at an ** 8-byte boundary. The page to be fetched is determined by the key. ^The -** mimimum key value is 1. After it has been retrieved using xFetch, the page +** minimum key value is 1. After it has been retrieved using xFetch, the page ** is considered to be "pinned". ** ** If the requested page is already in the page cache, then the page cache From eeb5d8aae82570c5d45f585830d6431d585fcd4e Mon Sep 17 00:00:00 2001 From: shaneh Date: Mon, 20 Jun 2011 20:48:09 +0000 Subject: [PATCH 10/15] Add additional error check for disk full on Windows. FossilOrigin-Name: 3ee5d1a51d6347858734b7b595771ae9cd2cc89d --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/os_win.c | 3 ++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index baf7aa89b4..8bb943e2f3 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sdocumentation\stypos.\s\sNo\schanges\sto\scode. -D 2011-06-20T20:39:12.063 +C Add\sadditional\serror\scheck\sfor\sdisk\sfull\son\sWindows. +D 2011-06-20T20:48:09.429 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -166,7 +166,7 @@ F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9 F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440 F src/os_unix.c 07acbb3e074e52b48a4248c06f66c9a91db1a0ce -F src/os_win.c 218b899469e570d46eb8147c2383075f7c026230 +F src/os_win.c eafcd6b91cf204a7ef29ac1ef2a1b7132e132e58 F src/pager.c 120550e7ef01dafaa2cbb4a0528c0d87c8f12b41 F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1 F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58 @@ -946,7 +946,7 @@ F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d -P 9024955973e90661c99efa2aad1f8c421ee93802 -R 96b31f6fed29106661e42f2100d8d49c -U drh -Z db5a97582df1de0a92a50868e533957b +P 3276f3f7c90e356a9715f6b0a95cf48169f8d9f0 +R 36f6f0e4631f704d65d595ab5602f5ae +U shaneh +Z 2fbdfbb10586425f4553f2f3aade499b diff --git a/manifest.uuid b/manifest.uuid index fa2a777437..805aa05c23 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -3276f3f7c90e356a9715f6b0a95cf48169f8d9f0 \ No newline at end of file +3ee5d1a51d6347858734b7b595771ae9cd2cc89d \ No newline at end of file diff --git a/src/os_win.c b/src/os_win.c index b3e47f8363..bd0f2f216a 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -878,7 +878,8 @@ static int winWrite( } if( rc ){ - if( pFile->lastErrno==ERROR_HANDLE_DISK_FULL ){ + if( ( pFile->lastErrno==ERROR_HANDLE_DISK_FULL ) + || ( pFile->lastErrno==ERROR_DISK_FULL )){ return SQLITE_FULL; } return winLogError(SQLITE_IOERR_WRITE, "winWrite", pFile->zPath); From 2e2f36b4ed44a8f2d616dcc89ac5547dd31be5d8 Mon Sep 17 00:00:00 2001 From: shaneh Date: Mon, 20 Jun 2011 20:50:49 +0000 Subject: [PATCH 11/15] Fix a couple of compiler issues on Windows due to warning clean up. FossilOrigin-Name: 81e6f151d384fa1f1474175b39ad6dfa64f8da0d --- ext/fts3/fts3.c | 4 ++-- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c index 05564f7849..2cbcbff89e 100644 --- a/ext/fts3/fts3.c +++ b/ext/fts3/fts3.c @@ -2680,8 +2680,8 @@ static int fts3SyncMethod(sqlite3_vtab *pVtab){ ** Implementation of xBegin() method. This is a no-op. */ static int fts3BeginMethod(sqlite3_vtab *pVtab){ - UNUSED_PARAMETER(pVtab); TESTONLY( Fts3Table *p = (Fts3Table*)pVtab ); + UNUSED_PARAMETER(pVtab); assert( p->pSegments==0 ); assert( p->nPendingData==0 ); assert( p->inTransaction!=1 ); @@ -2696,8 +2696,8 @@ static int fts3BeginMethod(sqlite3_vtab *pVtab){ ** by fts3SyncMethod(). */ static int fts3CommitMethod(sqlite3_vtab *pVtab){ - UNUSED_PARAMETER(pVtab); TESTONLY( Fts3Table *p = (Fts3Table*)pVtab ); + UNUSED_PARAMETER(pVtab); assert( p->nPendingData==0 ); assert( p->inTransaction!=0 ); assert( p->pSegments==0 ); diff --git a/manifest b/manifest index 8bb943e2f3..263e473734 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sadditional\serror\scheck\sfor\sdisk\sfull\son\sWindows. -D 2011-06-20T20:48:09.429 +C Fix\sa\scouple\sof\scompiler\sissues\son\sWindows\sdue\sto\swarning\sclean\sup. +D 2011-06-20T20:50:49.490 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -62,7 +62,7 @@ F ext/fts2/mkfts2amal.tcl 974d5d438cb3f7c4a652639262f82418c1e4cff0 F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a F ext/fts3/README.tokenizers 998756696647400de63d5ba60e9655036cb966e9 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d -F ext/fts3/fts3.c f63086fc75c3b70025f2917d211c1b5ea0d41113 +F ext/fts3/fts3.c 1c8a45dfd6836e7dea0307008079793ac0fc3b68 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe F ext/fts3/fts3Int.h fa493ccbad78a2c99ad1c984f651c0c202e68536 F ext/fts3/fts3_aux.c 0ebfa7b86cf8ff6a0861605fcc63b83ec1b70691 @@ -946,7 +946,7 @@ F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d -P 3276f3f7c90e356a9715f6b0a95cf48169f8d9f0 -R 36f6f0e4631f704d65d595ab5602f5ae +P 3ee5d1a51d6347858734b7b595771ae9cd2cc89d +R 38b91ba83a0690d05159e3865af95b9c U shaneh -Z 2fbdfbb10586425f4553f2f3aade499b +Z 2b8dce98f298f90cca367918eb5b7523 diff --git a/manifest.uuid b/manifest.uuid index 805aa05c23..09c8cdcb30 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -3ee5d1a51d6347858734b7b595771ae9cd2cc89d \ No newline at end of file +81e6f151d384fa1f1474175b39ad6dfa64f8da0d \ No newline at end of file From 2a0b9ef0649076690d22aa441382a57e330d648f Mon Sep 17 00:00:00 2001 From: shaneh Date: Mon, 20 Jun 2011 20:52:32 +0000 Subject: [PATCH 12/15] Add ability to pass linker specific options to nmake makefile. FossilOrigin-Name: b4f09c9393ce703062170220af20a23fdcf53494 --- Makefile.msc | 24 +++++++++++++++++------- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/Makefile.msc b/Makefile.msc index 68a66bcb45..1de682b854 100644 --- a/Makefile.msc +++ b/Makefile.msc @@ -26,7 +26,7 @@ BCC = cl.exe -O2 # will run on the target platform. (BCC and TCC are usually the # same unless your are cross-compiling.) # -TCC = cl.exe -W3 -O2 -DSQLITE_OS_WIN=1 -I. -I$(TOP)\src +TCC = cl.exe -W3 -O2 -DSQLITE_OS_WIN=1 -I. -I$(TOP)\src -fp:precise # The mksqlite3c.tcl and mksqlite3h.tcl scripts will pull in # any extension header files by default. For non-amalgamation @@ -105,8 +105,16 @@ TCC = $(TCC) $(OPTS) # libtool compile/link LTCOMPILE = $(TCC) -Fo$@ -LTLINK = $(TCC) -Fe$@ LTLIB = lib.exe +LTLINK = $(TCC) -Fe$@ + +# If a platform was set, force the linker to target that. +# Note that the vcvars*.bat family of batch files typically +# set this for you. Otherwise, the linker will attempt +# to deduce the binary type based on the object files. +!IF "$(PLATFORM)"!="" +LTLINKOPTS = /MACHINE:$(PLATFORM) +!ENDIF # nawk compatible awk. NAWK = .\gawk.exe @@ -440,8 +448,8 @@ libtclsqlite3.lib: tclsqlite.lo libsqlite3.lib sqlite3.exe: $(TOP)\src\shell.c libsqlite3.lib sqlite3.h $(LTLINK) $(READLINE_FLAGS) \ - $(TOP)\src\shell.c libsqlite3.lib \ - $(LIBREADLINE) $(TLIBS) + $(TOP)\src\shell.c \ + /link $(LTLINKOPTS) libsqlite3.lib $(LIBREADLINE) $(TLIBS) # This target creates a directory named "tsrc" and fills it with # copies of all of the C source code and header files needed to @@ -706,7 +714,7 @@ tclsqlite-shell.lo: $(TOP)\src\tclsqlite.c $(HDR) tclsqlite3.exe: tclsqlite-shell.lo libsqlite3.lib $(LTLINK) tclsqlite-shell.lo \ - /link /LIBPATH:$(TCLLIBDIR) libsqlite3.lib $(LIBTCL) + /link $(LTLINKOPTS) /LIBPATH:$(TCLLIBDIR) libsqlite3.lib $(LIBTCL) # Rules to build opcodes.c and opcodes.h # @@ -816,7 +824,8 @@ TESTFIXTURE_SRC = $(TESTSRC) $(TOP)\src\tclsqlite.c $(TESTFIXTURE_SRC1) testfixture.exe: $(TESTFIXTURE_SRC) $(HDR) $(LTLINK) -DSQLITE_NO_SYNC=1 $(TESTFIXTURE_FLAGS) \ -DBUILD_sqlite -I$(TCLINCDIR) \ - $(TESTFIXTURE_SRC) /link /LIBPATH:$(TCLLIBDIR) $(LIBTCL) $(TLIBS) + $(TESTFIXTURE_SRC) \ + /link $(LTLINKOPTS) /LIBPATH:$(TCLLIBDIR) $(LIBTCL) $(TLIBS) fulltest: testfixture.exe sqlite3.exe .\testfixture.exe $(TOP)\test\all.test @@ -835,7 +844,8 @@ sqlite3_analyzer.exe: $(TESTFIXTURE_SRC) spaceanal_tcl.h $(LTLINK) -DTCLSH=2 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1 \ -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE \ -DBUILD_sqlite -I$(TCLINCDIR) \ - $(TESTFIXTURE_SRC) /link /LIBPATH:$(TCLLIBDIR) $(LIBTCL) $(TLIBS) + $(TESTFIXTURE_SRC) \ + /link $(LTLINKOPTS) /LIBPATH:$(TCLLIBDIR) $(LIBTCL) $(TLIBS) clean: del /Q *.lo *.lib *.obj sqlite3.exe libsqlite3.lib diff --git a/manifest b/manifest index 263e473734..3e1e8e33fc 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Fix\sa\scouple\sof\scompiler\sissues\son\sWindows\sdue\sto\swarning\sclean\sup. -D 2011-06-20T20:50:49.490 +C Add\sability\sto\spass\slinker\sspecific\soptions\sto\snmake\smakefile. +D 2011-06-20T20:52:32.797 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 -F Makefile.msc ce73810c83d4bd202deb59d547a5df4a5cfef7c9 +F Makefile.msc c942f2ceb9385d6c75b01ee3d38d8a189fb76e8c F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6 F VERSION 3fcdd7fbe3eb282df3978fe77288544543767961 @@ -946,7 +946,7 @@ F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d -P 3ee5d1a51d6347858734b7b595771ae9cd2cc89d -R 38b91ba83a0690d05159e3865af95b9c +P 81e6f151d384fa1f1474175b39ad6dfa64f8da0d +R 388ef8da117dd58630bcba36b4ab36b5 U shaneh -Z 2b8dce98f298f90cca367918eb5b7523 +Z 93f23f7fb76ab7ba5824bd093c1cad99 diff --git a/manifest.uuid b/manifest.uuid index 09c8cdcb30..5414dd039f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -81e6f151d384fa1f1474175b39ad6dfa64f8da0d \ No newline at end of file +b4f09c9393ce703062170220af20a23fdcf53494 \ No newline at end of file From ef8662bb650e2d79547fac4972287bd7ae70e74c Mon Sep 17 00:00:00 2001 From: drh Date: Mon, 20 Jun 2011 21:47:58 +0000 Subject: [PATCH 13/15] Fix more documentation typos. FossilOrigin-Name: b9cbab739a62f497545161f30195272f4e687a7f --- manifest | 16 ++++++++-------- manifest.uuid | 2 +- src/test_thread.c | 6 +++--- src/vdbe.c | 16 ++++++++-------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/manifest b/manifest index 3e1e8e33fc..a73f03c652 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sability\sto\spass\slinker\sspecific\soptions\sto\snmake\smakefile. -D 2011-06-20T20:52:32.797 +C Fix\smore\sdocumentation\stypos. +D 2011-06-20T21:47:58.852 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -227,7 +227,7 @@ F src/test_stat.c f682704b5d1ba8e1d4e7e882a6d7922e2dcf066c F src/test_superlock.c 2b97936ca127d13962c3605dbc9a4ef269c424cd F src/test_syscall.c 162c4ec0137a549c009bb9ecab550527743cfc5d F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa -F src/test_thread.c 361ae0a0f1cbf5a28ad0388a258b104017a370c0 +F src/test_thread.c fe9a7803fc1d69cccb60f016f28c1cedf2d9fcfa F src/test_vfs.c e7855568dfa1e0ba73668d273b65605d9f8b77e8 F src/test_vfstrace.c 0b884e06094a746da729119a2cabdc7aa790063d F src/test_wholenumber.c 6129adfbe7c7444f2e60cc785927f3aa74e12290 @@ -238,7 +238,7 @@ F src/update.c 80d77311d91ebc06b27149e75701f1b3e9356622 F src/utf.c c53eb7404b3eb5c1cbb5655c6a7a0e0ce6bd50f0 F src/util.c 0f33bbbdfcc4a2d8cf20c3b2a16ffc3b57c58a70 F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e -F src/vdbe.c 9eef9bb0d4a0de06cf904476eadf58395971e35a +F src/vdbe.c 50b5b4ef29d928a4f60905f820ee1ab2f8ced29f F src/vdbe.h 5cf09e7ee8a3f7d93bc51f196a96550786afe7a1 F src/vdbeInt.h ad84226cc0adcb1185c22b70696b235a1678bb45 F src/vdbeapi.c 0eeadc75e44a30efd996d6af6e7c5a2488e35be8 @@ -946,7 +946,7 @@ F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d -P 81e6f151d384fa1f1474175b39ad6dfa64f8da0d -R 388ef8da117dd58630bcba36b4ab36b5 -U shaneh -Z 93f23f7fb76ab7ba5824bd093c1cad99 +P b4f09c9393ce703062170220af20a23fdcf53494 +R c603a648180bca7d3947c59e7b39857a +U drh +Z fdef6d940494abc4b720172bd995c022 diff --git a/manifest.uuid b/manifest.uuid index 5414dd039f..d5f186c1b6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b4f09c9393ce703062170220af20a23fdcf53494 \ No newline at end of file +b9cbab739a62f497545161f30195272f4e687a7f \ No newline at end of file diff --git a/src/test_thread.c b/src/test_thread.c index ef191bc2d7..3a13dd6689 100644 --- a/src/test_thread.c +++ b/src/test_thread.c @@ -404,9 +404,9 @@ static int clock_seconds_proc( */ typedef struct UnlockNotification UnlockNotification; struct UnlockNotification { - int fired; /* True after unlock event has occured */ - pthread_cond_t cond; /* Condition variable to wait on */ - pthread_mutex_t mutex; /* Mutex to protect structure */ + int fired; /* True after unlock event has occurred */ + pthread_cond_t cond; /* Condition variable to wait on */ + pthread_mutex_t mutex; /* Mutex to protect structure */ }; /* diff --git a/src/vdbe.c b/src/vdbe.c index a55cee1e99..d965b967a3 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -797,7 +797,7 @@ case OP_Yield: { /* in1 */ /* Opcode: HaltIfNull P1 P2 P3 P4 * ** -** Check the value in register P3. If is is NULL then Halt using +** Check the value in register P3. If it is NULL then Halt using ** parameter P1, P2, and P4 as if this were a Halt instruction. If the ** value in register P3 is not NULL, then this routine is a no-op. */ @@ -1720,7 +1720,7 @@ case OP_ToReal: { /* same as TK_TO_REAL, in1 */ ** If SQLITE_NULLEQ is set in P5 then the result of comparison is always either ** true or false and is never NULL. If both operands are NULL then the result ** of comparison is false. If either operand is NULL then the result is true. -** If neither operand is NULL the the result is the same as it would be if +** If neither operand is NULL the result is the same as it would be if ** the SQLITE_NULLEQ flag were omitted from P5. */ /* Opcode: Eq P1 P2 P3 P4 P5 @@ -1732,7 +1732,7 @@ case OP_ToReal: { /* same as TK_TO_REAL, in1 */ ** If SQLITE_NULLEQ is set in P5 then the result of comparison is always either ** true or false and is never NULL. If both operands are NULL then the result ** of comparison is true. If either operand is NULL then the result is false. -** If neither operand is NULL the the result is the same as it would be if +** If neither operand is NULL the result is the same as it would be if ** the SQLITE_NULLEQ flag were omitted from P5. */ /* Opcode: Le P1 P2 P3 P4 P5 @@ -2011,13 +2011,13 @@ case OP_BitNot: { /* same as TK_BITNOT, in1, out2 */ /* Opcode: If P1 P2 P3 * * ** -** Jump to P2 if the value in register P1 is true. The value is +** Jump to P2 if the value in register P1 is true. The value ** is considered true if it is numeric and non-zero. If the value ** in P1 is NULL then take the jump if P3 is true. */ /* Opcode: IfNot P1 P2 P3 * * ** -** Jump to P2 if the value in register P1 is False. The value is +** Jump to P2 if the value in register P1 is False. The value ** is considered true if it has a numeric value of zero. If the value ** in P1 is NULL then take the jump if P3 is true. */ @@ -3635,7 +3635,7 @@ case OP_IsUnique: { /* jump, in3 */ /* Opcode: NotExists P1 P2 P3 * * ** -** Use the content of register P3 as a integer key. If a record +** Use the content of register P3 as an integer key. If a record ** with that key does not exist in table of P1, then jump to P2. ** If the record does exist, then fall through. The cursor is left ** pointing to the record if it exists. @@ -3711,7 +3711,7 @@ case OP_Sequence: { /* out2-prerelease */ ** If P3>0 then P3 is a register in the root frame of this VDBE that holds ** the largest previously generated record number. No new record numbers are ** allowed to be less than this value. When this value reaches its maximum, -** a SQLITE_FULL error is generated. The P3 register is updated with the ' +** an SQLITE_FULL error is generated. The P3 register is updated with the ' ** generated record number. This P3 mechanism is used to help implement the ** AUTOINCREMENT feature. */ @@ -4335,7 +4335,7 @@ case OP_Next: { /* jump */ /* Opcode: IdxInsert P1 P2 P3 * P5 ** -** Register P2 holds a SQL index key made using the +** Register P2 holds an SQL index key made using the ** MakeRecord instructions. This opcode writes that key ** into the index P1. Data for the entry is nil. ** From 1a475194b4909d02075d1909fc0f7dc6103e1604 Mon Sep 17 00:00:00 2001 From: drh Date: Mon, 20 Jun 2011 22:34:50 +0000 Subject: [PATCH 14/15] Fix typos in evidence marks on tests. FossilOrigin-Name: bd980be471b185e2dc45875804103d5afc8f78cf --- manifest | 18 +++++++++--------- manifest.uuid | 2 +- test/e_delete.test | 2 +- test/e_insert.test | 2 +- test/e_select.test | 6 +++--- test/e_uri.test | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/manifest b/manifest index a73f03c652..fd53a2b7fc 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\smore\sdocumentation\stypos. -D 2011-06-20T21:47:58.852 +C Fix\stypos\sin\sevidence\smarks\son\stests. +D 2011-06-20T22:34:50.122 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -370,19 +370,19 @@ F test/descidx3.test fe720e8b37d59f4cef808b0bf4e1b391c2e56b6f F test/diskfull.test 0cede7ef9d8f415d9d3944005c76be7589bb5ebb F test/distinctagg.test 1a6ef9c87a58669438fc771450d7a72577417376 F test/e_createtable.test 4771686a586b6ae414f927c389b2c101cc05c028 -F test/e_delete.test 55d868b647acc091c261a10b9b0cb0ab660a6acb +F test/e_delete.test e2ae0d3fce5efd70fef99025e932afffc5616fab F test/e_droptrigger.test ddd4b28ed8a3d81bd5153fa0ab7559529a2ca03a F test/e_dropview.test b347bab30fc8de67b131594b3cd6f3d3bdaa753d F test/e_expr.test 9e8b9790803df4de23c2d68d566959934a6179d4 F test/e_fkey.test 38039b840ab19331000b0f0eb1d82baa7208a67a F test/e_fts3.test 75bb0aee26384ef586165e21018a17f7cd843469 -F test/e_insert.test 7390c2da39f16a134dc9a439144768c727757d2c +F test/e_insert.test 76d4bb5da9b28014d515d91ffe29a79a1e99f2bc F test/e_reindex.test a064f0878b8f848fbca38f1f61f82f15a3000c64 F test/e_resolve.test dcce9308fb13b934ce29591105d031d3e14fbba6 -F test/e_select.test bf385ae3aa0f014c4933ae66fd3e1302138493eb +F test/e_select.test 7ac53674e822d4d77bbb4a9a4aaefa5fdc9e493f F test/e_select2.test 5c3d3da19c7b3e90ae444579db2b70098599ab92 F test/e_update.test 963d6876064e65f318d1c93aaed36a02b9b389bf -F test/e_uri.test b6da43a10f44d9aa0aff5ffa3c2f3de668361255 +F test/e_uri.test 8b943bc63cd1abb037430214cdb618422e6bf7d6 F test/e_vacuum.test 6c09c2af7f2f140518f371c5342100118f779dcf F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea F test/enc2.test 6d91a5286f59add0cfcbb2d0da913b76f2242398 @@ -946,7 +946,7 @@ F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d -P b4f09c9393ce703062170220af20a23fdcf53494 -R c603a648180bca7d3947c59e7b39857a +P b9cbab739a62f497545161f30195272f4e687a7f +R 1f817dafc57d7060ce86fcbba44e24cf U drh -Z fdef6d940494abc4b720172bd995c022 +Z af694faf6d84b7161a6291503b697295 diff --git a/manifest.uuid b/manifest.uuid index d5f186c1b6..2e07f98484 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b9cbab739a62f497545161f30195272f4e687a7f \ No newline at end of file +bd980be471b185e2dc45875804103d5afc8f78cf \ No newline at end of file diff --git a/test/e_delete.test b/test/e_delete.test index de391b114b..c77d444226 100644 --- a/test/e_delete.test +++ b/test/e_delete.test @@ -440,7 +440,7 @@ do_delete_tests e_delete-3.9 -repair rebuild_t1 -query { } -# EVIDENCE-OF: R-26627-30313 The ORDER BY clause on an DELETE statement +# EVIDENCE-OF: R-07548-13422 The ORDER BY clause on a DELETE statement # is used only to determine which rows fall within the LIMIT. The order # in which rows are deleted is arbitrary and is not influenced by the # ORDER BY clause. diff --git a/test/e_insert.test b/test/e_insert.test index 2192f2e9fb..fe8bfcf8ef 100644 --- a/test/e_insert.test +++ b/test/e_insert.test @@ -152,7 +152,7 @@ do_insert_tests e_insert-1.2 -error { 4 "INSERT INTO a2 VALUES(1,2,3,4,5)" {a2 3 5} } -# EVIDENCE-OF: R-52422-65517 In this case the result of evaluting the +# EVIDENCE-OF: R-04006-57648 In this case the result of evaluating the # left-most expression in the VALUES list is inserted into the left-most # column of the new row, and so on. # diff --git a/test/e_select.test b/test/e_select.test index 79e334ce30..6194872fa5 100644 --- a/test/e_select.test +++ b/test/e_select.test @@ -1768,9 +1768,9 @@ do_select_tests e_select-8.5 { } } -# EVIDENCE-OF: R-27923-38747 Otherwise, if the ORDER BY expression is -# any other expression, it is evaluated and the the returned value used -# to order the output rows. +# EVIDENCE-OF: R-65068-27207 Otherwise, if the ORDER BY expression is +# any other expression, it is evaluated and the returned value used to +# order the output rows. # # EVIDENCE-OF: R-03421-57988 If the SELECT statement is a simple SELECT, # then an ORDER BY may contain any arbitrary expressions. diff --git a/test/e_uri.test b/test/e_uri.test index 3e47427941..b6ad54ea03 100644 --- a/test/e_uri.test +++ b/test/e_uri.test @@ -48,8 +48,8 @@ proc open_uri_error {uri} { # and the filename argument begins with "file:", then the filename is # interpreted as a URI. # -# EVIDENCE-OF: R-32637-34037 URI filename interpretation is enabled if -# the SQLITE_OPEN_URI flag is is set in the fourth argument to +# EVIDENCE-OF: R-24124-56960 URI filename interpretation is enabled if +# the SQLITE_OPEN_URI flag is set in the fourth argument to # sqlite3_open_v2(), or if it has been enabled globally using the # SQLITE_CONFIG_URI option with the sqlite3_config() method or by the # SQLITE_USE_URI compile-time option. From 3c22c604344462ab2cd3fa0be9a4ce4e101eb0b2 Mon Sep 17 00:00:00 2001 From: drh Date: Mon, 20 Jun 2011 23:51:33 +0000 Subject: [PATCH 15/15] More typo fixes in evidence marks. No code changes. FossilOrigin-Name: e60eefc76fa5066720d76858f6cfca56365330ee --- manifest | 14 +++++++------- manifest.uuid | 2 +- test/e_expr.test | 5 ++--- test/e_update.test | 5 ++--- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/manifest b/manifest index fd53a2b7fc..42f907d912 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\stypos\sin\sevidence\smarks\son\stests. -D 2011-06-20T22:34:50.122 +C More\stypo\sfixes\sin\sevidence\smarks.\s\sNo\scode\schanges. +D 2011-06-20T23:51:33.581 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -373,7 +373,7 @@ F test/e_createtable.test 4771686a586b6ae414f927c389b2c101cc05c028 F test/e_delete.test e2ae0d3fce5efd70fef99025e932afffc5616fab F test/e_droptrigger.test ddd4b28ed8a3d81bd5153fa0ab7559529a2ca03a F test/e_dropview.test b347bab30fc8de67b131594b3cd6f3d3bdaa753d -F test/e_expr.test 9e8b9790803df4de23c2d68d566959934a6179d4 +F test/e_expr.test 71b55f90c9336ecec5a99641679036931260c754 F test/e_fkey.test 38039b840ab19331000b0f0eb1d82baa7208a67a F test/e_fts3.test 75bb0aee26384ef586165e21018a17f7cd843469 F test/e_insert.test 76d4bb5da9b28014d515d91ffe29a79a1e99f2bc @@ -381,7 +381,7 @@ F test/e_reindex.test a064f0878b8f848fbca38f1f61f82f15a3000c64 F test/e_resolve.test dcce9308fb13b934ce29591105d031d3e14fbba6 F test/e_select.test 7ac53674e822d4d77bbb4a9a4aaefa5fdc9e493f F test/e_select2.test 5c3d3da19c7b3e90ae444579db2b70098599ab92 -F test/e_update.test 963d6876064e65f318d1c93aaed36a02b9b389bf +F test/e_update.test b926341a65955d69a6375c9eb4fd82e7089bc83a F test/e_uri.test 8b943bc63cd1abb037430214cdb618422e6bf7d6 F test/e_vacuum.test 6c09c2af7f2f140518f371c5342100118f779dcf F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea @@ -946,7 +946,7 @@ F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d -P b9cbab739a62f497545161f30195272f4e687a7f -R 1f817dafc57d7060ce86fcbba44e24cf +P bd980be471b185e2dc45875804103d5afc8f78cf +R 129d3396a51cd277a2cd5fd90ed058d9 U drh -Z af694faf6d84b7161a6291503b697295 +Z c467af82d7eff2f784ff6186e148e641 diff --git a/manifest.uuid b/manifest.uuid index 2e07f98484..df26e53231 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -bd980be471b185e2dc45875804103d5afc8f78cf \ No newline at end of file +e60eefc76fa5066720d76858f6cfca56365330ee \ No newline at end of file diff --git a/test/e_expr.test b/test/e_expr.test index 1e7685352e..b61b42da98 100644 --- a/test/e_expr.test +++ b/test/e_expr.test @@ -1598,8 +1598,8 @@ do_expr_test e_expr-31.1.2 { CAST(1.99999 AS INTEGER) } integer 1 do_expr_test e_expr-31.1.3 { CAST(-1.99999 AS INTEGER) } integer -1 do_expr_test e_expr-31.1.4 { CAST(-0.99999 AS INTEGER) } integer 0 -# EVIDENCE-OF: R-06126-36021 If an REAL is too large to be represented -# as an INTEGER then the result of the cast is the largest negative +# EVIDENCE-OF: R-49503-28105 If a REAL is too large to be represented as +# an INTEGER then the result of the cast is the largest negative # integer: -9223372036854775808. # do_expr_test e_expr-31.2.1 { CAST(2e+50 AS INT) } integer -9223372036854775808 @@ -1845,4 +1845,3 @@ foreach {tn expr} { finish_test - diff --git a/test/e_update.test b/test/e_update.test index d8032ce045..c14b8456f1 100644 --- a/test/e_update.test +++ b/test/e_update.test @@ -233,9 +233,9 @@ do_update_tests e_update-1.5 -query { {3 1 4 1 5 9 2 6 5} } -# EVIDENCE-OF: R-09060-20018 If a single column-name appears more than +# EVIDENCE-OF: R-34751-18293 If a single column-name appears more than # once in the list of assignment expressions, all but the rightmost -# occurence is ignored. +# occurrence is ignored. # do_update_tests e_update-1.6 -query { SELECT * FROM t2 @@ -605,4 +605,3 @@ do_update_tests e_update-3.5 -query { SELECT x FROM t8 ; DELETE FROM t8 } { } ;# ifcapable update_delete_limit finish_test -