into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-28860

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build

and, as a consequence, from binary packages.
This is necessary because of entry 28685 in the bugs DB.

If it has been defined (by "configure", in "include/my_config.h"),
then an "#undef" is needed to avoid a redefinition.

This is needed to prevent a compile error of the debug server on AIX.

into  debian.(none):/M51/merge-5.1

```yaml
Added casts and fixed wrong type.
```

Added casts and fixed wrong type.
---
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
---
Don't give warning that readonly variable is forced to be readonly
mysql-test-run run now fails if we have [Warning] and [ERROR] as tags in .err file
Fixed wrong reference to the mysql manual
Fixed wrong prototype that caused some tests to fail on 64 bit platforms
---
Disabled compiler warnings mainly for Win 64.
---
Added casts to remove compiler warnings on windows
Give warnings also for safe_mutex errors found by test system
Added some warnings from different machines in pushbuild
---
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into  mysql.com:/home/my/mysql-5.1
---
Added escapes for double quotes and parenthesis.
---
Archive db fix plus added non-critical warnings
in ignore list.
---
Fixed previously added patch and added new ignored warning.

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-nn

after-merge fixes: test cases that were moved to extra/binlog_tests do not need to check for binlog being enabled

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-nn

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-nn

into  mysql.com:/home/kent/bk/tmp3/mysql-5.1-build

into  mysql.com:/home/kent/bk/tmp3/mysql-5.0-build

  Added --with-mysqld-libs configure flag

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work

- correction of merge error

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work