/ Check-in [a179e41e]
Login

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

Overview
Comment:Fix an assert() statement in the SELECT code generator that was incorrect following an OOM error.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:a179e41e40dba4c19a488985f77777acd27b689d
User & Date: drh 2014-08-12 01:23:07
References
2014-08-12
09:36
Add a test to ensure that the problem fixed by [a179e41e40] does not recur. check-in: 31356f2c user: dan tags: trunk
Context
2014-08-12
09:36
Add a test to ensure that the problem fixed by [a179e41e40] does not recur. check-in: 31356f2c user: dan tags: trunk
01:23
Fix an assert() statement in the SELECT code generator that was incorrect following an OOM error. check-in: a179e41e user: drh tags: trunk
2014-08-11
17:51
Modify GetVersionEx Win32 VFS fix for use with the test suite. check-in: fd222176 user: mistachkin tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/select.c.

702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
          }else{
            sqlite3VdbeAddOp3(v, OP_Eq, regResult+i, iContinue, regPrev+i);
            VdbeCoverage(v);
           }
          sqlite3VdbeChangeP4(v, -1, (const char *)pColl, P4_COLLSEQ);
          sqlite3VdbeChangeP5(v, SQLITE_NULLEQ);
        }
        assert( sqlite3VdbeCurrentAddr(v)==iJump );
        sqlite3VdbeAddOp3(v, OP_Copy, regResult, regPrev, nResultCol-1);
        break;
      }

      case WHERE_DISTINCT_UNIQUE: {
        sqlite3VdbeChangeToNoop(v, pDistinct->addrTnct);
        break;







|







702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
          }else{
            sqlite3VdbeAddOp3(v, OP_Eq, regResult+i, iContinue, regPrev+i);
            VdbeCoverage(v);
           }
          sqlite3VdbeChangeP4(v, -1, (const char *)pColl, P4_COLLSEQ);
          sqlite3VdbeChangeP5(v, SQLITE_NULLEQ);
        }
        assert( sqlite3VdbeCurrentAddr(v)==iJump || pParse->db->mallocFailed );
        sqlite3VdbeAddOp3(v, OP_Copy, regResult, regPrev, nResultCol-1);
        break;
      }

      case WHERE_DISTINCT_UNIQUE: {
        sqlite3VdbeChangeToNoop(v, pDistinct->addrTnct);
        break;