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

ndb/src/common/mgmcommon/ConfigInfo.cpp:
  fix SHM config + cosmetics
ndb/src/common/mgmcommon/LocalConfig.cpp:
  use autoptr
ndb/src/common/transporter/SHM_Transporter.cpp:
  fixed SHM transporter setup
ndb/src/common/transporter/SHM_Transporter.hpp:
  fixed SHM transporter setup
ndb/src/common/transporter/SHM_Transporter.unix.cpp:
  fixed SHM transporter setup
ndb/src/kernel/vm/Configuration.cpp:
  removed check of connectstring

ndb/src/mgmsrv/Services.cpp:
  changed getsockname to getpeername

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

+ added option to ndb_waiter to wait for NO CONTACT


mysql-test/mysql-test-run.sh:
  adopting mysql-test-run to new ndb config
mysql-test/ndb/ndbcluster.sh:
  adopting mysql-test-run to new ndb config
ndb/tools/waiter.cpp:
  added option to wait for NO CONTACT

mysql-test/ndb/ndb_config_2_node.ini:
  SCCS merged
mysql-test/ndb/ndbcluster.sh:
  SCCS merged

ndb/include/debugger/EventLogger.hpp:
  removed unused method
ndb/include/mgmcommon/ConfigRetriever.hpp:
  put NdbMgmHandle in ConfigRetriever to enable holding connection open until setup complete
ndb/include/mgmcommon/NdbConfig.h:
  moved naming of all "ndb" file into NdbConfig.c
ndb/include/ndb_global.h:
  introduced define NDB_BASE_PORT to control default port for ndb
ndb/src/common/debugger/EventLogger.cpp:
  removed unused method
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  introduced define NDB_BASE_PORT to control default port for ndb
  + added setting default Id's on nodes
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  put NdbMgmHandle in ConfigRetriever to enable holding connection open until setup complete
ndb/src/common/mgmcommon/IPCConfig.cpp:
  changed error message
ndb/src/common/mgmcommon/LocalConfig.cpp:
  introduced define NDB_BASE_PORT to control default port for ndb
ndb/src/common/mgmcommon/NdbConfig.c:
  moved naming of all "ndb" file into NdbConfig.c
ndb/src/common/transporter/TransporterRegistry.cpp:
  spelling errors
ndb/src/kernel/error/ErrorReporter.cpp:
  moved naming of all "ndb" file into NdbConfig.c
ndb/src/kernel/error/ErrorReporter.hpp:
  moved naming of all "ndb" file into NdbConfig.c
ndb/src/kernel/main.cpp:
  moved naming of all "ndb" file into NdbConfig.c
ndb/src/kernel/vm/Configuration.cpp:
  moved allocation of ConfigRetriever object to Configuration to enable holing "config" open until setup finished
ndb/src/kernel/vm/Configuration.hpp:
  moved allocation of ConfigRetriever object to Configuration to enable holing "config" open until setup finished
ndb/src/mgmclient/main.cpp:
  fix default port number
ndb/src/mgmsrv/MgmtSrvr.cpp:
  fix default port
ndb/src/mgmsrv/Services.cpp:
  added spec of transporter in get_nodeid
ndb/src/mgmsrv/main.cpp:
  moved naming of all "ndb" file into NdbConfig.c
ndb/src/ndbapi/TransporterFacade.cpp:
  moved allocation of ConfigRetriever object to TransporterFacade to enable holing "config" open until setup finished
ndb/src/ndbapi/TransporterFacade.hpp:
  moved allocation of ConfigRetriever object to TransporterFacade to enable holing "config" open until setup finished

sql/ha_ndbcluster.h:
  Auto merged

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


ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged

mysql-test/r/lowercase_table2.result:
  results updated

(table opened in my_tz_init, was removed from thd->open_tables in
tz_load_from_db w/o being unlocked, so it was stayng in open_cache
forever preventing the latter from being free'd in table_cache_free)

mysql-test/r/func_group.result:
  fixed
mysql-test/r/ps.result:
  SHOW TABLE STATUS test
mysql-test/t/ps.test:
  SHOW TABLE STATUS test
sql/sql_parse.cc:
  Use lex->describe instead of lex->select_lex.options
sql/sql_yacc.yy:
  removed unneed initialization of lex->select_lex.options

mysql-test/r/ps.result:
  eq() for parameters test
mysql-test/t/ps.test:
  eq() for parameters test
sql/item.h:
  correct eq() method for Item_param

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

mysql-test/r/flush_table.result:
  after merge fixed
  duplicated tests removed
mysql-test/t/flush_table.test:
  after merge fixed
  duplicated tests removed
sql/sql_yacc.yy:
  alias is not db-qualified

BitKeeper/etc/ignore:
  added sql/mysql_tzinfo_to_sql.cc
scripts/make_win_src_distribution.sh:
  Don't copy InstallShield files if we are in a normal bk tree
scripts/mysql_create_system_tables.sh:
  Remove duplicate entry

  4.1 tree must use installshield project files due to new tables


scripts/make_win_src_distribution.sh:
  4.1 tree must use installshield project files due to new tables

  fix to user table during make_win_src_distribution


scripts/mysql_create_system_tables.sh:
  fix to user table during make_win_src_distribution

include/my_global.h:
  Fix for libmysql compilation failure on high-byte-first systems:
  - add typecasting to char * in shortstore, longstore, doublestore macros
libmysql/libmysql.c:
  - suppress possible warnings

sql/sql_select.cc:
  Auto merged

sql/opt_range.cc:
  incorrect fix removed. range optimizer is made slightly more stable vs. compiler optimizations

called without NDB enabled.

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


sql/mysql_priv.h:
  Auto merged

include/mysql.h:
  Cleanup
sql-common/client.c:
  Allow client.c to compile after changes to mysql.h
sql/opt_range.cc:
  Make bdb.test repeatable (and assume that table scans is a little bit slower)
sql/sql_handler.cc:
  Fixed typo during merge
sql/sql_insert.cc:
  Fixed indentation

BitKeeper/etc/ignore:
  added sql/mysql_tzinfo_to_sql
BitKeeper/etc/logging_ok:
  auto-union
acinclude.m4:
  Auto merged
extra/perror.c:
  Auto merged
include/mysql.h:
  Auto merged
innobase/include/mach0data.ic:
  Auto merged
innobase/include/mtr0log.h:
  Auto merged
innobase/include/mtr0log.ic:
  Auto merged
innobase/mem/mem0dbg.c:
  Auto merged
innobase/pars/lexyy.c:
  Auto merged
BitKeeper/deleted/.del-4.0.XX-gpl.ipr~f5909a9e9bd8094:
  Auto merged
BitKeeper/deleted/.del-Clients and Tools.fgl~bf0f776883577f02:
  Auto merged
BitKeeper/deleted/.del-Development.fgl~6392ce285e73f5fc:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/innodb_cache.result:
  Auto merged
mysql-test/r/lowercase_table2.result:
  Auto merged
mysql-test/t/innodb_cache.test:
  Auto merged
mysql-test/t/lowercase_table2.test:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/handler.cc:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
libmysql/libmysql.c:
  Merge with 4.0
mysql-test/r/bdb.result:
  Merge with 4.0
mysql-test/r/range.result:
  Merge with 4.0
mysql-test/t/bdb.test:
  Merge with 4.0
mysys/hash.c:
  Merge with 4.0
scripts/mysql_install_db.sh:
  Merge with 4.0
sql/field.cc:
  Merge with 4.0
sql/field.h:
  Merge with 4.0
sql/mysql_priv.h:
  Merge with 4.0
sql/sql_handler.cc:
  Merge with 4.0
sql/sql_select.cc:
  Merge with 4.0
sql/sql_table.cc:
  Merge with 4.0

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-fix

problems with unresolved dependancies on some platforms.


sql/mysql_priv.h:
  Moved my_time_t definitions to tztime.h to avoid mysql_tzinfo_to_sql dependancy
  on mysql_priv.h.
sql/tztime.cc:
  Removed mysql_tzinfo_to_sql dependancy from mysql_priv.h
sql/tztime.h:
  Moved my_time_t definitions to tztime.h to avoid mysql_tzinfo_to_sql dependancy
  on mysql_priv.h.

sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

scripts/make_win_binary_distribution.sh:
  Add missing .cnf files (Bug #4216)
scripts/make_win_src_distribution.sh:
  Add missing .cnf files (Bug #4216)
  Align code with MySQL 4.1