diff --git a/manifest b/manifest index b3dd9ca821..12060fa2ee 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C The\ssqlite3_backup_init()\sinterface\smust\slock\sthe\sdestination\sin\scase\sit\nneeds\sto\schange\sthe\serror\smessage.\s(CVS\s6255) -D 2009-02-04T16:56:19 +C Simplify\swording\sof\sbackup\sAPI\serror\smessage.\s\sDecapitalize\ssome\sother\nerror\smessages.\s(CVS\s6256) +D 2009-02-04T17:40:58 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in c7a5a30fb6852bd7839b1024e1661da8549878ee F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -101,7 +101,7 @@ F src/alter.c 0ec29744c36c6e976596ce38c16289ebc5dc94db F src/analyze.c c86fd6a1425b22b3a46ce72ad403e4280026364f F src/attach.c 81d37d1948f409146a7b22b96998fd90649d1fd3 F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627 -F src/backup.c 2419ac3abf57714fbdd5e3cfaaf278ae727d1ced +F src/backup.c 12cd9a55b9188c21ae2dd466436e1f2b78b71fa2 F src/bitvec.c 44f7059ac1f874d364b34af31b9617e52223ba75 F src/btmutex.c 63c5cc4ad5715690767ffcb741e185d7bc35ec1a F src/btree.c 71f30e74389aa7ae51421592dfaf69511152677c @@ -123,7 +123,7 @@ F src/insert.c f6db1e6f43aae337e64a755208abb6ff124edc19 F src/journal.c e00df0c0da8413ab6e1bb7d7cab5665d4a9000d0 F src/legacy.c 8b3b95d48d202614946d7ce7256e7ba898905c3b F src/loadext.c 3f96631089fc4f3871a67f02f2e4fc7ea4d51edc -F src/main.c abc8351627679bcf95ddc0539360ee93c00ac8cc +F src/main.c 75e0ec759987984d54b1fe1c75d621f533d9f46c F src/malloc.c bc408056b126db37b6fba00e170d578cc67be6b3 F src/mem0.c f2f84062d1f35814d6535c9f9e33de3bfb3b132c F src/mem1.c 3bfb39e4f60b0179713a7c087b2d4f0dc205735f @@ -233,7 +233,7 @@ F test/autoinc.test ab549b48b389cabd92967b86c379ec8b31fa6c16 F test/autovacuum.test 61260e25744189ff766f61ca3df23c1eeec0060e F test/autovacuum_ioerr2.test 598b0663074d3673a9c1bc9a16e80971313bafe6 F test/avtrans.test 1e901d8102706b63534dbd2bdd4d8f16c4082650 -F test/backup.test bd478dd20a092a99d98943dee9d92d69823a6820 +F test/backup.test 3683d4d3d04e4db6ebba6a4dc9b9d882c3d03bff F test/backup_ioerr.test 2edd5e347e263733cae8c08f41bf3dbd7277b33d F test/backup_malloc.test 471fb098dae228ca840d4d51e41481901ac03578 F test/badutf.test d5360fc31f643d37a973ab0d8b4fb85799c3169f @@ -508,8 +508,8 @@ F test/savepoint3.test 5b76f93ffcb5c53bd6ec68e9d57d3b535936c45e F test/savepoint4.test fd8850063e3c40565545f5c291e7f79a30591670 F test/savepoint5.test 0735db177e0ebbaedc39812c8d065075d563c4fd F test/savepoint6.test e28f7d8ab8a389d4e5bd1dc08bf2c3312754cc67 -F test/schema.test a8b000723375fd42c68d310091bdbd744fde647c -F test/schema2.test 35e1c9696443d6694c8980c411497c2b5190d32e +F test/schema.test deafe5472099ab5bc65748059dc5182fc8ebad74 +F test/schema2.test 906408621ea881fdb496d878b1822572a34e32c5 F test/select1.test d0a4cad954fd41c030ec16ffbd2d08a4c0548742 F test/select2.test 9735da20ccd41e42bf2b4c19fd939141b591adae F test/select3.test 2ce595f8fb8e2ac10071d3b4e424cadd4634a054 @@ -700,7 +700,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P 03ea9e591337a3c442080ee7cd01cc4ee85c1357 -R 81020b5e1a4ee3bdeda98e63cca69bd3 +P 572378d3a29c7d55fa4a15df14800c26d6c563a1 +R 0f34db2e5d0b116ed8002ee3600103a1 U drh -Z d9fd2e5280186fa7e77fcf315dea28ee +Z 549e649197447ad11fb6af43a27190a2 diff --git a/manifest.uuid b/manifest.uuid index ae318a40f4..3e384d6a1e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -572378d3a29c7d55fa4a15df14800c26d6c563a1 \ No newline at end of file +f92405afb649b698b735b423cd9195d4f8f137c9 \ No newline at end of file diff --git a/src/backup.c b/src/backup.c index d3ffae1889..26299b9e0d 100644 --- a/src/backup.c +++ b/src/backup.c @@ -12,7 +12,7 @@ ** This file contains the implementation of the sqlite3_backup_XXX() ** API functions and the related features. ** -** $Id: backup.c,v 1.6 2009/02/04 16:56:19 drh Exp $ +** $Id: backup.c,v 1.7 2009/02/04 17:40:58 drh Exp $ */ #include "sqliteInt.h" #include "btreeInt.h" @@ -138,7 +138,7 @@ sqlite3_backup *sqlite3_backup_init( if( pSrcDb==pDestDb ){ sqlite3Error( - pDestDb, SQLITE_ERROR, "Source and destination handles must be distinct" + pDestDb, SQLITE_ERROR, "source and destination must be distinct" ); p = 0; }else { diff --git a/src/main.c b/src/main.c index 31acd559f3..72a601d74f 100644 --- a/src/main.c +++ b/src/main.c @@ -14,7 +14,7 @@ ** other files are for internal use by SQLite and should not be ** accessed by users of the library. ** -** $Id: main.c,v 1.526 2009/02/04 03:59:25 shane Exp $ +** $Id: main.c,v 1.527 2009/02/04 17:40:58 drh Exp $ */ #include "sqliteInt.h" @@ -599,7 +599,7 @@ int sqlite3_close(sqlite3 *db){ /* If there are any outstanding VMs, return SQLITE_BUSY. */ if( db->pVdbe ){ sqlite3Error(db, SQLITE_BUSY, - "Unable to close due to unfinalised statements"); + "unable to close due to unfinalised statements"); sqlite3_mutex_leave(db->mutex); return SQLITE_BUSY; } @@ -609,7 +609,7 @@ int sqlite3_close(sqlite3 *db){ Btree *pBt = db->aDb[j].pBt; if( pBt && sqlite3BtreeIsInBackup(pBt) ){ sqlite3Error(db, SQLITE_BUSY, - "Unable to close due to unfinished backup operation"); + "unable to close due to unfinished backup operation"); sqlite3_mutex_leave(db->mutex); return SQLITE_BUSY; } @@ -955,7 +955,7 @@ int sqlite3CreateFunc( if( p && p->iPrefEnc==enc && p->nArg==nArg ){ if( db->activeVdbeCnt ){ sqlite3Error(db, SQLITE_BUSY, - "Unable to delete/modify user-function due to active statements"); + "unable to delete/modify user-function due to active statements"); assert( !db->mallocFailed ); return SQLITE_BUSY; }else{ @@ -1365,7 +1365,7 @@ static int createCollation( if( pColl && pColl->xCmp ){ if( db->activeVdbeCnt ){ sqlite3Error(db, SQLITE_BUSY, - "Unable to delete/modify collation sequence due to active statements"); + "unable to delete/modify collation sequence due to active statements"); return SQLITE_BUSY; } sqlite3ExpirePreparedStatements(db); diff --git a/test/backup.test b/test/backup.test index 92eadf3f18..aff4d5d9c4 100644 --- a/test/backup.test +++ b/test/backup.test @@ -11,7 +11,7 @@ # This file implements regression tests for SQLite library. The # focus of this file is testing the sqlite3_backup_XXX API. # -# $Id: backup.test,v 1.1 2009/02/03 16:51:25 danielk1977 Exp $ +# $Id: backup.test,v 1.2 2009/02/04 17:40:58 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -365,7 +365,7 @@ do_test backup-4.3.2 { } {SQLITE_BUSY} do_test backup-4.3.3 { sqlite3_errmsg db2 -} {Unable to close due to unfinished backup operation} +} {unable to close due to unfinished backup operation} do_test backup-4.3.4 { B step 50 } {SQLITE_DONE} @@ -376,7 +376,7 @@ do_test backup-4.3.5 { do_test backup-4.4.1 { set rc [catch {sqlite3_backup B db main db aux1}] list $rc [sqlite3_errcode db] [sqlite3_errmsg db] -} {1 SQLITE_ERROR {Source and destination handles must be distinct}} +} {1 SQLITE_ERROR {source and destination must be distinct}} db close db2 close diff --git a/test/schema.test b/test/schema.test index 25779a1f81..66a5958384 100644 --- a/test/schema.test +++ b/test/schema.test @@ -13,7 +13,7 @@ # This file tests the various conditions under which an SQLITE_SCHEMA # error should be returned. # -# $Id: schema.test,v 1.8 2007/10/09 08:29:33 danielk1977 Exp $ +# $Id: schema.test,v 1.9 2009/02/04 17:40:58 drh Exp $ #--------------------------------------------------------------------- # When any of the following types of SQL statements or actions are @@ -313,7 +313,7 @@ do_test schema-11.3 { db function tstfunc {} } msg] list $rc $msg -} {1 {Unable to delete/modify user-function due to active statements}} +} {1 {unable to delete/modify user-function due to active statements}} do_test schema-11.4 { sqlite3_finalize $::STMT } {SQLITE_OK} @@ -331,7 +331,7 @@ do_test schema-11.7 { db collate tstcollate {} } msg] list $rc $msg -} {1 {Unable to delete/modify collation sequence due to active statements}} +} {1 {unable to delete/modify collation sequence due to active statements}} do_test schema-11.8 { sqlite3_finalize $::STMT } {SQLITE_OK} diff --git a/test/schema2.test b/test/schema2.test index 63e58a0a03..61d7f731d3 100644 --- a/test/schema2.test +++ b/test/schema2.test @@ -14,7 +14,7 @@ # error should be returned. This is a copy of schema.test that # has been altered to use sqlite3_prepare_v2 instead of sqlite3_prepare # -# $Id: schema2.test,v 1.3 2007/10/09 08:29:33 danielk1977 Exp $ +# $Id: schema2.test,v 1.4 2009/02/04 17:40:58 drh Exp $ #--------------------------------------------------------------------- # When any of the following types of SQL statements or actions are @@ -314,7 +314,7 @@ do_test schema2-11.3 { db function tstfunc {} } msg] list $rc $msg -} {1 {Unable to delete/modify user-function due to active statements}} +} {1 {unable to delete/modify user-function due to active statements}} do_test schema2-11.4 { sqlite3_finalize $::STMT } {SQLITE_OK} @@ -332,7 +332,7 @@ do_test schema2-11.7 { db collate tstcollate {} } msg] list $rc $msg -} {1 {Unable to delete/modify collation sequence due to active statements}} +} {1 {unable to delete/modify collation sequence due to active statements}} do_test schema2-11.8 { sqlite3_finalize $::STMT } {SQLITE_OK}