database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-10 01:02:56 +03:00
Code Activity

Add the conflict2.test script. Fix issues discovered by this script.

Browse Source 
FossilOrigin-Name: 294ed33756b06375e56c41f1088d42ee48adbdc8
This commit is contained in:
drh
2013-11-05 01:59:07 +00:00
parent d269461c91
commit 00012df46d
18 changed files with 937 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/update.c
View File

@@ -453,7 +453,7 @@ void sqlite3Update(
for(i=0; i<pTab->nCol; i++){
if( oldmask==0xffffffff
|| (i<32 && (oldmask & (1<<i)))
|| (chngPk && (pTab->aCol[i].colFlags & COLFLAG_PRIMKEY)!=0)
|| (pTab->aCol[i].colFlags & COLFLAG_PRIMKEY)!=0
){
sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur, i, regOld+i);
}else{