#At lp:maria 2727 knielsen@knielsen-hq.org 2009-09-04 PBXT fixes. - Silence a compiler warning. - Don't build pbms object files now that we disabled pbms. modified: storage/pbxt/src/Makefile.am storage/pbxt/src/datalog_xt.cc per-file messages: storage/pbxt/src/Makefile.am We disabled PBMS, so don't build it. storage/pbxt/src/datalog_xt.cc Silence a warning about signed/unsigned comparison. === modified file 'storage/pbxt/src/Makefile.am' --- a/storage/pbxt/src/Makefile.am 2009-08-31 11:07:44 +0000 +++ b/storage/pbxt/src/Makefile.am 2009-09-04 07:29:34 +0000 @@ -30,7 +30,7 @@ libpbxt_la_SOURCES = bsearch_xt.cc cache datadic_xt.cc datalog_xt.cc filesys_xt.cc hashtab_xt.cc \ ha_pbxt.cc heap_xt.cc index_xt.cc linklist_xt.cc \ memory_xt.cc myxt_xt.cc pthread_xt.cc restart_xt.cc \ - pbms_enabled.cc sortedlist_xt.cc strutil_xt.cc \ + sortedlist_xt.cc strutil_xt.cc \ tabcache_xt.cc table_xt.cc trace_xt.cc thread_xt.cc \ systab_xt.cc ha_xtsys.cc discover_xt.cc \ util_xt.cc xaction_xt.cc xactlog_xt.cc lock_xt.cc locklist_xt.cc @@ -49,4 +49,4 @@ libpbxt_a_SOURCES = $(libpbxt_la_SOURCE libpbxt_a_CXXFLAGS = $(AM_CXXFLAGS) libpbxt_a_CFLAGS = $(AM_CFLAGS) -std=c99 -EXTRA_DIST = CMakeLists.txt +EXTRA_DIST = CMakeLists.txt pbms_enabled.cc === modified file 'storage/pbxt/src/datalog_xt.cc' --- a/storage/pbxt/src/datalog_xt.cc 2009-09-03 06:15:03 +0000 +++ b/storage/pbxt/src/datalog_xt.cc 2009-09-04 07:29:34 +0000 @@ -410,7 +410,7 @@ static void dl_recover_log(XTThreadPtr s ASSERT_NS(seq_read.sl_log_eof == seq_read.sl_rec_log_offset); data_log->dlf_log_eof = seq_read.sl_rec_log_offset; - if (data_log->dlf_log_eof < sizeof(XTXactLogHeaderDRec)) { + if ((size_t) data_log->dlf_log_eof < sizeof(XTXactLogHeaderDRec)) { data_log->dlf_log_eof = sizeof(XTXactLogHeaderDRec); if (!dl_create_log_header(data_log, seq_read.sl_log_file, self)) xt_throw(self);