Fossil

Diff
Login

Diff

Differences From Artifact [94b3b7d449]:

To Artifact [d5921b588a]:


1294
1295
1296
1297
1298
1299
1300
1301

1302
1303
1304
1305
1306
1307


1308
1309
1310
1311
1312
1313
1314
1294
1295
1296
1297
1298
1299
1300

1301
1302
1303
1304
1305


1306
1307
1308
1309
1310
1311
1312
1313
1314







-
+




-
-
+
+







        nc = 1;
        zErrMsg = "cannot merge binary file";
        zType = "ERROR";
      }
      blob_init(&sql, 0, 0);
      blob_append_sql(&sql, 
        "INSERT INTO mergestat(op,fnp,ridp,fn,ridv,sz,fnm,ridm,fnr,nc,msg)"
        "VALUES(%Q,%Q,%d,%Q,%d,%d,%Q,%d,%Q,%d,%Q)",
        "VALUES(%Q,%Q,%d,%Q,iff(%d,%d,NULL),iif(%d,%d,NULL),%Q,%d,%Q,%d,%Q)",
        /* op   */ zType,
        /* fnp  */ zFnp,
        /* ridp */ ridp,
        /* fn   */ zName,
        /* ridv */ chnged==0 ? ridv : 0,
        /* sz   */ chnged!=0 ? sz : 0,
        /* ridv */ chnged==0, ridv,
        /* sz   */ chnged!=0, sz,
        /* fnm  */ zFnm,
        /* ridm */ ridm,
        /* fnr  */ zName,
        /* nc   */ nc,
        /* msg  */ zErrMsg
      );
      db_multi_exec("%s", blob_sql_text(&sql));