into  mysql.com:/usr/home/bar/mysql-5.0.b9278

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

  after merge fix.
range.result:
  fixing result accordingly
  ,
cast.result:
  after merge fix
range.test:
  Avoid SELECT'ing of BINARY column not to output 0x00 bytes.

- ensure in ndb_mgmd that the stop command is not issued if a node is restarting
- added some new error messages
- in ndbcntr on master check so that node does not shutdown id shutdoen in progress

into  mysql.com:/usr/home/bar/mysql-5.0.b9278

  new file
mysql_fix_privilege_tables.sql, mysql_create_system_tables.sh:
  Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding.
Many files:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
  Adding true BINARY/VARBINARY: new pad_char structure member.
ctype-bin.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
  New strnxfrm, with two trailing length bytes.
field.cc:
  Adding true BINARY/VARBINARY.

into moonbone.local:/work/7672-bug-5.0-mysql

into  mysql.com:/opt/local/work/mysql-5.0-12736

into mysql.com:/Users/kent/mysql/bk/mysql-5.0

into mysql.com:/Users/kent/mysql/bk/mysql-5.0

Updated more DDL statements to cause implicit commit.

into  mysql.com:/opt/local/work/mysql-5.0-12736

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

The bug was in JOIN::join_free which was wrongly determining that
all joins have been already executed and therefore all used tables
can be closed.

Clean application of patch - 
- Added --tz-utc to fix issue of dumping timestamp values between 
servers with different global time zone settings, particularly 
with regard to the day of DST changeover, which without this fix,
 would dump duplicate timestamp values.

into  mysql.com:/users/lthalmann/bk/mysql-5.0-mysqlbinlog-ulong

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

so a typo on flags will go unnoticed; I put flags in this my_free() definition (as a no-op which
will still make the compiler check correctness of the flags). Applied: this caught a typo in my_realloc.c. Kindly approved by Konstantin and Mats.

into  mysql.com:/users/lthalmann/bk/mysql-5.0-mysqlbinlog-ulong

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

(problem found by kent)

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

into  mysql.com:/home/dlenev/src/mysql-5.0-repl

  Bug #7672 after merge fix

  Copy *.cnf files in mysql-test/std_data/
Makefile.am:
  Added std_data/*.cnf to copy ndb config

To force a restart at the end of test, the option file must be non-empty, it's not enough if it exists and is empty.

into  mysql.com:/home/mysql_src/mysql-5.0;
a very bad automerge (issues with non-ascii chars), plus some hard conflicts I'll fix by hand in a next cset

into  mysql.com:/home/dlenev/src/mysql-5.0-repl

can't be executed on slave". It will be possible to solve this problem
in more correct way when we will implement WL#2897 "Complete definer support
in the stored routines".

  SCCS merged

len and packet_error needs to be of same type for (len == packet_error) to
check failures

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

into  mysql.com:/usr/home/pem/bug13510/mysql-5.0