database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-27 20:41:58 +03:00
Code Activity

Fix another problem with rebasing updates against multiple remote changes.

Browse Source 
FossilOrigin-Name: c8e7b5a061a3f2fbd9072530177b80f917b39ab5d7cd6acb0a221ab33e78a5cd
This commit is contained in:
dan
2018-03-22 19:52:22 +00:00
parent 3fa5463c03
commit f231e18c6b
5 changed files with 90 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/session/sqlite3session.c
View File

@ -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);