diff options
| author | drh <drh@noemail.net> | 2015-02-21 15:13:50 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-02-21 15:13:50 +0000 |
| commit | 878acb32efa879e0b680cce08f63e65f89fa4f77 (patch) | |
| tree | 84f334c6f75c248e10f9a92c17e3dae631f2c597 /src/tokenize.c | |
| parent | 1ee4a2dd88663517c8dd980926af9e76f37c88fb (diff) | |
| parent | 2da47d38691b74a6cfa2ce2e5bdce3bb7d8fc186 (diff) | |
| download | sqlite-878acb32efa879e0b680cce08f63e65f89fa4f77.tar.gz sqlite-878acb32efa879e0b680cce08f63e65f89fa4f77.zip | |
Merge all recent trunk changes into the sessions branch.
FossilOrigin-Name: f36bb5fa5c5e3430808fe35d58f45559a216d341
Diffstat (limited to 'src/tokenize.c')
| -rw-r--r-- | src/tokenize.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/tokenize.c b/src/tokenize.c index f0360eef6..6fb5a35c3 100644 --- a/src/tokenize.c +++ b/src/tokenize.c @@ -390,10 +390,7 @@ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){ sqlite3 *db = pParse->db; /* The database connection */ int mxSqlLen; /* Max length of an SQL string */ - -#ifdef SQLITE_ENABLE_API_ARMOR - if( zSql==0 || pzErrMsg==0 ) return SQLITE_MISUSE_BKPT; -#endif + assert( zSql!=0 ); mxSqlLen = db->aLimit[SQLITE_LIMIT_SQL_LENGTH]; if( db->nVdbeActive==0 ){ db->u1.isInterrupted = 0; |