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 recent enhancements from trunk.

Browse Source 
FossilOrigin-Name: cb77236673e30af1e8749d984dedecc8f901b255
This commit is contained in:
drh
2015-09-01 18:52:35 +00:00
parent 89a10b2d53 3ad93bba84
commit 5969c657ae
40 changed files with 2976 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/delete.c
View File

@@ -450,7 +450,7 @@ void sqlite3DeleteFrom(
iKey = ++pParse->nMem;
nKey = 0; /* Zero tells OP_Found to use a composite key */
sqlite3VdbeAddOp4(v, OP_MakeRecord, iPk, nPk, iKey,
sqlite3IndexAffinityStr(v, pPk), nPk);
sqlite3IndexAffinityStr(pParse->db, pPk), nPk);
sqlite3VdbeAddOp2(v, OP_IdxInsert, iEphCur, iKey);
}else{
/* Get the rowid of the row to be deleted and remember it in the RowSet */