/ Check-in [af5af5dc]
Login

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

Overview
Comment:Modify the order of assert() macros in vdbe.c as per the suggestion in #2768. (CVS 4536)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: af5af5dc2608f369f0f4274ca06974b365424e72
User & Date: danielk1977 2007-11-12 08:09:35
Context
2007-11-12
09:50
Allow collation sequence names to be quoted. Ticket #2744. (CVS 4537) check-in: 06749ac7 user: danielk1977 tags: trunk
08:09
Modify the order of assert() macros in vdbe.c as per the suggestion in #2768. (CVS 4536) check-in: af5af5dc user: danielk1977 tags: trunk
2007-11-11
18:36
Fix the code generation for UPDATE and DELETE so that BEFORE triggers that use RAISE(IGNORE) do not leave extra values on the stack. Ticket #2767 (CVS 4535) check-in: 3391f413 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/vdbe.c.

    39     39   **
    40     40   ** Various scripts scan this source file in order to generate HTML
    41     41   ** documentation, headers files, or other derived files.  The formatting
    42     42   ** of the code in this file is, therefore, important.  See other comments
    43     43   ** in this file for details.  If in doubt, do not deviate from existing
    44     44   ** commenting and indentation practices when changing or adding code.
    45     45   **
    46         -** $Id: vdbe.c,v 1.653 2007/10/23 15:39:45 drh Exp $
           46  +** $Id: vdbe.c,v 1.654 2007/11/12 08:09:35 danielk1977 Exp $
    47     47   */
    48     48   #include "sqliteInt.h"
    49     49   #include <ctype.h>
    50     50   #include "vdbeInt.h"
    51     51   
    52     52   /*
    53     53   ** The following global variable is incremented every time a cursor
................................................................................
  2001   2001     **
  2002   2002     ** We also compute the number of columns in the record.  For cursors,
  2003   2003     ** the number of columns is stored in the Cursor.nField element.  For
  2004   2004     ** records on the stack, the next entry down on the stack is an integer
  2005   2005     ** which is the number of records.
  2006   2006     */
  2007   2007     pC = p->apCsr[p1];
         2008  +  assert( pC!=0 );
  2008   2009   #ifndef SQLITE_OMIT_VIRTUALTABLE
  2009   2010     assert( pC->pVtabCursor==0 );
  2010   2011   #endif
  2011         -  assert( pC!=0 );
  2012   2012     if( pC->pCursor!=0 ){
  2013   2013       /* The record is stored in a B-Tree */
  2014   2014       rc = sqlite3VdbeCursorMoveto(pC);
  2015   2015       if( rc ) goto abort_due_to_error;
  2016   2016       zRec = 0;
  2017   2017       pCrsr = pC->pCursor;
  2018   2018       if( pC->nullRow ){