From: drh Date: Tue, 2 Nov 2010 15:26:24 +0000 (+0000) Subject: Add evidence marks for the sqlite3_blob_reopen() interface. Fix compiler X-Git-Tag: version-3.7.4~73 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=07bf3918f9af49b6e20a809cfa2afcc5b669e315;p=thirdparty%2Fsqlite.git Add evidence marks for the sqlite3_blob_reopen() interface. Fix compiler warnings in test1.c. Fix incorrect evidence marks on e_select.tcl. FossilOrigin-Name: 3771faa88eda3eb91264ce0982e22f53596abd4b --- diff --git a/manifest b/manifest index d869447ae8..e625fa9968 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,8 @@ -C Add\stest\scases\sto\srestore\scoverage\sof\spager.c\sand\swal.c. -D 2010-11-01T18:45:09 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +C Add\sevidence\smarks\sfor\sthe\ssqlite3_blob_reopen()\sinterface.\s\sFix\scompiler\nwarnings\sin\stest1.c.\s\sFix\sincorrect\sevidence\smarks\son\se_select.tcl. +D 2010-11-02T15:26:24 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 2c8cefd962eca0147132c7cf9eaa4bb24c656f3f F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -176,14 +179,14 @@ F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697 F src/select.c a03ec6a313ef8311f081ee478f96ae04ff691608 F src/shell.c 8517fc1f9c59ae4007e6cc8b9af91ab231ea2056 -F src/sqlite.h.in 0c3ab42eef59ee80c564be76c700b542ff530758 +F src/sqlite.h.in f47e09412fc9a129f759fa4d96ef21f4b3d529eb F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754 F src/sqliteInt.h c63b0340dfdfde18ff255ddccf004edd2d073288 F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44 F src/status.c 496913d4e8441195f6f2a75b1c95993a45b9b30b F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e F src/tclsqlite.c dc71e2bd0f16dbb9106c1f5e257a64b783574f26 -F src/test1.c ab4c63b347f1c4319d75fe70dfecfd0e177ee61c +F src/test1.c 9e1fe842f72aa41af48ab7b21c3a12975b4c5b37 F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31 F src/test3.c 056093cfef69ff4227a6bdb9108564dc7f45e4bc F src/test4.c 0528360b5025688002a5feb6be906ddce52eaaee @@ -356,7 +359,7 @@ F test/e_fkey.test 6721a741c6499b3ab7e5385923233343c8f1ad05 F test/e_fts3.test 75bb0aee26384ef586165e21018a17f7cd843469 F test/e_insert.test 7390c2da39f16a134dc9a439144768c727757d2c F test/e_reindex.test a064f0878b8f848fbca38f1f61f82f15a3000c64 -F test/e_select.test 6c0244eacf43bf8406d7ae3363d77265b0d4ff8f +F test/e_select.test bf385ae3aa0f014c4933ae66fd3e1302138493eb F test/e_select2.test 5c3d3da19c7b3e90ae444579db2b70098599ab92 F test/e_update.test 963d6876064e65f318d1c93aaed36a02b9b389bf F test/e_vacuum.test 057cc29445746fc1d2542984ff0253d511a234bd @@ -882,7 +885,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 8dd5c69198619866923c6053b71899c1fb8c4c67 -R 14f132430429bd624492110e4d1cae74 -U dan -Z b450e3307830f974b5c903cf51078580 +P 6cae552927392d8b735aa118c318d7468097ebeb +R 99d449c40cc2af47a17f6b479744ba94 +U drh +Z e0eff9674ebb6295f2b6870d990e3417 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQFM0C2qoxKgR168RlERAtsWAJ0c+Qg4qImQebinYShOYuBIEoXfRwCfQdMI +MPI2wIAAWE4t5rkTCaRo+NI= +=5kvu +-----END PGP SIGNATURE----- diff --git a/manifest.uuid b/manifest.uuid index e7900970c3..58981e0986 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6cae552927392d8b735aa118c318d7468097ebeb \ No newline at end of file +3771faa88eda3eb91264ce0982e22f53596abd4b \ No newline at end of file diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 8ff8ab78f7..e08d5ce596 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -3370,10 +3370,10 @@ int sqlite3_reset(sqlite3_stmt *pStmt); ** SQL function or aggregate, pass NULL poiners for all three function ** callbacks. ** -** ^If the tenth parameter to sqlite3_create_function_v2() is not NULL, -** then it is destructor for the application data point that is invoked -** when the function is deleted, either by being -** overloaded or when the database connection closes. +** ^(If the tenth parameter to sqlite3_create_function_v2() is not NULL, +** then it is destructor for the application data pointer. +** The destructor is invoked when the function is deleted, either by being +** overloaded or when the database connection closes.)^ ** ^The destructor is also invoked if the call to ** sqlite3_create_function_v2() fails. ** ^When the destructor callback of the tenth parameter is invoked, it @@ -4793,23 +4793,23 @@ int sqlite3_blob_open( /* ** CAPI3REF: Move a BLOB Handle to a New Row ** -** This function is used to move an existing blob handle so that it points -** to a different row of the same database table. The new row is identified +** ^This function is used to move an existing blob handle so that it points +** to a different row of the same database table. ^The new row is identified ** by the rowid value passed as the second argument. Only the row can be -** changed, the database, table and column on which the blob handle is open +** changed. ^The database, table and column on which the blob handle is open ** remain the same. Moving an existing blob handle to a new row can be ** faster than closing the existing handle and opening a new one. ** -** The new row must meet the same criteria as for [sqlite3_blob_open()] - +** ^(The new row must meet the same criteria as for [sqlite3_blob_open()] - ** it must exist and there must be either a blob or text value stored in -** the nominated column. If the new row is not present in the table, or if +** the nominated column.)^ ^If the new row is not present in the table, or if ** it does not contain a blob or text value, or if another error occurs, an ** SQLite error code is returned and the blob handle is considered aborted. -** All subsequent calls to [sqlite3_blob_read()], [sqlite3_blob_write()] or +** ^All subsequent calls to [sqlite3_blob_read()], [sqlite3_blob_write()] or ** [sqlite3_blob_reopen()] on an aborted blob handle immediately return ** SQLITE_ABORT. ** -** This function sets the database handle error code and message. +** ^This function sets the database handle error code and message. */ SQLITE_EXPERIMENTAL int sqlite3_blob_reopen(sqlite3_blob *, sqlite3_int64); diff --git a/src/test1.c b/src/test1.c index 2f83a5948c..e0273cab9d 100644 --- a/src/test1.c +++ b/src/test1.c @@ -1653,7 +1653,6 @@ static int test_blob_close( Tcl_Obj *CONST objv[] /* Command arguments */ ){ sqlite3_blob *pBlob; - int nByte; if( objc!=2 ){ Tcl_WrongNumArgs(interp, 1, objv, "CHANNEL"); @@ -1778,9 +1777,6 @@ static int test_blob_reopen( sqlite3_blob *pBlob; int rc; - unsigned char *zBuf; - int nBuf; - if( objc!=3 ){ Tcl_WrongNumArgs(interp, 1, objv, "CHANNEL ROWID"); return TCL_ERROR; diff --git a/test/e_select.test b/test/e_select.test index 1535a02c76..79e334ce30 100644 --- a/test/e_select.test +++ b/test/e_select.test @@ -233,7 +233,7 @@ do_select_tests e_select-0.3 { # EVIDENCE-OF: R-41233-21397 -- syntax diagram join-source # -# EVIDENCE-OF: R-28036-03696 -- syntax diagram join-op +# EVIDENCE-OF: R-45040-11121 -- syntax diagram join-op # do_select_tests e_select-0.4 { 1 "SELECT t1.rowid FROM t1" {1 2 3} @@ -247,13 +247,15 @@ do_select_tests e_select-0.4 { 7 "SELECT t1.rowid FROM t1 NATURAL JOIN t3" {1 2} 8 "SELECT t1.rowid FROM t1 NATURAL LEFT OUTER JOIN t3" {1 2 3} - 9 "SELECT t1.rowid FROM t1 NATURAL INNER JOIN t3" {1 2} - 10 "SELECT t1.rowid FROM t1 NATURAL CROSS JOIN t3" {1 2} - - 11 "SELECT t1.rowid FROM t1 JOIN t3" {1 1 2 2 3 3} - 12 "SELECT t1.rowid FROM t1 LEFT OUTER JOIN t3" {1 1 2 2 3 3} - 13 "SELECT t1.rowid FROM t1 INNER JOIN t3" {1 1 2 2 3 3} - 14 "SELECT t1.rowid FROM t1 CROSS JOIN t3" {1 1 2 2 3 3} + 9 "SELECT t1.rowid FROM t1 NATURAL LEFT JOIN t3" {1 2 3} + 10 "SELECT t1.rowid FROM t1 NATURAL INNER JOIN t3" {1 2} + 11 "SELECT t1.rowid FROM t1 NATURAL CROSS JOIN t3" {1 2} + + 12 "SELECT t1.rowid FROM t1 JOIN t3" {1 1 2 2 3 3} + 13 "SELECT t1.rowid FROM t1 LEFT OUTER JOIN t3" {1 1 2 2 3 3} + 14 "SELECT t1.rowid FROM t1 LEFT JOIN t3" {1 1 2 2 3 3} + 15 "SELECT t1.rowid FROM t1 INNER JOIN t3" {1 1 2 2 3 3} + 16 "SELECT t1.rowid FROM t1 CROSS JOIN t3" {1 1 2 2 3 3} } # EVIDENCE-OF: R-56911-63533 -- syntax diagram compound-operator