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 trunk 3.8.8 beta changes into the sessions branch

Browse Source 
FossilOrigin-Name: 0ba124540b5b2a9ceda0f4f4a46e6be54edad813
This commit is contained in:
drh
2015-01-14 17:16:23 +00:00
parent f7af7a17b9 068a251d99
commit 7a20f698df
52 changed files with 791 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vdbe.c
View File

@@ -3833,8 +3833,8 @@ case OP_Found: { /* jump, in3 */
/* For the OP_NoConflict opcode, take the jump if any of the
** input fields are NULL, since any key with a NULL will not
** conflict */
for(ii=0; ii<r.nField; ii++){
if( r.aMem[ii].flags & MEM_Null ){
for(ii=0; ii<pIdxKey->nField; ii++){
if( pIdxKey->aMem[ii].flags & MEM_Null ){
pc = pOp->p2 - 1; VdbeBranchTaken(1,2);
break;
}