Commit 66d2d13a authored by unknown's avatar unknown
Browse files

Fix for bug#8740: Server crash at start on Solaris 9 (64 bit)

parent 43668c53

sql/log.cc

+1 −1
Original line number Diff line number Diff line
@@ -2457,7 +2457,7 @@ void sql_print_information(const char *format, ...) 


static const char tc_log_magic[]={(char) 254, 0x23, 0x05, 0x74};



uint opt_tc_log_size=TC_LOG_MIN_SIZE;

ulong opt_tc_log_size= TC_LOG_MIN_SIZE;

ulong tc_log_max_pages_used=0, tc_log_page_size=0,

      tc_log_page_waits=0, tc_log_cur_pages_used=0;

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -4566,7 +4566,7 @@ Disable with --skip-isam.", 
   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"log-tc-size", OPT_LOG_TC_SIZE, "Size of transaction coordinator log.",

   (gptr*) &opt_tc_log_size, (gptr*) &opt_tc_log_size, 0, GET_ULONG,

   REQUIRED_ARG, TC_LOG_MIN_SIZE, TC_LOG_MIN_SIZE, ~0, 0, TC_LOG_PAGE_SIZE, 0},

   REQUIRED_ARG, TC_LOG_MIN_SIZE, TC_LOG_MIN_SIZE, ~0L, 0, TC_LOG_PAGE_SIZE, 0},

  {"log-update", OPT_UPDATE_LOG,

   "The update log is deprecated since version 5.0, is replaced by the binary \

log and this option justs turns on --log-bin instead.",

sql/sql_class.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ extern const char **errmesg; 


#define TC_LOG_PAGE_SIZE   8192

#define TC_LOG_MIN_SIZE    (3*TC_LOG_PAGE_SIZE)

extern uint opt_tc_log_size;

extern ulong opt_tc_log_size;

extern ulong tc_log_max_pages_used;

extern ulong tc_log_page_size;

extern ulong tc_log_page_waits;