/ Check-in [fa0956ed]
Login

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

Overview
Comment:Remove a branch that became unreachable due to one of the earlier check-ins today.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:fa0956edf866f48f448967836709a3ad822ff917
User & Date: drh 2015-04-15 08:37:42
Context
2015-04-15
09:16
Remove an incorrect assert() statement from sqlite3Fts3Dequote(). check-in: bd06eeb8 user: dan tags: trunk
08:37
Remove a branch that became unreachable due to one of the earlier check-ins today. check-in: fa0956ed user: drh tags: trunk
08:20
Fix a problem causing an assert() to fail if a snippet containing 0 tokens was requested from fts3. check-in: eafd0a1e user: dan tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/tokenize.c.

445
446
447
448
449
450
451

452
453
454
455
456
457
458
459
          goto abort_parse;
        }
        break;
      }
    }
  }
abort_parse:

  if( zSql[i]==0 && nErr==0 && pParse->rc==SQLITE_OK ){
    if( lastTokenParsed!=TK_SEMI ){
      sqlite3Parser(pEngine, TK_SEMI, pParse->sLastToken, pParse);
      pParse->zTail = &zSql[i];
    }
    sqlite3Parser(pEngine, 0, pParse->sLastToken, pParse);
  }
#ifdef YYTRACKMAXSTACKDEPTH







>
|







445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
          goto abort_parse;
        }
        break;
      }
    }
  }
abort_parse:
  assert( nErr==0 );
  if( zSql[i]==0 && pParse->rc==SQLITE_OK ){
    if( lastTokenParsed!=TK_SEMI ){
      sqlite3Parser(pEngine, TK_SEMI, pParse->sLastToken, pParse);
      pParse->zTail = &zSql[i];
    }
    sqlite3Parser(pEngine, 0, pParse->sLastToken, pParse);
  }
#ifdef YYTRACKMAXSTACKDEPTH