diff options
| author | dan <dan@noemail.net> | 2014-09-15 15:34:31 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2014-09-15 15:34:31 +0000 |
| commit | d4a80e6742921478b369a9537302bc586c79d812 (patch) | |
| tree | 6731ece80e9d8851555cad39c555482f1db1a006 /src/tokenize.c | |
| parent | ee8d0b4111b47bd91e9d3280e8540d3a560b0cc7 (diff) | |
| parent | 907214c8e83a3d1f35b6cce5768016089193b3c2 (diff) | |
| download | sqlite-d4a80e6742921478b369a9537302bc586c79d812.tar.gz sqlite-d4a80e6742921478b369a9537302bc586c79d812.zip | |
Merge latest trunk changes with this branch.
FossilOrigin-Name: 55b8011d5b455927f5b92a3cb911fd909fb0edab
Diffstat (limited to 'src/tokenize.c')
| -rw-r--r-- | src/tokenize.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tokenize.c b/src/tokenize.c index 4017c3b81..8a7894514 100644 --- a/src/tokenize.c +++ b/src/tokenize.c @@ -77,7 +77,7 @@ const unsigned char ebcdicToAscii[] = { ** end result. ** ** Ticket #1066. the SQL standard does not allow '$' in the -** middle of identfiers. But many SQL implementations do. +** middle of identifiers. But many SQL implementations do. ** SQLite will allow '$' in identifiers for compatibility. ** But the feature is undocumented. */ @@ -398,7 +398,7 @@ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){ pParse->zTail = zSql; i = 0; assert( pzErrMsg!=0 ); - pEngine = sqlite3ParserAlloc((void*(*)(size_t))sqlite3Malloc); + pEngine = sqlite3ParserAlloc(sqlite3Malloc); if( pEngine==0 ){ db->mallocFailed = 1; return SQLITE_NOMEM; |