diff options
| author | drh <drh@noemail.net> | 2015-04-15 14:14:38 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-04-15 14:14:38 +0000 |
| commit | ff363ee1217d79e8988a16ef0d72e5ee1729dc48 (patch) | |
| tree | ad4bf050eb315f2742224500d564bb8918458bf5 /src/tokenize.c | |
| parent | df3c171881b4ee77003b9d7e287220c22dbc97a2 (diff) | |
| parent | 0d01ec8de83b4e0d7523d67c5f92a44f0ba79b8e (diff) | |
| download | sqlite-ff363ee1217d79e8988a16ef0d72e5ee1729dc48.tar.gz sqlite-ff363ee1217d79e8988a16ef0d72e5ee1729dc48.zip | |
Merge all recent trunk fixes and enhancements into the sessions branch.
FossilOrigin-Name: e65e65f9bc9b4bf5c9dd6e3a77a0d5f03c40e006
Diffstat (limited to 'src/tokenize.c')
| -rw-r--r-- | src/tokenize.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/tokenize.c b/src/tokenize.c index 5068742f3..2f8fd98ed 100644 --- a/src/tokenize.c +++ b/src/tokenize.c @@ -430,10 +430,8 @@ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){ break; } case TK_ILLEGAL: { - sqlite3DbFree(db, *pzErrMsg); - *pzErrMsg = sqlite3MPrintf(db, "unrecognized token: \"%T\"", + sqlite3ErrorMsg(pParse, "unrecognized token: \"%T\"", &pParse->sLastToken); - nErr++; goto abort_parse; } case TK_SEMI: { @@ -451,7 +449,8 @@ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){ } } abort_parse: - if( zSql[i]==0 && nErr==0 && pParse->rc==SQLITE_OK ){ + 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]; |