Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fixed an incorrect const qualifier (caught by clang). |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
fda7c2c63dde08c6ad3487291271a279 |
| User & Date: | stephan 2011-10-17 16:01:18.076 |
References
|
2011-10-17
| ||
| 16:08 | merged in trunk [fda7c2c63d] for side-by-side diffs. ... (check-in: 571f3aca5b user: stephan tags: json-multitag-test, json) | |
Context
|
2011-10-17
| ||
| 23:12 | Fix typo in warning message. ... (check-in: c80ee413ab user: drh tags: trunk) | |
| 16:08 | merged in trunk [fda7c2c63d] for side-by-side diffs. ... (check-in: 571f3aca5b user: stephan tags: json-multitag-test, json) | |
| 16:01 | Fixed an incorrect const qualifier (caught by clang). ... (check-in: fda7c2c63d user: stephan tags: trunk) | |
| 13:09 | Font size adjustments for side-by-side diff. Use the dp= query parameter of timeline on the info page. ... (check-in: eefb31683b user: drh tags: trunk) | |
Changes
Changes to src/merge.c.
| ︙ | ︙ | |||
318 319 320 321 322 323 324 |
" WHERE idp=0 AND idv=0 AND idm>0"
);
while( db_step(&q)==SQLITE_ROW ){
int idm = db_column_int(&q, 0);
int rowid = db_column_int(&q, 1);
int idv;
const char *zName;
| | | 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 |
" WHERE idp=0 AND idv=0 AND idm>0"
);
while( db_step(&q)==SQLITE_ROW ){
int idm = db_column_int(&q, 0);
int rowid = db_column_int(&q, 1);
int idv;
const char *zName;
char *zFullName;
db_multi_exec(
"INSERT INTO vfile(vid,chnged,deleted,rid,mrid,isexe,islink,pathname)"
" SELECT %d,3,0,rid,mrid,isexe,islink,pathname FROM vfile WHERE id=%d",
vid, idm
);
idv = db_last_insert_rowid();
db_multi_exec("UPDATE fv SET idv=%d WHERE rowid=%d", idv, rowid);
|
| ︙ | ︙ |