into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb-bj-merge


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanFilter.cpp:
  Auto merged

into  ymer.(none):/usr/local/mysql/mysql-5.0-ndb

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

When doing partial blob update with NdbBlob::writeData(), zero-padding
after the write was wrongly done, causing part of the old blob value
to be overwritten with zeros (or spaces for text field).

Fixed by only padding when needed (when writing at end of the blob).


ndb/src/ndbapi/NdbBlob.cpp:
  Do not pad rest of blob part after the write, unless it is a write at the
  end of the blob.
ndb/test/ndbapi/testBlobs.cpp:
  Add test case.

into  production.mysql.com:/usersnfs/mjorgensen/bktrees/mysql-5.0-build

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

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


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

added error code for failing send signal and timeout waiting for node failure


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  added error code for failing send signal and timeout waiting for node failure
ndb/src/ndbapi/ndberror.c:
  added error code for failing send signal and timeout waiting for node failure

into  olga.mysql.com:/home/igor/mysql-5.0-opt


sql/item.cc:
  Auto merged

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

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26661

construct references invalid name.
Derived tables currently cannot use outer references.
Thus there is no outer context for them.
The 4.1 code takes this fact into account while the 
Item_field::fix_outer_field code of 5.0 lost the check that blocks
any attempts to resolve names in outer context for derived tables.


mysql-test/r/union.result:
  Added a test case for bug #26661.
mysql-test/t/union.test:
  Added a test case for bug #26661.
sql/item.cc:
  Fixed bug #26661.
  Derived tables currently cannot use outer references.
  Thus there is no outer context for them.
  The 4.1 code takes this fact into account while the 
  Item_field::fix_outer_field code of 5.0 lost the check that blocks
  any attempts to resolve names in outer context for derived tables.

into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt


sql/sql_select.cc:
  Auto merged

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

into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt

mysql-test/r/view.result:
  merging

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

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


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged

Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
- correction of part 1
    add ndb_waiter option to wait for single user mode


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
  - correction of part 1
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
  - correction of part 1
ndb/tools/waiter.cpp:
  add ndb_waiter option to wait for single user mode

into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt


mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
mysql-test/r/func_str.result:
  merging
mysql-test/r/sp.result:
  merging
mysql-test/r/view.result:
  merging
mysql-test/t/func_str.test:
  merging
mysql-test/t/view.test:
  merging

into  mysql.com:/home/hf/work/mrg/mysql-4.1-opt

  Postfix for bug#22331.


sql/sql_select.cc:
  Postfix for bug#22331.

into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Manual merge

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


extra/comp_err.c:
  Auto merged
sql/mysqld.cc:
  Auto merged

comp_err.c:  return ha_checksum from checksum_format_specifier() - more correct, avoid a compiler warning


extra/comp_err.c:
  return ha_checksum from checksum_format_specifier() - more correct, avoid a compiler warning

into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-maint

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

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/41

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50


scripts/make_binary_distribution.sh:
  Auto merged

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/41

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/50


sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/40

into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build

into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build