into  production.mysql.com:/usersnfs/knielsen/mysql-5.0

into  production.mysql.com:/usersnfs/knielsen/mysql-5.0

into  mysql.com:/home/novo/MySQL/mysql-5.0

  * made the following changes for the generic 5.0 RPM spec file
  - Added zlib to the list of (static) libraries installed
  - Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
  - Compile MySQL with bundled zlib
  - Fixed %packager name to "MySQL Production Engineering Team"

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

into  production.mysql.com:/usersnfs/knielsen/mysql-5.0

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

into  production.mysql.com:/usersnfs/knielsen/mysql-5.0

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

into  production.mysql.com:/usersnfs/knielsen/mysql-5.0

  Post review corrections in comments.

 error message if database is changed.

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

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)

into  mysql.com:/usr/local/mysql/mysql-5.0

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

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

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

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

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

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

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

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

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

into  mysql.com:/opt/local/work/mysql-5.0-root

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

latin5.xml:
  - Fixing order thee Turkish letters to conform Turkish rules.
  - All non-Turkish accented letters are mappend
    to their non-accented counterparts.

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

   - Set max_length of Item_func_uuid to max_length*system_charset_info->mbmaxlen
    Note! Item_func_uuid should be set to use 'ascii' charset when hex(), format(), md5()
etc will use 'ascii'
    - Comitting again, the old patch seems to have been lost.

into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-sp-vars-merge-2