database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

Merge all trunk enhancements and fixes into the sessions branch.

Browse Source 
FossilOrigin-Name: de7083cfe2bb00b689bec6bcc75e994f564ceda6
This commit is contained in:
drh
2015-05-05 17:12:27 +00:00
parent b9db909952 0a96931b76
commit d689fd3a92
60 changed files with 1679 additions and 655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vdbe.c
View File

@@ -1215,10 +1215,11 @@ case OP_Move: {
memAboutToChange(p, pOut);
sqlite3VdbeMemMove(pOut, pIn1);
#ifdef SQLITE_DEBUG
if( pOut->pScopyFrom>=&aMem[p1] && pOut->pScopyFrom<&aMem[p1+pOp->p3] ){
pOut->pScopyFrom += p1 - pOp->p2;
if( pOut->pScopyFrom>=&aMem[p1] && pOut->pScopyFrom<pOut ){
pOut->pScopyFrom += pOp->p2 - p1;
}
#endif
Deephemeralize(pOut);
REGISTER_TRACE(p2++, pOut);
pIn1++;
pOut++;
@@ -2487,7 +2488,7 @@ case OP_Column: {
}
}
/* If after trying to extra new entries from the header, nHdrParsed is
/* If after trying to extract new entries from the header, nHdrParsed is
** still not up to p2, that means that the record has fewer than p2
** columns. So the result will be either the default value or a NULL.
*/
@@ -6167,8 +6168,9 @@ case OP_VOpen: {
pCur->pVtabCursor = pVtabCursor;
pVtab->nRef++;
}else{
db->mallocFailed = 1;
assert( db->mallocFailed );
pModule->xClose(pVtabCursor);
goto no_mem;
}
}
break;