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

into  poseidon.mysql.com:/home/tomas/mysql-4.1-ndb

into  chilla.local:/home/mydev/mysql-4.1-axmrg

added valgrind.supp to EXTRA_SCRIPTS(for pushbuild)

into  dev3-63.(none):/home/zhl/mysql/tree-merge/4.1/mysql-4.1-ndb

into  chilla.local:/home/mydev/mysql-4.1-axmrg

Notes:
This patch doesn't fix all issues in the tree and we need jani's fix for that
This patch shoud not be merged into 5.0

into  chilla.local:/home/mydev/mysql-4.1-axmrg

into  chilla.local:/home/mydev/mysql-4.1-axmrg

into  mysql.com:/home/svoj/devel/mysql/WL3567/mysql-4.1-engines

When a merge table is opened compare column and key definition of
underlying tables against column and key definition of merge table.

If any of underlying tables have different column/key definition
refuse to open merge table.

into  production.mysql.com:/usersnfs/jamppa/mysql-4.0

Move get_thread_lib to mysys/my_pthread.c
Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms

into  chilla.local:/home/mydev/mysql-4.1-axmrg

into  mysql.com:/home/gluh/MySQL/Merge/4.1

Move get_thread_lib to mysys/my_pthread.c
Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms

into  chilla.local:/home/mydev/mysql-4.1-bug24607

Fixed test. On 32-bit machines which compile without
-DBIG_TABLES, MAX_ROWS is truncated to a 32-bit value.
Using a value below 4G is portable.

into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build

into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work

into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-engines

- recommit in 4.1

into  chilla.local:/home/mydev/mysql-4.1-bug24607

into  trift2.:/MySQL/M41/push-4.1

The bug is actually a duplicate of the bug 14708.
Down-ported the fix for 14708 from 5.0.  
Merged the test case for bug 14708 from 5.0.

into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build

into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work

into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work

            corrupted table

Accessing a table with corrupted column definition results in server
crash.

This is fixed by refusing to open such tables. Affects MyISAM only.
No test case, since it requires crashed table.

into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build

into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.1

Fix to check library in use during runtime.
Fix for Bug#16995, "idle connections not being killed due to timeout when NPTL is used".

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41