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 recent trunk changes into the sessions branch.

Browse Source 
FossilOrigin-Name: 2d33afe0c43cb99caa521c48b721c3b0971e967c
This commit is contained in:
drh
2014-05-20 00:20:23 +00:00
parent 2e525f18e2 27f2468422
commit d963982049
70 changed files with 2931 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/vdbe.c
View File

@@ -4293,6 +4293,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;
}