into mysql.com:/home/jwinstead2/mysql-5.0

into mysql.com:/home/jwinstead2/mysql-4.1-clean

into build.mysql.com:/users/tulin/mysql-5.0

  correcting 4.1 merge error

into mysql.com:/home/jwinstead2/mysql-4.1-clean

into mysql.com:/home/jwinstead2/mysql-4.1-clean

into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

into mysql.com:/home/jwinstead2/mysql-4.1-clean

into mysql.com:/home/jwinstead2/mysql-4.1-clean

into mysql.com:/home/jwinstead2/mysql-4.1-clean

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1

into mysql.com:/space/my/mysql-4.1

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

After merge fixes

Ensure that a 'bool' function really returns a value - was compiler error on some problems causing build failure.

   build (to make the test suite pass)

  fixed ndb configure according to 4.1

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

Split TABLE to TABLE and TABLE_SHARE (TABLE_SHARE is still allocated as part of table, will be fixed soon)
Created Field::make_field() and made Field_num::make_field() to call this
Added 'TABLE_SHARE->db' that points to database name; Changed all usage of table_cache_key as database name to use this instead
Changed field->table_name to point to pointer to alias. This allows us to change alias for a table by just updating one pointer.
Renamed TABLE_SHARE->real_name to table_name
Renamed TABLE->table_name to alias
Renamed TABLE_LIST->real_name to table_name

  Use the fcntl() file flush method on OS X; Apple disabled fsync() for internal disk drives, which caused corruption in power outages; the patch was recommended by an Apple engineer

talking to pre-4.1 servers or 4.1 and later servers where the old_passwords
option is enabled. "mysqladmin old-password" is unchanged. (Bug #7451)

official binary builds for Linux that are built against a static glibc with
a 128k thread stack size limit can be compiled with a default that doesn't
result in a harmless (but oft-misunderstood) warning message. (Bug #6226)

into mysql.com:/home/jwinstead2/mysql-5.0

and check of handler compatibility

  On Windows my_sleep() always gave a zero microsecond sleep

into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1

fixed bug