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

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

into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint

 - strerror might return NULL on some platforms

into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint

into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint

into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint

 - Backport fix from 5.0

into  mysql.com:/usr/home/ram/work/bug23938/my41-bug23938

into  mysql.com:/usr/home/ram/work/bug10798/my41-bug10798

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

added valgrind.supp to EXTRA_SCRIPTS(for pushbuild)

into  mysql.com:/home/ram/work/b26012/b26012.4.1

As we have Field_double::not_fixed we must have Field_double::size_of().

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  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint

into  qualinost.(none):/home/mtaylor/src/mysql-4.1-maint

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  mysql.com:/home/ram/work/b19690/b19690.4.1

Depending on the queries we use different data processing methods
and can lose some data in case of double (and decimal in 4.1) fields.

The fix consists of two parts:
1. double comparison changed, now double a is equal to double b 
if (a-b) is less than 5*0.1^(1 + max(a->decimals, b->decimals)). 
For example, if a->decimals==1, b->decimals==2, a==b if (a-b)<0.005
2. if we use a temporary table, store double values there as is 
to avoid any data conversion (rounding).

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  qualinost.(none):/home/mtaylor/src/mysql-4.1-maint

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

into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint

into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint

 - Set the timeout values only where needed

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