diff options
| author | drh <drh@noemail.net> | 2019-12-31 14:49:10 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2019-12-31 14:49:10 +0000 |
| commit | 5f6a2ed7f275a201a8ce9fd81b60a2a552c20f6b (patch) | |
| tree | 0a8359d1c5b0829d9a6292e85665979bf364e076 /ext/fts5/fts5_main.c | |
| parent | d335bc40a6576d8759466d8efaaaf82b04667aaa (diff) | |
| parent | 02ff747bc0a6039cddf6108719426d247026fa18 (diff) | |
| download | sqlite-5f6a2ed7f275a201a8ce9fd81b60a2a552c20f6b.tar.gz sqlite-5f6a2ed7f275a201a8ce9fd81b60a2a552c20f6b.zip | |
Merge recent enhancements from trunk.
FossilOrigin-Name: 39d55579376906f212271ce9b2d367e3ad029fb173f22c7253312b467970208a
Diffstat (limited to 'ext/fts5/fts5_main.c')
| -rw-r--r-- | ext/fts5/fts5_main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/fts5/fts5_main.c b/ext/fts5/fts5_main.c index 0980c5b4d..347bf7f23 100644 --- a/ext/fts5/fts5_main.c +++ b/ext/fts5/fts5_main.c @@ -289,7 +289,10 @@ static void fts5CheckTransactionState(Fts5FullTable *p, int op, int iSavepoint){ case FTS5_ROLLBACKTO: assert( p->ts.eState==1 ); assert( iSavepoint>=-1 ); - assert( iSavepoint<=p->ts.iSavepoint ); + /* The following assert() can fail if another vtab strikes an error + ** within an xSavepoint() call then SQLite calls xRollbackTo() - without + ** having called xSavepoint() on this vtab. */ + /* assert( iSavepoint<=p->ts.iSavepoint ); */ p->ts.iSavepoint = iSavepoint; break; } |