- 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  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1

  Put options in proper order.

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 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

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

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

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

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

 to 5.1. Undoing the merge.

into  krsna.patg.net:/home/patg/mysql-build/mysql-5.1-new2

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

Fixed logic in handler to make handler now show up as enabled.

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

into  neptunus.(none):/home/msvensson/mysql/bug9535/my51-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  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

   - 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

into  mysql.com:/usr/home/pem/mysql-5.1-new