sql/filesort.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

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

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

into mysql.com:/home/jonas/src/mysql-5.0

ndb/test/ndbapi/bench/mainPopulate.cpp:
  compiler warning (error using gcc-3.4.3)

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

(Found in review by Tomas Ulin)

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

into mysql.com:/home/jonas/src/mysql-5.0

into mysql.com:/home/jonas/src/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
ndb/test/run-test/daily-devel-tests.txt:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged

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

ndb/test/ndbapi/bench/mainPopulate.cpp:
  return correct
ndb/test/ndbapi/bench/userInterface.cpp:
  remove NA setting
ndb/test/run-test/daily-devel-tests.txt:
  set correct args

- when connecting to a mgm server as a transporter, create a NdbMgmHandle
  - over this mgm handle, report the dynamic ports
  - then turn it into a transporter
- this will re-report dynamic ports to mgmds when they restart (as we'll have to
set up our transporter again). This will also report it to all mgmds (as we'll
have transporters to all of them).


ndb/include/mgmapi/mgmapi.h:
  Add ndb_mgm_convert_to_transporter
   - converts to a transporter connect
   - destroys the handle (without disconnecting)
   - returns socket
ndb/include/transporter/TransporterRegistry.hpp:
  Add prototype for connect_ndb_mgmd
ndb/include/util/SocketClient.hpp:
  Remove connect_without_auth
  
  Add get_port() and get_server_name()
ndb/src/common/transporter/Transporter.cpp:
  use TransporterRegistry::connect_ndb_mgmd() to make the connection if isMgmConnection
ndb/src/common/transporter/TransporterRegistry.cpp:
  Impliment TransporterRegistry::connect_ndb_mgmd
  
  - takes a SocketClient and constructs a connectstring.
  - uses this connect string to make a NdbMgmHandle
  - send dynamic ports to this mgm server
  - transform into a transporter connect
  - return socket
ndb/src/common/util/SocketClient.cpp:
  Remove connect_without_auth
ndb/src/kernel/main.cpp:
  Don't relay dynamic ports. We now do this on transporter connect
ndb/src/mgmapi/mgmapi.cpp:
  Impliment ndb_mgm_convert_to_transporter
  - converts the mgm connection into a transporter connection
  - destroys the handle
  - returns the socket that should now be used as a transporter

Set of fixes requested by Kent in IRC. Tested (except the windows changes since I am trusting Kent...). No windows compiles here folks...


VC++Files/tests/mysql_client_test.dsp:
  fix request by Kent
sql/item.cc:
  fix requested by kent

BitKeeper/etc/logging_ok:
  auto-union
extra/replace.c:
  Auto merged
BitKeeper/triggers/post-commit:
  Merge changes

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

binlog-do-db or binlog-ignore-db are in effect.   (In the future 5.1? 5.0? I think 
each statement should be verified against the filtering criteria based on the database
it *uses* and not the *current* one.  But, right now the *current* database is what 
counts according to the semantics of the manual.)


sql/log.cc:
  BUG#6749: If there is no current database, then nothing should be binlogged if
  binlog-do-db or binlog-ignore-db are in effect.   (In the future I think that each 
  statement should be verified against the filtering criteria based on the database
  it *uses* and not the *current* one.  But, right now the *current* database is what 
  counts according to the semantics of the manual.)

into mysql.com:/home/bk/b7853-mysql-5.0


client/mysqlbinlog.cc:
  Auto merged
mysql-test/r/mysqlbinlog.result:
  Auto merged

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

    + removed double check for invalid socket


ndb/src/common/transporter/Transporter.cpp:
  added more debug trace
  + removed double check for invalid socket
ndb/src/ndbapi/Ndb.cpp:
  added more debug trace

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


ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

into mysql.com:/home/jonas/src/mysql-5.0


ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
ndb/test/run-test/daily-devel-tests.txt:
  Auto merged

ndb/test/run-test/daily-basic-tests.txt:
  run mysql-test-run for max 1 hour
    (normally 30 minutes)
ndb/test/run-test/daily-devel-tests.txt:
  Add benchmark to devel suite
ndb/test/run-test/main.cpp:
  Add bench mode. always produce report
ndb/test/run-test/run-test.hpp:
  Add bench mode. always produce report

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


mysql-test/mysql-test-run.sh:
  Auto merged

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

into mysql.com:/home/jonas/src/mysql-5.0

into mysql.com:/home/jonas/src/mysql-5.0


sql/sql_parse.cc:
  Auto merged

ndb/test/ndbapi/bench/userInterface.h:
  adapt to changes in ndbapi

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

into mysql.com:/home/kostja/work/mysql-5.0-root


libmysql/libmysql.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

libmysql/libmysql.c:
  And now put it to the proper place and make it work (Bug#7990)
tests/mysql_client_test.c:
  Enable the test for bug#7990

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


mysql-test/mysql-test-run.sh:
  Auto merged
ndb/src/kernel/vm/FastScheduler.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

  increased timeout as it is exceeded every now and then giving erroneous indication on error


ndb/test/run-test/daily-basic-tests.txt:
  increased timeout as it is exceeded every now and then giving erroneous indication on error

into mysql.com:/home/jonas/src/mysql-5.0

into mysql.com:/home/kostja/work/mysql-5.0-root


libmysql/libmysql.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

reset mysql->net.last_error": the solution is to clear
MYSQL->net error before performing COM_CLOSE: if the call
succeeds, the connection is usable for other statements.
More comprehensive fix is to clear MYSQL->net for all
recoverable errors at the time they happen, it will be
implemented in 5.0 as it introduces incompatibility in behavior.


libmysql/libmysql.c:
  A simple fix for Bug#7990 "mysql_stmt_close doesn't reset 
  mysql->net.last_error"
tests/mysql_client_test.c:
  A test case for Bug#7990 " mysql_stmt_close doesn't reset 
  mysql->net.last_error"