diff --git a/checkin_notes b/checkin_notes index 241b04628c..2cc2deffe7 100644 --- a/checkin_notes +++ b/checkin_notes @@ -8299,3 +8299,9 @@ Rom 9 Nov 2011 clientscr/ screensaver_win.cpp + +David 10 Nov 2011 + - server: more fixes to DB to handle unsigned result IDs + + db/ + boinc_db.cpp diff --git a/db/boinc_db.cpp b/db/boinc_db.cpp index 092cd853a8..12897ae1fa 100644 --- a/db/boinc_db.cpp +++ b/db/boinc_db.cpp @@ -943,7 +943,7 @@ int DB_RESULT::mark_as_sent(int old_server_state, int report_grace_period) { int retval; sprintf(query, - "update result set server_state=%d, hostid=%d, userid=%d, sent_time=%d, report_deadline=%d, flops_estimate=%.15e, app_version_id=%d where id=%d and server_state=%d", + "update result set server_state=%d, hostid=%d, userid=%d, sent_time=%d, report_deadline=%d, flops_estimate=%.15e, app_version_id=%d where id=%u and server_state=%d", server_state, hostid, userid, @@ -1401,7 +1401,7 @@ int DB_TRANSITIONER_ITEM_SET::update_result(TRANSITIONER_ITEM& ti) { sprintf(query, "update result set server_state=%d, outcome=%d, " - "validate_state=%d, file_delete_state=%d where id=%d", + "validate_state=%d, file_delete_state=%d where id=%u", ti.res_server_state, ti.res_outcome, ti.res_validate_state, @@ -1625,7 +1625,7 @@ int DB_VALIDATOR_ITEM_SET::update_result(RESULT& res) { sprintf(query, "update result set validate_state=%d, granted_credit=%.15e, " "server_state=%d, outcome=%d, opaque=%lf, random=%d, runtime_outlier=%d " - "where id=%d", + "where id=%u", res.validate_state, res.granted_credit, res.server_state, @@ -1967,7 +1967,7 @@ int DB_SCHED_RESULT_ITEM_SET::update_result(SCHED_RESULT_ITEM& ri) { " teamid=%d, " " elapsed_time=%.15e " "WHERE " - " id=%d", + " id=%u", ri.hostid, ri.received_time, ri.client_state,