1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-29 08:01:23 +03:00

Merge in the latest changes from trunk.

FossilOrigin-Name: 69d5bed017bda3e184857febcc8b6f6bed6ad228
This commit is contained in:
drh
2013-08-06 14:52:27 +00:00
28 changed files with 380 additions and 342 deletions

View File

@ -429,6 +429,7 @@ static void vtshimAuxDestructor(void *pXAux){
assert( pAux->pAllVtab==0 );
if( !pAux->bDisposed && pAux->xChildDestroy ){
pAux->xChildDestroy(pAux->pChildAux);
pAux->xChildDestroy = 0;
}
sqlite3_free(pAux->zName);
sqlite3_free(pAux->pMod);
@ -527,7 +528,10 @@ void sqlite3_dispose_module(void *pX){
pAux->pMod->xDisconnect(pVtab->pChild);
}
pAux->bDisposed = 1;
if( pAux->xChildDestroy ) pAux->xChildDestroy(pAux->pChildAux);
if( pAux->xChildDestroy ){
pAux->xChildDestroy(pAux->pChildAux);
pAux->xChildDestroy = 0;
}
}
}