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

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

  Fix 4.1 memleak in Hugo


ndb/test/include/HugoOperations.hpp:
  Fix mem leak in Hugo
ndb/test/src/HugoTransactions.cpp:
  Fix mem leak in Hugo

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

link to log if it exists, regardless of test result


ndb/test/run-test/make-html-reports.sh:
  link to log if it exists, regardless of test result

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


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

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


sql/ha_innodb.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

Build-tools/Do-compile:
  Auto merged

BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
include/my_pthread.h:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/table.cc:
  SCCS merged

into mysql.com:/home/mydev/mysql-4.1-bug8306

Build-tools/Do-compile:
  Auto merged

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0


BitKeeper/etc/logging_ok:
  auto-union
extra/replace.c:
  Auto merged

  Adjusted results of the test case for bug #7520 for 4.1.


mysql-test/r/select.result:
  Adjusted results of the test case for bug #7520 for 4.1.

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 rurik.mysql.com:/home/igor/dev/mysql-4.1-0


BitKeeper/etc/logging_ok:
  auto-union
extra/replace.c:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/table.cc:
  Auto merged

  Added a test case for bug #7520.
table.cc:
  Fixed bug #7520.
  The bug was caused by a wrong calculation of the field max_key_length for
  a TABLE structure when there was an index on a blob field.


sql/table.cc:
  Fixed bug #7520.
  The bug was caused by a wrong calculation of the field max_key_length for
  a TABLE structure when there was an index on a blob field.
mysql-test/t/select.test:
  Added a test case for bug #7520.
mysql-test/r/select.result:
  Added a test case for bug #7520.

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