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

  SCCS merged

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

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

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

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

into mysql.com:/Users/eric/dev/mysql-5.0

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

  Disallow conflicting use of variables named "password" and "names". If such
  a variable is declared, and "SET ... = ..." is used for them, an error is
  returned; the user must resolve the conflict by either using `var` (indicating
  that the local variable is set) or by renaming the variable.
  This is necessary since setting "password" and "names" are treated as special
  cases by the parser.

we now issue a warning (at slave's server startup only) when a relay log is named
using the implicit hostname-relay-bin naming. Like we already do for binlogs.

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

  Fixed compilation problem on FreeBSD,
  after discussion with Jani.
  Doesn't FreeBSD follow the standard?
  

  The fix is needed to perform locking on shared data structures
  This is modification of patch proposed by Leandro Santi
  (see http://webs.sinectis.com.ar/lesanti/misc/mysql-4.0.23a-openssl_locking.patch)

into  mysql.com:/users/lthalmann/bkroot/mysql-5.0

into  mysql.com:/home/svoj/devel/mysql/engine/mysql-5.0