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


sql/mysqld.cc:
  Auto merged

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


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278

ndb/src/common/transporter/TransporterRegistry.cpp:
  extra ; and end of function

  duplicate of previous cs to 5.0-ndb


ndb/src/common/util/NdbSqlUtil.cpp:
  duplicate of previous cs to 5.0-ndb

ndb/src/ndbapi/NdbDictionary.cpp:
  print unusual array size
ndb/src/ndbapi/NdbRecAttr.cpp:
  print hex chars as unsigned
ndb/src/ndbapi/NdbOperationInt.cpp:
  ignore of NULL bound
ndb/test/ndbapi/testOIBasic.cpp:
  add simple scan filter test (table scan on index bounds)

ndb/src/mgmapi/LocalConfig.cpp:
  added options to give nodeid and mgmd host directly as switches (without using the connectstring)
  reset nodeid on init
  allow only nodeid to be specified in the connectstring
  allow mgmd-host in connectstring
ndb/src/mgmapi/mgmapi.cpp:
  just some extra debug printouts

into mysql.com:/space/pekka/ndb/version/my50-ndb

ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  TUP interpreter: use byte length in attr OP const
ndb/src/ndbapi/NdbOperationInt.cpp:
  TUP interpreter: use byte length in attr OP const

ndb/src/common/transporter/TransporterRegistry.cpp:
  make sure we handle a failure case in connect_mgmd correctly
ndb/src/mgmapi/mgmapi.cpp:
  return NDB_INVALID_SOCKET at failure

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

in the grant tables case-insensitive and updating test results.


scripts/mysql_create_system_tables.sh:
  Fix collation of procs_priv.proc_priv
scripts/mysql_fix_privilege_tables.sql:
  Fix enum fields to have case-insensitive collation
mysql-test/r/information_schema.result:
  Update results
mysql-test/r/system_mysql_db.result:
  Update results
mysql-test/r/lowercase_table_grant.result:
  Update results

BitKeeper/triggers/post-commit:
  Auto merged
mysql-test/r/lowercase_table2.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/system_mysql_db.result:
  Update results
scripts/mysql_create_system_tables.sh:
  Merge fix for Bug #7617, making enum fields in grant tables
  case-insensitive.
scripts/mysql_fix_privilege_tables.sql:
  Merge fix for Bug #7617, and fix additional enum/set columns.
sql/sql_acl.cc:
  Hand-merge due to whitespace change
sql/sql_lex.cc:
  Hand-merge bug fix.

into mysql.com:/home/jimw/my/mysql-5.0-clean

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

into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.3

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

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


scripts/mysql_create_system_tables.sh:
  Auto merged

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


sql/sql_acl.cc:
  Auto merged

into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.3

tests/mysql_client_test.c:
  SCCS merged

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


sql/sql_base.cc:
  Auto merged

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

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

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


BitKeeper/triggers/post-commit:
  Auto merged

into mysql.com:/home/jimw/my/mysql-4.0-clean

into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports

into mysql.com:/home/jimw/my/mysql-5.0-clean


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged

sql/item_func.h:
  Fix a compoile error (missing return value) as proposed by Tomas Ulin.

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

into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0

ndb/src/common/util/SocketServer.cpp:
  strerror_r is not available on all platforms. Use plain strerror.

into hundin.mysql.fi:/home/marko/mysql-5.0

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278

into hundin.mysql.fi:/home/marko/mysql-5.0

into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0