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

and GRANT in multi-threaded environment" into 5.0 tree.

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

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

into  neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316

into  neptunus.(none):/home/msvensson/mysql/bug11316/my50-bug11316

into  mysql.com:/home/dlenev/src/mysql-4.1-bg12423

multi-threaded environment".

To avoid deadlocks between several simultaneously run account management 
commands (particularly between FLUSH PRIVILEGES/SET PASSWORD and GRANT
commands) we should always take table and internal locks during their
execution in the same order. In other words we should first open and lock
privilege tables and only then obtain acl_cache::lock/LOCK_grant locks.

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

into  neptunus.(none):/home/msvensson/mysql/bug11286/my50-bug11286

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

  Make sure mtr_kill_processes() is called with an array ref
  Corrected error string for STDERR redirect

into  mysql.com:/export/space/pekka/ndb/version/my50

into  neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526

 - Temporary fix, disable x86 assembler.

into  neptunus.(none):/home/msvensson/mysql/bug11316/my50-bug11316

 - Make sure that mysqltest always uses ssl when connecting to the server.
 - Pass a i32-bit int variable as argument to FIONREAD ioctl.

 - Move clearing of expected errors

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1

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

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

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

on Windows. (Bug #12325)

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

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

into moonbone.local:/work/12861-bug-4.1-mysql

  After merge fix for bug #12537