- 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 poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

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

  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

+ some small bugfixes in ndb_config
+ extending ndb_config to print connections and take shm option

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

in short we now record whenever the slave I/O thread ignores a master's event because of its server id,
and use this info in the slave SQL thread to advance Exec_master_log_pos. Because if we
do not, this variable stays at the position of the last executed event, i.e. the last *non-ignored*
executed one, which may not be the last of the master's binlog (and so the slave *looks* behind
the master though it's data-wise it's not).

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

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

into mysql.com:/home/gluh/MySQL/Merge/5.0

into  mysql.com:/users/grog/4.1

  Bug #10308: Parse 'purge master logs' with subselect correctly.
subselect.test:
  Bug #10308: Test for 'purge master logs' with subselect.
subselect.result:
  Bug #10308: Test result for 'purge master logs' with subselect.

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

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

- CHAR() now returns binary string as default
- CHAR(X*65536+Y*256+Z) is now equal to CHAR(X,Y,Z) independent of the character set for CHAR()
- Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait()
  (Some old systems returns ETIME and it's safer to test for both values
   than to try to write a wrapper for each old system)
- Fixed new introduced bug in NOT BETWEEN X and X
- Ensure we call commit_by_xid or rollback_by_xid for all engines, even if one engine has failed
- Use octet2hex() for all conversion of string to hex
- Simplify and optimize code

into mysql.com:/space/my/mysql-4.1-build

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

into mysql.com:/space/my/mysql-5.0-build