Fixed vim to expandtab's, retab'd code
  Fixed CWD bug in trim_the_fat()

  Cleaned-up trim_the_fat()

into mysql.com:/home/mysql_src/mysql-4.1-874

"if (thd->killed > thd->killable)", if we simply do
thd->killed= level;

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.bnew

Updated tests
After merge fix

Return NULL if a time argument is given to date_add(). (Warning will be shown after Dimitri's timezone patch is pushed)

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

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

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

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

at each 'make' invocation (pushing as two devs tested that the patch is ok).

into mysql.com:/home/mysql_src/mysql-4.1-874

mysqld >=4.1.3 will however understand shutdown requests sent by clients <4.1.3.
And mysqld <4.1.3 will understand shutdown requests sent by clients >=4.1.3
(it will ignore the level). Those shutdown level are just PLACEHOLDERS now.
So this change is just to make the 4.1 API suitable before it is frozen. Later
we will actually implement the shutdown levels.

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1

  MySql -> MySQL (Bug #4182)

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

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

No commit message

into mysql.com:/space/pekka/ndb/version/my41

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-tz-push

  New collations were added.

into ndbmaster.mysql.com:/ndb/clone-mysql-4.1-ndb-daily-2004-06-14

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-tz-push

Added basic per-thread time zone functionality (based on public
domain elsie-code). Now user can select current time zone
(from the list of time zones described in system tables).
All NOW-like functions honor this time zone, values of TIMESTAMP
type are interpreted as values in this time zone, so now
our TIMESTAMP type behaves similar to Oracle's TIMESTAMP WITH
LOCAL TIME ZONE (or proper PostgresSQL type).
  
WL#1266 "CONVERT_TZ() - basic time with time zone conversion 
function".
  
Fixed problems described in Bug #2336 (Different number of warnings 
when inserting bad datetime as string or as number). This required
reworking of datetime realted warning hadling (they now generated 
at Field object level not in conversion functions).
  
Optimization: Now Field class descendants use table->in_use member
instead of current_thd macro.

  Code optimization to make it look better and work faster.

  Fix for compilation failure when HAVE_CHARSET_ucs2 is not defined.

Don't pass --user to mysqld if --user is not used