Fossil SCM
Fix a "%d" that ought to be a "%lld" because the argument is a 64-bit integer. This error causes no problems on 64-bit builds, but fails horribly on 32-bit.
Commit
546cbce277f90de693da26ea25d7a5fb85a9a0140e89513674aa1d6f71cad093
Parent
a69823c10beb39c…
1 file changed
+1
-1
+1
-1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -1292,11 +1292,11 @@ | ||
| 1292 | 1292 | zErrMsg = "cannot merge binary file"; |
| 1293 | 1293 | zType = "ERROR"; |
| 1294 | 1294 | } |
| 1295 | 1295 | db_multi_exec( |
| 1296 | 1296 | "INSERT INTO mergestat(op,fnp,ridp,fn,ridv,sz,fnm,ridm,fnr,nc,msg)" |
| 1297 | - "VALUES(%Q,%Q,%d,%Q,iif(%d,%d,NULL),iif(%d,%d,NULL),%Q,%d," | |
| 1297 | + "VALUES(%Q,%Q,%d,%Q,iif(%d,%d,NULL),iif(%d,%lld,NULL),%Q,%d," | |
| 1298 | 1298 | "%Q,%d,%Q)", |
| 1299 | 1299 | /* op */ zType, |
| 1300 | 1300 | /* fnp */ db_column_text(&q, 9), |
| 1301 | 1301 | /* ridp */ ridp, |
| 1302 | 1302 | /* fn */ zName, |
| 1303 | 1303 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -1292,11 +1292,11 @@ | |
| 1292 | zErrMsg = "cannot merge binary file"; |
| 1293 | zType = "ERROR"; |
| 1294 | } |
| 1295 | db_multi_exec( |
| 1296 | "INSERT INTO mergestat(op,fnp,ridp,fn,ridv,sz,fnm,ridm,fnr,nc,msg)" |
| 1297 | "VALUES(%Q,%Q,%d,%Q,iif(%d,%d,NULL),iif(%d,%d,NULL),%Q,%d," |
| 1298 | "%Q,%d,%Q)", |
| 1299 | /* op */ zType, |
| 1300 | /* fnp */ db_column_text(&q, 9), |
| 1301 | /* ridp */ ridp, |
| 1302 | /* fn */ zName, |
| 1303 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -1292,11 +1292,11 @@ | |
| 1292 | zErrMsg = "cannot merge binary file"; |
| 1293 | zType = "ERROR"; |
| 1294 | } |
| 1295 | db_multi_exec( |
| 1296 | "INSERT INTO mergestat(op,fnp,ridp,fn,ridv,sz,fnm,ridm,fnr,nc,msg)" |
| 1297 | "VALUES(%Q,%Q,%d,%Q,iif(%d,%d,NULL),iif(%d,%lld,NULL),%Q,%d," |
| 1298 | "%Q,%d,%Q)", |
| 1299 | /* op */ zType, |
| 1300 | /* fnp */ db_column_text(&q, 9), |
| 1301 | /* ridp */ ridp, |
| 1302 | /* fn */ zName, |
| 1303 |