diff --git a/manifest b/manifest index b30ba61d00..cdbf60b74e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sTcl\s(flush)\scommands\sto\sexclusive2.test,\swhich\sis\sfailing\son\ssome\ssystems\sbut\snot\sothers.\s(CVS\s3806) -D 2007-04-03T16:13:52 +C Test\scoverage\simprovements.\s(CVS\s3807) +D 2007-04-04T01:27:44 F Makefile.in 29fbf08ce0989973bfed0b5a052a6bdf3e60fd0a F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -127,7 +127,7 @@ F src/vdbe.c 87e31f0790ac8a5aad7b7fcd5b97948943fccba3 F src/vdbe.h 0025259af1939fb264a545816c69e4b5b8d52691 F src/vdbeInt.h 4b19fd8febad3fd14c4c97adaefc06754d323132 F src/vdbeapi.c 1fca7ff056d03f131caa6b1296bb221da65ed7f4 -F src/vdbeaux.c 464df6616ea25b2f750b714f9bc2df45aa5e9f6e +F src/vdbeaux.c 2d58a815870923b008c6920f8dcb3f5c0594f54e F src/vdbefifo.c 3ca8049c561d5d67cbcb94dc909ae9bb68c0bf8f F src/vdbemem.c 981a113405bd9b80aeb71fe246a2f01708e8a8f7 F src/vtab.c 7fbda947e28cbe7adb3ba752a76ca9ef29936750 @@ -158,9 +158,9 @@ F test/between.test 16b1776c6323faadb097a52d673e8e3d8be7d070 F test/bigfile.test ebc9ce9216e08bead63734ab816d0f27858f3b80 F test/bigrow.test f0aeb7573dcb8caaafea76454be3ade29b7fc747 F test/bind.test 941a424e7722dd8994c2d503b28d00e6a8f87f23 -F test/bindxfer.test b76bfb7df68bb0b238039f4543a84e9612291b54 +F test/bindxfer.test 6e2885965942acd110b18d1595ec39d5abc53d13 F test/blob.test 28c3b25150684ee3d108bb78cfb67a472deef2f0 -F test/btree.test 5902dd2dc3aff942726b32e1d437bc8227b6c3c5 +F test/btree.test 8b6168980efdd194289798f19d4c81434f6d3a66 F test/btree2.test 4b56a2a4a4f84d68c77aef271223a713bf5ebafc F test/btree4.test 3797b4305694c7af6828675b0f4b1424b8ca30e4 F test/btree5.test 8e5ff32c02e685d36516c6499add9375fe1377f2 @@ -303,7 +303,7 @@ F test/select5.test 0b47058d3e916c1fc9fe81f44b438e02bade21ce F test/select6.test 399f14b9ba37b768afe5d2cd8c12e4f340a69db8 F test/select7.test 95697d8e8355ef7538e2fe768da16838bbd0fcde F test/server1.test e328b8e641ba8fe9273132cfef497383185dc1f5 -F test/shared.test 0ed247941236788c255b3b29b5a82d5ca71b6432 +F test/shared.test 3ce96256ddeed110788d4a1e4b75bbd516f3ad5a F test/shared2.test 8b48f8d33494413ef4cf250110d89403e2bf6b23 F test/shared3.test 01e3e124dbb3859788aabc7cfb82f7ea04421749 F test/shared_err.test 841f7341eb07ed97c713bf89960a4e9199717193 @@ -449,7 +449,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 -P f592dd2d997064cda57b549901a2bcc14498b650 -R f762405ca1fef0493a6c70c2ae9bcd4b -U danielk1977 -Z abeb260e7df5195a4d668b421ee0c453 +P 9e004c519a30257fe3230ac7af630d296e139c9e +R c3d1ddced52ccaeeb6e02437b488e0f6 +U drh +Z e64f6bfd901042c7a2493a1d94243acf diff --git a/manifest.uuid b/manifest.uuid index a77e46cc1c..893d8bf025 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9e004c519a30257fe3230ac7af630d296e139c9e \ No newline at end of file +25f49acc5662ed8dd321b83a60aeeab93a37e129 \ No newline at end of file diff --git a/src/vdbeaux.c b/src/vdbeaux.c index c849d54208..51447d755b 100644 --- a/src/vdbeaux.c +++ b/src/vdbeaux.c @@ -1662,12 +1662,7 @@ int sqlite3VdbeCursorMoveto(Cursor *p){ extern int sqlite3_search_count; #endif assert( p->isTable ); - if( p->isTable ){ - rc = sqlite3BtreeMoveto(p->pCursor, 0, p->movetoTarget, 0, &res); - }else{ - rc = sqlite3BtreeMoveto(p->pCursor,(char*)&p->movetoTarget, - sizeof(i64), 0, &res); - } + rc = sqlite3BtreeMoveto(p->pCursor, 0, p->movetoTarget, 0, &res); if( rc ) return rc; *p->pIncrKey = 0; p->lastRowid = keyToInt(p->movetoTarget); @@ -1760,10 +1755,8 @@ u32 sqlite3VdbeSerialType(Mem *pMem, int file_format){ assert( n>=0 ); return ((n*2) + 13); } - if( flags&MEM_Blob ){ - return (pMem->n*2 + 12); - } - return 0; + assert( (flags & MEM_Blob)!=0 ); + return (pMem->n*2 + 12); } /* diff --git a/test/bindxfer.test b/test/bindxfer.test index 5b73810be0..b06b231a7d 100644 --- a/test/bindxfer.test +++ b/test/bindxfer.test @@ -11,7 +11,7 @@ # This file implements regression tests for SQLite library. The # focus of this script testing the sqlite_transfer_bindings() API. # -# $Id: bindxfer.test,v 1.2 2006/01/03 00:33:50 drh Exp $ +# $Id: bindxfer.test,v 1.3 2007/04/04 01:27:44 drh Exp $ # set testdir [file dirname $argv0] @@ -67,7 +67,16 @@ do_test bindxfer-1.7 { do_test bindxfer-1.8 { set VALUES } {one two {}} -catch {sqlite3_finalize $VM1} -catch {sqlite3_finalize $VM2} +do_test bindxfer-1.9 { + catch {sqlite3_finalize $VM1} + catch {sqlite3_finalize $VM2} + sqlite3_transfer_bindings $VM1 $VM2 +} 21 ;# SQLITE_MISUSE +do_test bindxfer-1.10 { + set VM1 [sqlite3_prepare $DB {SELECT ?, ?, ?} -1 TAIL] + set VM2 [sqlite3_prepare $DB {SELECT ?, ?, ?, ?} -1 TAIL] + sqlite3_transfer_bindings $VM1 $VM2 +} 1 ;# SQLITE_ERROR + finish_test diff --git a/test/btree.test b/test/btree.test index 1bb8226a57..a08e128162 100644 --- a/test/btree.test +++ b/test/btree.test @@ -11,7 +11,7 @@ # This file implements regression tests for SQLite library. The # focus of this script is btree database backend # -# $Id: btree.test,v 1.38 2007/01/03 23:37:29 drh Exp $ +# $Id: btree.test,v 1.39 2007/04/04 01:27:44 drh Exp $ set testdir [file dirname $argv0] @@ -94,6 +94,9 @@ do_test btree-2.1 { if {$rc} {lappend rc $::c1} set rc } {0} +do_test btree-2.1.1 { + btree_cursor_list $::b1 +} {} do_test btree-2.2 { btree_move_to $::c1 99 } {1} diff --git a/test/shared.test b/test/shared.test index 86fdf8f18e..ee36e02ca1 100644 --- a/test/shared.test +++ b/test/shared.test @@ -9,7 +9,7 @@ # #*********************************************************************** # -# $Id: shared.test,v 1.21 2006/01/23 21:38:03 drh Exp $ +# $Id: shared.test,v 1.22 2007/04/04 01:27:44 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -848,6 +848,9 @@ do_test shared-$av.11.8 { } set res } {1 4 {} 7} +do_test shared-$av.11.9 { + sqlite_shared_cache_report +} [list [file normalize test.db] 2] do_test shared-$av.11.11 { db close