ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Auto merged
ndb/include/ndbapi/NdbApi.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
ndb/src/ndbapi/Makefile.am:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
ndb/src/ndbapi/NdbIndexOperation.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/src/ndbapi/Ndblist.cpp:
  Auto merged
ndb/test/ndbapi/Makefile.am:
  Auto merged
ndb/test/ndbapi/Makefile_old:
  Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged

into mysql.com:/home/jonas/src/mysql-4.1-ndb

into mysql.com:/home/jonas/src/mysql-4.1-ndb

into mc05.(none):/space2/tomas/mysql-4.1-ndb-test

into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1

into mysql.com:/home/kostja/mysql/mysql-4.1-4030

  Remove the use of mem_realloc in fil0fil.c; mem_realloc() was broken and the patch to remove its definition will propagate from the 4.0 tree; crash recovery with innodb_file_per_table has to be tested after this patch, not tested yet


innobase/fil/fil0fil.c:
  Remove the use of mem_realloc in fil0fil.c; mem_alloc() was broken and the patch to remove its definition will propagate from the 4.0 tree; crash recovery with innodb_file_per_table has to be tested after this patch, not tested yet

into mysql.com:/home/kostja/mysql/mysql-4.1-4030

include/mysql.h:
  mysql_bind_param -> mysql_stmt_bind_param
libmysql/libmysql.c:
  - more comments
  - trailing spaces stripped
  - update_statement_metadata moved to appropriate section (from 'Statement
  close and error reporting' section)
  - store_param_type moved to store_ functions

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

into mysql.com:/home/jonas/src/mysql-4.1-ndb

into mc05.(none):/space2/tomas/mysql-4.1-ndb-test

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1

  Delete: ndb/bin/mysqlclusterd
.del-mysqlcluster_install_db~f363f803506081a6:
  Delete: ndb/bin/mysqlcluster_install_db
.del-mysqlcluster~26c9c37938503734:
  Delete: ndb/bin/mysqlcluster


BitKeeper/deleted/.del-mysqlcluster~26c9c37938503734:
  Delete: ndb/bin/mysqlcluster
BitKeeper/deleted/.del-mysqlcluster_install_db~f363f803506081a6:
  Delete: ndb/bin/mysqlcluster_install_db
BitKeeper/deleted/.del-mysqlclusterd~7ebaf8faea0a1100:
  Delete: ndb/bin/mysqlclusterd

into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1

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

- mutex was unlocked before the end of the critical sesion,
- Portability issue: It's better to use (*alloc)(x) instead of alloc(x),
  if alloc is a function passed as an argument.
- Use {} around if() block, to avoid possible problems with some Windows compilers.

ndb/src/ndbapi/NdbReceiver.cpp:
  pass null also when copying out

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

into mc05.(none):/space2/tomas/mysql-4.1-ndb-test

  missing file


ndb/include/Makefile.am:
  missing file

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

   enabled


Build-tools/Do-compile:
   - removed redundant option "--without-ndbcluster" (we already have
     "--with-cluster" for that)
   - make sure to add the cluster files in the binary distribution
   - make sure to run mysql-test-run with NDB tests enabled

ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Removed debug code

ndb/include/ndbapi/NdbConnection.hpp:
  Made releaseCompletedOpertions private and introduced
  NdbConnection::restart instead. This methods basically check a bunch of 
  status flags before calling releaseCompletedOperations
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Introduced MARKRE_TRACE
  Fixed bug on not releasing marker at execABORT
ndb/src/ndbapi/NdbConnection.cpp:
  Made releaseCompletedOpertions private and introduced
  NdbConnection::restart instead. This methods basically check a bunch of 
  status flags before calling releaseCompletedOperations
ndb/src/ndbapi/Ndbif.cpp:
  Use MARKER_TRACE
ndb/test/src/HugoTransactions.cpp:
  Use restart instead of releaseCompletedOperations
ndb/test/src/UtilTransactions.cpp:
  Use restart instead of releaseCompletedOperations
ndb/tools/delete_all.cpp:
  Use restart instead of releaseCompletedOperations

pops up fixed.


libmysql/libmysql.c:
  Another place where Bug#4079 pops up fixed.

  fix up test result.


mysql-test/r/alter_table.result:
  fix up test result.
mysql-test/r/packet.result:
  fix up test result.

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1