← Back to branch summary

~vkolesnikov/pbxt/pbxt-drizzle-merge

« back to all changes in this revision

Viewing changes to src/restart_xt.cc

  • Committer: Paul McCullagh
  • Date: 2009-03-26 10:36:38 UTC
  • mfrom: (598.1.1 pbxt)
  • Revision ID: paul.mccullagh@primebase.org-20090326103638-mie9ly04djrzsefr
Merged changes for RN232

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/restart_xt.cc
1772
1772
                /* Read the checkpoint data: */
1773
1773
                if (use_buffer) {
1774
1774
                        u_int           no_of_logs;
1775
 
                        xtLogID         log_id;
1776
 
                        xtTableID       tab_id;
 
1775
                        xtLogID         xt_log_id;
 
1776
                        xtTableID       xt_tab_id;
1777
1777
 
1778
1778
                        xres_cp_number = XT_GET_DISK_6(use_buffer->xcp_chkpnt_no_6);
1779
1779
                        xres_cp_log_id = XT_GET_DISK_4(use_buffer->xcp_log_id_4);
1780
1780
                        xres_cp_log_offset = XT_GET_DISK_6(use_buffer->xcp_log_offs_6);
1781
 
                        tab_id = XT_GET_DISK_4(use_buffer->xcp_tab_id_4);
1782
 
                        if (tab_id > db->db_curr_tab_id)
1783
 
                                db->db_curr_tab_id = tab_id;
 
1781
                        xt_tab_id = XT_GET_DISK_4(use_buffer->xcp_tab_id_4);
 
1782
                        if (xt_tab_id > db->db_curr_tab_id)
 
1783
                                db->db_curr_tab_id = xt_tab_id;
1784
1784
                        db->db_xn_curr_id = XT_GET_DISK_4(use_buffer->xcp_xact_id_4);
1785
1785
                        ind_rec_log_id = XT_GET_DISK_4(use_buffer->xcp_ind_rec_log_id_4);
1786
1786
                        ind_rec_log_offset = XT_GET_DISK_6(use_buffer->xcp_ind_rec_log_offs_6);
1808
1808
                         * will be removed.
1809
1809
                         */
1810
1810
                        for (u_int i=0; i<no_of_logs; i++) {
1811
 
                                log_id = (xtLogID) XT_GET_DISK_2(use_buffer->xcp_del_log[i]);
 
1811
                                xt_log_id = (xtLogID) XT_GET_DISK_2(use_buffer->xcp_del_log[i]);
1812
1812
#ifdef DEBUG_PRINT
1813
1813
                                if (i != 0)
1814
1814
                                        printf(", ");
1815
 
                                printf("%d", (int) log_id);
 
1815
                                printf("%d", (int) xt_log_id);
1816
1816
#endif
1817
1817
#ifdef DEBUG_KEEP_LOGS
1818
 
                                xt_dl_set_to_delete(self, db, log_id);
 
1818
                                xt_dl_set_to_delete(self, db, xt_log_id);
1819
1819
#else
1820
 
                                if (!xres_delete_data_log(db, log_id))
 
1820
                                if (!xres_delete_data_log(db, xt_log_id))
1821
1821
                                        xt_throw(self);
1822
1822
#endif
1823
1823
                        }