SQLite

Check-in [2a055ed0af]
Login

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

Overview
Comment:Prepend "rc!=SQLITE_OK || " to the nExtraDelete assert() condition.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | fordelete-assert
Files: files | file ages | folders
SHA1: 2a055ed0afd56e8c6b17cfc31e7808debe9ec765
User & Date: dan 2016-01-29 18:04:31.311
Context
2016-01-29
18:48
Remove a stray "exit" in a test script. (Closed-Leaf check-in: 10c88bf9f2 user: drh tags: fordelete-assert)
18:04
Prepend "rc!=SQLITE_OK || " to the nExtraDelete assert() condition. (check-in: 2a055ed0af user: dan tags: fordelete-assert)
2016-01-28
17:06
Modifications to ensure the nExtraDelete-related assert() statement does not fail. (check-in: f43ff8f82d user: dan tags: fordelete-assert)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/vdbe.c.
︙︙
6779
6780
6781
6782
6783
6784
6785

6786

6787
6788
6789
6790
6791
6792
6793

  ** release the mutexes on btrees that were acquired at the
  ** top. */
vdbe_return:
  db->lastRowid = lastRowid;
  testcase( nVmStep>0 );
  p->aCounter[SQLITE_STMTSTATUS_VM_STEP] += (int)nVmStep;
  sqlite3VdbeLeave(p);

  assert( nExtraDelete==0 || sqlite3_strlike("DELETE%",p->zSql,0)!=0 );

  return rc;

  /* Jump to here if a string or blob larger than SQLITE_MAX_LENGTH
  ** is encountered.
  */
too_big:
  sqlite3VdbeError(p, "string or blob too big");








>
|
>








6779
6780
6781
6782
6783
6784
6785
6786
6787
6788
6789
6790
6791
6792
6793
6794
6795

  ** release the mutexes on btrees that were acquired at the
  ** top. */
vdbe_return:
  db->lastRowid = lastRowid;
  testcase( nVmStep>0 );
  p->aCounter[SQLITE_STMTSTATUS_VM_STEP] += (int)nVmStep;
  sqlite3VdbeLeave(p);
  assert( rc!=SQLITE_OK || nExtraDelete==0 
       || sqlite3_strlike("DELETE%",p->zSql,0)!=0 
  );
  return rc;

  /* Jump to here if a string or blob larger than SQLITE_MAX_LENGTH
  ** is encountered.
  */
too_big:
  sqlite3VdbeError(p, "string or blob too big");
︙︙