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

  fix erronous assert at scan close, lock abort


ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Scan is closing.  Lock conf is in job buffer.
  We have sent lock abort to flush it out.
  At execute conf need to RNIL current lock op
  to avoid assert fail when abort comes.
  Bug seen couple of times, hard to test..

  make subclass friend for gcc-2.95 et al


ndb/src/mgmsrv/MgmtSrvr.hpp:
  make subclass friend for gcc-2.95 et al

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


ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged

ndb/test/ndbapi/Makefile.am:
  SCCS merged

ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Remove comma

mysql-test/mysql-test-run.sh:
  Auto merged
ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  SCCS merged

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

  add NdbSqlUtil::cmp for missing datatypes


ndb/include/util/NdbSqlUtil.hpp:
  add NdbSqlUtil::cmp for missing datatypes
ndb/src/common/util/NdbSqlUtil.cpp:
  add NdbSqlUtil::cmp for missing datatypes

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


ndb/test/ndbapi/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged

Make sure not to fiddle with state, if not waiting for scan


ndb/src/ndbapi/Ndbif.cpp:
  Make sure not to fiddle with state, if not waiting for scan

into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.1

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:/home/kostja/mysql/mysql-4.1-warnings

Use of acconfig.h is deprecated in modern autotools (a cleaner patch).


BitKeeper/deleted/.del-acconfig.h~8d2e3113fc8056da:
  Delete: acconfig.h
acinclude.m4:
  All templates inlined into AC_DEFINE/AC_DEFINE_UNQUOTED.
  Use of acconfig.h is deprecated in modern autotools.
configure.in:
  All templates inlined into AC_DEFINE/AC_DEFINE_UNQUOTED.
  Use of acconfig.h is deprecated in modern autotools.

Fix for stored procedures BUG#4726: Stored procedure crash when looping over SELECT with complex WHERE's.


sql/sql_prepare.cc:
  Cleanup cond items too. (Fix for stored procedures.)

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

  mysqld crashes on CREATE TABLE in a database with corrupted db.opt file.
  Bug#4646


sql/sql_db.cc:
  mysqld crashes on CREATE TABLE in a database with corrupted db.opt file.
  Bug#4646

  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 neptunus.(none):/home/magnus/mysql-4.1

ndb/src/kernel/vm/Emulator.cpp:
  Added signal.h to include header for signal

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

sql/share/estonian/errmsg.txt:
  Added missing error message.