bk commit into 5.0 tree (gluh:1.1786) BUG#8740

[gluh]

Below is the list of changes that have just been committed into a local
5.0 repository of gluh. When gluh does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1786 05/03/03 17:38:58 gluh@stripped +3 -0
  Fix for bug#8740: Server crash at start on Solaris 9 (64 bit)

  sql/sql_class.h
    1.219 05/03/03 17:37:46 gluh@stripped +1 -1
    Fix for bug#8740: Server crash at start on Solaris 9 (64 bit)

  sql/mysqld.cc
    1.435 05/03/03 17:37:45 gluh@stripped +1 -1
    Fix for bug#8740: Server crash at start on Solaris 9 (64 bit)

  sql/log.cc
    1.152 05/03/03 17:37:45 gluh@stripped +1 -1
    Fix for bug#8740: Server crash at start on Solaris 9 (64 bit)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gluh
# Host:	gluh.mysql.r18.ru
# Root:	/home/gluh/MySQL-MERGE/mysql-5.0

--- 1.151/sql/log.cc	Wed Mar  2 12:38:15 2005
+++ 1.152/sql/log.cc	Thu Mar  3 17:37:45 2005
@@ -2457,7 +2457,7 @@
 
 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;
 

--- 1.434/sql/mysqld.cc	Wed Mar  2 18:37:40 2005
+++ 1.435/sql/mysqld.cc	Thu Mar  3 17:37:45 2005
@@ -4566,7 +4566,7 @@
    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.",

--- 1.218/sql/sql_class.h	Wed Mar  2 12:38:15 2005
+++ 1.219/sql/sql_class.h	Thu Mar  3 17:37:46 2005
@@ -45,7 +45,7 @@
 
 #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;