BitKeeper/deleted/.del-TupAccess.cpp~5273de82afd8d7d0:
  Delete: ndb/src/common/debugger/signaldata/TupAccess.cpp
BitKeeper/deleted/.del-TupAccess.hpp~a9b722c1d6fa1442:
  Delete: ndb/include/kernel/signaldata/TupAccess.hpp

into mysql.com:/space/pekka/ndb/version/my41-tux

  merge


sql/ha_ndbcluster.cc:
  merge

sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster.cc:
  merge

  ndb_supported_type, include all types in switch


sql/ha_ndbcluster.cc:
  ndb_supported_type, include all types in switch

into mysql.com:/space/pekka/ndb/version/my41-tux

  new file

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb


mysql-test/mysql-test-run.sh:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged

into sanja.is.com.ua:/home/bell/mysql/bk/work-subs-4.1


sql/item_subselect.cc:
  Auto merged

into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1

into sanja.is.com.ua:/home/bell/mysql/bk/work-subs-4.1

into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1

into sanja.is.com.ua:/home/bell/mysql/bk/work-subs-4.1

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

into mysql.com:/space/my/mysql-4.1

into mysql.com:/space/my/mysql-4.1-build

   when copying a small index file because the value returned
   for $length is < 1024. This can happen if the filehandle
   was open()ed as an UTF-8 encoded file with Unicode characters
   (In this case read() returns characters not bytes)
   (Thanks to Mike Bethune) for this hint)

sql/item_subselect.cc:
  stack overflow check added for subqueries processing

  Language fixups.


scripts/mysql_fix_privilege_tables.sh:
  Language fixups.

   so it's included in the source distribution

   Mac OS X: the name of the startup script itself must match the
   name of the subdirectory it's located in. Changed MySQL->MySQLCOM 
   in the Do-pkg script and renamed the file in BK. (Thanks to Bryan
   McCormack for reporting this)


Build-tools/Do-pkg:
   - renamed script from MySQL to MySQLCOM to match the name of the
     directory it's installed in
support-files/MacOSX/MySQLCOM:
   - Fixed the file and directory name to match the actual location

into mysql.com:/home/mysql_src/mysql-4.1-874

by KILL or shutdown, do not mark the table as corrupted".
It is indeed more logical to leave the corruption flag unchanged.
This cannot be extended to REPAIR/OPTIMIZE as they make no backup copy
of the MYI. This patch was tested with KILL and mysqladmin shutdown
while a CHECK TABLE was running. Without the patch, the table becomes
unusable (can't INSERT to it, error 145). With the patch, no.


sql/ha_myisam.cc:
  When CHECK TABLE or ANALYZE TABLE is killed by KILL,
  do not mark the table corrupted; leave its corruption flag
  unchanged.