bk commit into 5.0 tree (tomas:1.1771)

[tomas]

Below is the list of changes that have just been committed into a local
5.0 repository of tomas. When tomas 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.1771 05/03/03 17:29:22 tomas@stripped +2 -0
  Merge tulin@stripped:/home/bk/mysql-5.0-ndb
  into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

  sql/log.cc
    1.152 05/03/03 17:29:20 tomas@stripped +0 -0
    Auto merged

  ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.72 05/03/03 17:29:20 tomas@stripped +0 -0
    Auto merged

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.0-ndb/RESYNC

--- 1.151/sql/log.cc	2005-03-03 08:50:34 +01:00
+++ 1.152/sql/log.cc	2005-03-03 17:29:20 +01:00
@@ -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;