Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | A different fix for the problem with opening existing files. See also check-in (1358). (CVS 1359) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
93deaf54c6e1daee0c89a5e2a7d4a5e7 |
User & Date: | drh 2004-05-11 09:57:35.000 |
Context
2004-05-11
| ||
10:04 | Change sqlite_ to sqlite3_ in the attach2.test test script. (CVS 1360) (check-in: 98f756e6a0 user: drh tags: trunk) | |
09:57 | A different fix for the problem with opening existing files. See also check-in (1358). (CVS 1359) (check-in: 93deaf54c6 user: drh tags: trunk) | |
09:50 | Fix a bug that was preventing the library from opening existing files. (CVS 1358) (check-in: ad064bd429 user: danielk1977 tags: trunk) | |
Changes
Changes to src/vdbe.c.
︙ | ︙ | |||
39 40 41 42 43 44 45 | ** ** Various scripts scan this source file in order to generate HTML ** documentation, headers files, or other derived files. The formatting ** of the code in this file is, therefore, important. See other comments ** in this file for details. If in doubt, do not deviate from existing ** commenting and indentation practices when changing or adding code. ** | | | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | ** ** Various scripts scan this source file in order to generate HTML ** documentation, headers files, or other derived files. The formatting ** of the code in this file is, therefore, important. See other comments ** in this file for details. If in doubt, do not deviate from existing ** commenting and indentation practices when changing or adding code. ** ** $Id: vdbe.c,v 1.282 2004/05/11 09:57:35 drh Exp $ */ #include "sqliteInt.h" #include "os.h" #include <ctype.h> #include "vdbeInt.h" /* |
︙ | ︙ | |||
2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 | } case SQLITE_OK: { int flags = sqlite3BtreeFlags(pCur->pCursor); pCur->intKey = (flags & BTREE_INTKEY)!=0; pCur->zeroData = (flags & BTREE_ZERODATA)!=0; busy = 0; break; } default: { goto abort_due_to_error; } } }while( busy ); break; | > > > > > | 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 | } case SQLITE_OK: { int flags = sqlite3BtreeFlags(pCur->pCursor); pCur->intKey = (flags & BTREE_INTKEY)!=0; pCur->zeroData = (flags & BTREE_ZERODATA)!=0; busy = 0; break; } case SQLITE_EMPTY: { rc = SQLITE_OK; busy = 0; break; } default: { goto abort_due_to_error; } } }while( busy ); break; |
︙ | ︙ | |||
3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 | ** If P2 is 0 or if the table or index is not empty, fall through ** to the following instruction. */ case OP_Rewind: { int i = pOp->p1; Cursor *pC; BtCursor *pCrsr; assert( i>=0 && i<p->nCursor ); pC = &p->aCsr[i]; if( (pCrsr = pC->pCursor)!=0 ){ | > < < > | < | < | > > | 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 3686 3687 3688 | ** If P2 is 0 or if the table or index is not empty, fall through ** to the following instruction. */ case OP_Rewind: { int i = pOp->p1; Cursor *pC; BtCursor *pCrsr; int res; assert( i>=0 && i<p->nCursor ); pC = &p->aCsr[i]; if( (pCrsr = pC->pCursor)!=0 ){ rc = sqlite3BtreeFirst(pCrsr, &res); pC->atFirst = res==0; pC->deferredMoveto = 0; }else{ res = 1; } pC->nullRow = res; if( res && pOp->p2>0 ){ pc = pOp->p2 - 1; } break; } /* Opcode: Next P1 P2 * ** ** Advance cursor P1 so that it points to the next key/data pair in its |
︙ | ︙ |
Changes to test/attach.test.
︙ | ︙ | |||
8 9 10 11 12 13 14 | # May you share freely, never taking more than you give. # #*********************************************************************** # This file implements regression tests for SQLite library. The # focus of this script is testing the ATTACH and DETACH commands # and related functionality. # | | | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | # May you share freely, never taking more than you give. # #*********************************************************************** # This file implements regression tests for SQLite library. The # focus of this script is testing the ATTACH and DETACH commands # and related functionality. # # $Id: attach.test,v 1.16 2004/05/11 09:57:35 drh Exp $ # set testdir [file dirname $argv0] source $testdir/tester.tcl for {set i 2} {$i<=15} {incr i} { file delete -force test$i.db |
︙ | ︙ |