database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-12 13:01:09 +03:00
Code Activity

Merge the pre-3.8.6 changes into the threads branch.

Browse Source 
FossilOrigin-Name: a608fd1d52606a009c3acc7f1d184b86a7df3c82
This commit is contained in:
drh
2014-08-14 14:02:48 +00:00
parent da2e5862d1 4ed2fb9d84
commit 83b25d32d7
30 changed files with 523 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/select.c
View File

@@ -732,7 +732,7 @@ static void selectInnerLoop(
sqlite3VdbeChangeP4(v, -1, (const char *)pColl, P4_COLLSEQ);
sqlite3VdbeChangeP5(v, SQLITE_NULLEQ);
}
assert( sqlite3VdbeCurrentAddr(v)==iJump );
assert( sqlite3VdbeCurrentAddr(v)==iJump || pParse->db->mallocFailed );
sqlite3VdbeAddOp3(v, OP_Copy, regResult, regPrev, nResultCol-1);
break;
}