/ Check-in [eca7d3f1]
Login

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

Overview
Comment:Remove a branch in STAT4 logic that is no longer reachable after the previous change.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:eca7d3f1612c7a009a9e4ef89f76f9b7e275d1e6
User & Date: drh 2013-12-03 19:49:55
Context
2013-12-05
16:41
Fix two potential (and apparently harmless) shift overflows discovered by the -fcatch-undefined-behavior option of clang. check-in: e19eead8 user: drh tags: trunk
2013-12-03
22:32
Add memory subsystem related defines to the compile-time options list. check-in: 52a44146 user: mistachkin tags: memTests
20:51
Merge in trunk changes. check-in: a2914d6b user: drh tags: sessions
19:49
Remove a branch in STAT4 logic that is no longer reachable after the previous change. check-in: eca7d3f1 user: drh tags: trunk
19:16
Fix a possible (and probably harmless) uninitialized variable in STAT3/4. check-in: 33ad4f91 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/where.c.

  1901   1901     int i = pIdx->nSample;      /* Smallest sample larger than or equal to pRec */
  1902   1902     int iTest;                  /* Next sample to test */
  1903   1903     int res;                    /* Result of comparison operation */
  1904   1904   
  1905   1905   #ifndef SQLITE_DEBUG
  1906   1906     UNUSED_PARAMETER( pParse );
  1907   1907   #endif
  1908         -  assert( pRec!=0 || pParse->db->mallocFailed );
  1909         -  if( pRec==0 ) return;
         1908  +  assert( pRec!=0 );
  1910   1909     iCol = pRec->nField - 1;
  1911   1910     assert( pIdx->nSample>0 );
  1912   1911     assert( pRec->nField>0 && iCol<pIdx->nSampleCol );
  1913   1912     do{
  1914   1913       iTest = (iMin+i)/2;
  1915   1914       res = sqlite3VdbeRecordCompare(aSample[iTest].n, aSample[iTest].p, pRec);
  1916   1915       if( res<0 ){