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

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

  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

  new file

mysql-test/mysql-test-run.sh:
  Change to diskless
mysql-test/ndb/ndb_config_2_node.ini:
  Change to diskless
mysql-test/ndb/ndbcluster.sh:
  Change to diskless
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Making Discless deprecated, so it still can be used but a warning will be printed if used.
  Adde possibilty to transform a value of type ConfigInfo::BOOL, neede for depicated Discless

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

ndb/src/common/debugger/EventLogger.cpp:
  Changed to STATISTICS
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Changed to Diskless

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)

BitKeeper/deleted/.del-Makefile~bf89f137b06b6e68:
  Delete: ndb/test/ndbapi/testScanPerf/Makefile
BitKeeper/deleted/.del-testScanPerf.cpp~b619ce6099f279a1:
  Delete: ndb/test/ndbapi/testScanPerf/testScanPerf.cpp
ndb/test/ndbapi/Makefile.am:
  Add testScanPerf to Makefile.am

ndb/include/kernel/GlobalSignalNumbers.h:
  Remove unused signal number for GSN_SCAN_TABINFO
ndb/include/kernel/signaldata/ScanTab.hpp:
  Remove definition of old signal ScanTabInfo
ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Removed old print function for SCAN_TABINFO
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Removed name for GSN_SCAN_TABINFO
ndb/src/ndbapi/NdbApiSignal.cpp:
  Removed SCAN_TABINFO and old comment
ndb/src/ndbapi/NdbConnectionScan.cpp:
  Removed duplicate definition of WAIFOR_SCAN_TIMEOUT, real one is in NdbScanOperation.cpp
ndb/src/ndbapi/NdbScanOperation.cpp:
  Removed duplicate debug printout
ndb/src/ndbapi/Ndbif.cpp:
  Removed SCAN_TABINFO