diff options
author | Hans-Christoph Steiner <hans@eds.org> | 2013-01-17 14:23:24 -0500 |
---|---|---|
committer | Hans-Christoph Steiner <hans@eds.org> | 2013-01-17 14:23:24 -0500 |
commit | 4f9313b1de21a03df32bfba4d94207c78a2171b0 (patch) | |
tree | 6a637dd4dde653f870346a37ec6555eb0574949a /src/delete.c | |
parent | 9da5e9acd37e51b86429d938e7e6a64ffb02da84 (diff) | |
parent | 1b5ba8e022836fa8ab93bc90df1b34a29ea6e134 (diff) |
Merge tag 'upstream/2.1.1'
Upstream version 2.1.1
Conflicts:
.gitignore
Diffstat (limited to 'src/delete.c')
-rw-r--r-- | src/delete.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/delete.c b/src/delete.c index eead485..44e5995 100644 --- a/src/delete.c +++ b/src/delete.c @@ -371,7 +371,7 @@ void sqlite3DeleteFrom( */ sqlite3VdbeAddOp2(v, OP_Null, 0, iRowSet); pWInfo = sqlite3WhereBegin( - pParse, pTabList, pWhere, 0, 0, WHERE_DUPLICATES_OK + pParse, pTabList, pWhere, 0, 0, WHERE_DUPLICATES_OK, 0 ); if( pWInfo==0 ) goto delete_from_cleanup; regRowid = sqlite3ExprCodeGetColumn(pParse, pTab, -1, iCur, iRowid, 0); |