diff options
| author | dan <dan@noemail.net> | 2018-03-22 19:52:22 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2018-03-22 19:52:22 +0000 |
| commit | f231e18c6bd10c737fe0e16123bbd2877b8b4e88 (patch) | |
| tree | c2b2a6d23a8532a7371f4d9ae4ba4704c67fd84c /ext/session/sqlite3session.c | |
| parent | 3fa5463c03f2a75df1816c33e48741e6e1fdaa94 (diff) | |
| download | sqlite-f231e18c6bd10c737fe0e16123bbd2877b8b4e88.tar.gz sqlite-f231e18c6bd10c737fe0e16123bbd2877b8b4e88.zip | |
Fix another problem with rebasing updates against multiple remote changes.
FossilOrigin-Name: c8e7b5a061a3f2fbd9072530177b80f917b39ab5d7cd6acb0a221ab33e78a5cd
Diffstat (limited to 'ext/session/sqlite3session.c')
| -rw-r--r-- | ext/session/sqlite3session.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/session/sqlite3session.c b/ext/session/sqlite3session.c index 3abe4697f..2d80f1d4c 100644 --- a/ext/session/sqlite3session.c +++ b/ext/session/sqlite3session.c @@ -4594,7 +4594,7 @@ static int sessionChangeMerge( for(i=0; i<pTab->nCol; i++){ int n1 = sessionSerialLen(a1); int n2 = sessionSerialLen(a2); - if( *a1==0xFF || *a2==0xFF ){ + if( *a1==0xFF || (pTab->abPK[i]==0 && bIndirect) ){ *pOut++ = 0xFF; }else if( *a2==0 ){ memcpy(pOut, a1, n1); |