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

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


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

mysql-test/r/ndb_index_ordered.result:
  fix new decimal mysql vs. ndb
mysql-test/t/ndb_index_ordered.test:
  fix new decimal mysql vs. ndb
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  fix new decimal mysql vs. ndb
ndb/include/ndb_constants.h:
  fix new decimal mysql vs. ndb
ndb/include/ndbapi/NdbDictionary.hpp:
  fix new decimal mysql vs. ndb
ndb/include/util/NdbSqlUtil.hpp:
  fix new decimal mysql vs. ndb
ndb/src/common/util/NdbSqlUtil.cpp:
  fix new decimal mysql vs. ndb
ndb/src/ndbapi/NdbDictionary.cpp:
  fix new decimal mysql vs. ndb
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  fix new decimal mysql vs. ndb
ndb/src/ndbapi/NdbRecAttr.cpp:
  fix new decimal mysql vs. ndb
ndb/test/include/NdbSchemaOp.hpp:
  fix new decimal mysql vs. ndb
ndb/test/src/HugoCalculator.cpp:
  fix new decimal mysql vs. ndb
ndb/tools/restore/consumer.cpp:
  fix new decimal mysql vs. ndb
sql/ha_ndbcluster.cc:
  fix new decimal mysql vs. ndb

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


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

changed to set NdbMgmHandle from IPPConfig, and use info from configuration, instead of mgm handle from config retrieval


ndb/src/ndbapi/Ndb.cpp:
  added som debug printout
ndb/src/ndbapi/NdbTransaction.cpp:
  added some debug printout

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

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


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

into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.2

into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.2


include/config-win.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged

sql/ha_innodb.cc:
  Auto merged
include/config-win.h:
  SCCS merged

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


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

mysql-test/r/ndb_index_ordered.result:
  temp: comment out decimal
mysql-test/t/ndb_index_ordered.test:
  temp: comment out decimal

  Make a more informative platform info for Windows

into mysql.com:/home/pem/work/mysql-5.0

mysql-test/r/sp.result:
  New test case for BUG#8540.
mysql-test/t/sp.test:
  New test case for BUG#8540.
sql/item.h:
  Use the existing name (if any) for a SP local variable (to get the correct
  field name in a select in the case of an alias).

ndb/include/ndb_constants.h:
  post-merge fixes
ndb/include/ndbapi/NdbDictionary.hpp:
  post-merge fixes
ndb/src/common/util/NdbSqlUtil.cpp:
  post-merge fixes
ndb/test/src/HugoCalculator.cpp:
  post-merge fixes

mysql-test/r/ndb_index_ordered.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged

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


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
ndb/test/run-test/Makefile.am:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

mysql-test/r/ndb_index_ordered.result:
  fix old decimal type mysql vs ndb (re-commit 3)
mysql-test/t/ndb_index_ordered.test:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/include/ndbapi/NdbDictionary.hpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/include/util/NdbSqlUtil.hpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/common/util/NdbSqlUtil.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/ndbapi/NdbDictionary.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/ndbapi/NdbRecAttr.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/test/include/NdbSchemaOp.hpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/tools/restore/consumer.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
sql/ha_ndbcluster.cc:
  fix old decimal type mysql vs ndb (re-commit 3)

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


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
ndb/test/run-test/Makefile.am:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

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


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
ndb/test/run-test/Makefile.am:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

mysql-test/r/ndb_autodiscover.result:
  Added warning printout to result

into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0

sql/filesort.cc:
  Type of the parameter changed
sql/my_decimal.cc:
  type of the parameter changed
sql/my_decimal.h:
  Parameter type changed

sql/item_cmpfunc.cc:
  code fixed not to call val_x twice

Re-introduce ability to have
[tcp default]PortNumber= 4242

in config.ini to NOT use dynamic ports.

Dynamic port numbers are the default though.

We still use the mgm port for transporter connections to a mgm server though.
This is (slightly) different than before, but since you have to be able to connect
to the mgm server anyway, this does not require extra firewall rules or anything.


ndb/src/mgmsrv/ConfigInfo.cpp:
  Restore (optional) old behaviour of having a base port number and incrementing.

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

Since placement operator delete called only if exception was thrown in
constructor and we don't use exceptions in MySQL, there is no sense to
do anything in String::delete(void *ptr_arg, MEM_ROOT *mem_root).

sql/item_cmpfunc.cc:
  Safety fix
  Code cleanup

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


BitKeeper/triggers/post-commit:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
sql/table.cc:
  Auto merged

mysql-test/r/ctype_ucs.result:
  Fixed warning after merge
sql/field.cc:
  After merge fix
sql/item_cmpfunc.cc:
  Style & comment changes
sql/sql_yacc.yy:
  After merge fix

BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_string.h:
  Auto merged
vio/viosocket.c:
  Auto merged
scripts/mysql_create_system_tables.sh:
  simple merge
sql/field.cc:
  simple merge
sql/item.h:
  simple merge
sql/sql_lex.h:
  simple merge
sql/sql_yacc.yy:
  Merge
  (join_table_list was not comptely merged. Need to run test to know how things works...)
sql/table.cc:
  Keep code from 5.0, except delted one not needed line
strings/ctype-ucs2.c:
  Auto merge

Simple optimzations done while reviewing code


client/mysqltest.c:
  Added options --enable-ps-warnings and --disable-ps-warnings
  (to fix failing test case)
mysql-test/t/row.test:
  Disable warnings that comes from 'parse' parth
sql/field.cc:
  Removed calls to is_null() in field functions.
  (Not needed as NULL handling is done on the level above fields)
  Indentation fixes
  Removed calls to alloca() as buffer needed was quite small.
sql/field.h:
  Indentation changes and comment fixes
sql/filesort.cc:
  Simple optimization during code review
sql/item.cc:
  Indentation fixes
  Removed some unnecessary tests (added DBUG_ASSERTS() instead)
sql/item_buff.cc:
  Indentation fixes
sql/my_decimal.cc:
  Indentation fixes
  Simple optimization
  Fixed compiler warning
sql/sql_update.cc:
  Removed unnessessary assignment

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


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged

  small bugfix "ERROR Message: failed"


ndb/src/mgmsrv/MgmtSrvr.cpp:
  small bugfix "ERROR Message: failed"

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

   added debug printouts
    changed mem allocation handling in event api
   split single and parallell event operation testing


ndb/src/kernel/blocks/suma/Suma.cpp:
  added info to dump state 8004
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  added debug printouts
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  changed mem allocation handling in event api
ndb/test/ndbapi/test_event.cpp:
  split single and parallell event operation testing

vio/viosocket.c:
  Auto merged
mysql-test/t/group_by.test:
  Use local file
sql/sql_parse.cc:
  Merge with 4.0 to get bug fix for reconnect problem