into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0

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

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

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1

  Put options in proper order.

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

Manual merge from 4.1,
extension of the old fix (1.1976 05/12/05 17:57:48 mleich@mysql.com) to two other places.

Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
The value is not important, and it depends on timing. Mask it.

Backport and extension of a fix made by Matthias in 5.0, originally it was
1.1976 05/12/05 17:57:48 mleich@mysql.com

  Error in abort handling in TC when timeout during abort
  

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new

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

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

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

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

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new

into  mysql.com:/home/alexi/dev/mysql-5.0-14614

  Post review corrections in comments.

 error message if database is changed.

  Removed Visual Studio 6 project files, as they are not maintained

into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2

  Fix race between INCL_NODEREQ(prio b) and GCP_PREPARE(prio a) by also waiting for starting nodes

into  mysql.com:/home/alik/MySQL/devel/5.1-wl2984-merge

into  devsrv-b.mysql.com:/space/magnus/my50-bug9535

to Crash": the bug was that due to non-standard name
resolution precedence in stored procedures (See Bug#5967)
a stored procedure variable took precedence over a table column
when the arguments for VALUES() function were resolved.
The implementation of VALUES() function was not designed to work
with Item_splocal and crashed.
VALUES() function is non-standard. It can refer to, and
is meaningful for, table columns only. The patch disables SP 
variables as possible arguments of VALUES() function.

handling so that indexes are closed before trying to commit the
transaction. (Bug #15536)

  Bug#14960, reverted code to make symdir work on Windows
symlink.test:
  Disabled test case on Windows

  Fix typo in autotest script

  Fix error in NF during NR

into  mysql.com:/home/alexi/innodb-ss/mysql-5.1-new

 to 5.1. Undoing the merge.