mirror of
https://github.com/sqlite/sqlite.git
synced 2025-07-27 20:41:58 +03:00
Merge trunk changes into experimental branch.
FossilOrigin-Name: fd1e5cade04961c2f5438a1dfcc2e15eafb4503f
This commit is contained in:
@ -441,6 +441,7 @@ static int fts3DisconnectMethod(sqlite3_vtab *pVtab){
|
||||
int i;
|
||||
|
||||
assert( p->nPendingData==0 );
|
||||
assert( p->pSegments==0 );
|
||||
|
||||
/* Free any prepared statements held */
|
||||
for(i=0; i<SizeofArray(p->aStmt); i++){
|
||||
@ -2061,7 +2062,6 @@ static int fts3TermSelect(
|
||||
*/
|
||||
static int fts3DoclistCountDocids(int isPoslist, char *aList, int nList){
|
||||
int nDoc = 0; /* Return value */
|
||||
|
||||
if( aList ){
|
||||
char *aEnd = &aList[nList]; /* Pointer to one byte after EOF */
|
||||
char *p = aList; /* Cursor */
|
||||
|
@ -129,7 +129,6 @@ struct Fts3Table {
|
||||
int nNodeSize; /* Soft limit for node size */
|
||||
u8 bHasContent; /* True if %_content table exists */
|
||||
u8 bHasDocsize; /* True if %_docsize table exists */
|
||||
|
||||
sqlite3_blob *pSegments; /* Blob handle open on %_segments table */
|
||||
|
||||
/* The following hash table is used to buffer pending index updates during
|
||||
|
Reference in New Issue
Block a user