/ Check-in [9d259d48]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix a bug in the previous check-in. (CVS 2061)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 9d259d48defda57ab0bd66460bd2ba7f3a2695e9
User & Date: drh 2004-11-05 05:20:40
Context
2004-11-05
05:23
Another bug fix from two check-ins ago. (CVS 2062) check-in: c46eef2f user: drh tags: trunk
05:20
Fix a bug in the previous check-in. (CVS 2061) check-in: 9d259d48 user: drh tags: trunk
05:10
More use of sqlite3NestedParse. This version of the code does not work. (CVS 2060) check-in: ac2d5a60 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/build.c.

    20     20   **     creating ID lists
    21     21   **     BEGIN TRANSACTION
    22     22   **     COMMIT
    23     23   **     ROLLBACK
    24     24   **     PRAGMA
    25     25   **
    26     26   <<<<<<< build.c
    27         -** $Id: build.c,v 1.264 2004/11/05 05:10:29 drh Exp $
           27  +** $Id: build.c,v 1.265 2004/11/05 05:20:40 drh Exp $
    28     28   =======
    29         -** $Id: build.c,v 1.264 2004/11/05 05:10:29 drh Exp $
           29  +** $Id: build.c,v 1.265 2004/11/05 05:20:40 drh Exp $
    30     30   >>>>>>> 1.262
    31     31   */
    32     32   #include "sqliteInt.h"
    33     33   #include <ctype.h>
    34     34   
    35     35   /*
    36     36   ** This routine is called when a new SQL statement is beginning to
................................................................................
  2364   2364   
  2365   2365       sqlite3BeginWriteOperation(pParse, 0, pIndex->iDb);
  2366   2366       sqlite3OpenMasterTable(v, pIndex->iDb);
  2367   2367       base = sqlite3VdbeAddOpList(v, ArraySize(dropIndex), dropIndex);
  2368   2368       sqlite3VdbeChangeP3(v, base+1, pIndex->zName, 0);
  2369   2369       sqlite3ChangeCookie(db, v, pIndex->iDb);
  2370   2370       /* sqlite3VdbeAddOp(v, OP_Destroy, pIndex->tnum, pIndex->iDb); */
  2371         -    destroyRootPage(v, pIndex->tnum, pIndex->iDb);
         2371  +    destroyRootPage(pParse, pIndex->tnum, pIndex->iDb);
  2372   2372       sqlite3VdbeAddOp(v, OP_Close, 0, 0);
  2373   2373       sqlite3VdbeOp3(v, OP_DropIndex, pIndex->iDb, 0, pIndex->zName, 0);
  2374   2374     }
  2375   2375   
  2376   2376   exit_drop_index:
  2377   2377     sqlite3SrcListDelete(pName);
  2378   2378   }

Changes to test/attach3.test.

     8      8   #    May you share freely, never taking more than you give.
     9      9   #
    10     10   #***********************************************************************
    11     11   # This file implements regression tests for SQLite library.  The
    12     12   # focus of this script is testing the ATTACH and DETACH commands
    13     13   # and schema changes to attached databases.
    14     14   #
    15         -# $Id: attach3.test,v 1.11 2004/11/05 05:10:29 drh Exp $
           15  +# $Id: attach3.test,v 1.12 2004/11/05 05:20:40 drh Exp $
    16     16   #
    17     17   
    18     18   
    19     19   set testdir [file dirname $argv0]
    20     20   source $testdir/tester.tcl
    21     21   
    22     22   # Create tables t1 and t2 in the main database