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 latest trunk enhancements and fixes into the orderby-planning branch.

Browse Source 
FossilOrigin-Name: 84862d3a095629d20c8e7b8a16f4dc26cd41ab6d
This commit is contained in:
drh
2014-05-02 13:09:06 +00:00
parent f690c14280 e724d3d26a
commit fb0d6e56d6
42 changed files with 2378 additions and 1071 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/vdbe.c
View File

@@ -4250,6 +4250,7 @@ case OP_SorterData: {
pC = p->apCsr[pOp->p1];
assert( isSorter(pC) );
rc = sqlite3VdbeSorterRowkey(pC, pOut);
assert( rc!=SQLITE_OK || (pOut->flags & MEM_Blob) );
break;
}
@@ -6341,8 +6342,8 @@ default: { /* This is really OP_Noop and OP_Explain */
#ifdef VDBE_PROFILE
{
u64 elapsed = sqlite3Hwtime() - start;
pOp->cycles += elapsed;
u64 endTime = sqlite3Hwtime();
if( endTime>start ) pOp->cycles += endTime - start;
pOp->cnt++;
}
#endif