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

into eagle.mysql.r18.ru:/home/vva/work/BUG_910/mysql-4.1

aggregate function reinitialization (if no rows was found) made with help of clear()
(fixed BUG#860)

into eagle.mysql.r18.ru:/home/vva/work/BUG_910/mysql-4.1

into narttu.mysql.fi:/my/mysql-4.1

  Post merge fixes

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

into narttu.mysql.fi:/my/mysql-4.1

BTREE, HASH and RTREE are not reserved symbols anymore

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

  Fix for a small error in the merge from 4.0

(./mysql-test-run t/rpl*.test  do same work)

  same as above
sql_lex.h:
  same as above 
sql_union.cc:
  same as aobve
sql_select.cc:
  Fixing that SQL_CALC_FOUND_ROWS work properly in UNION's in 4.1
  Plus updating some fields in THD in the proper places 
  plus fixing a wrong result

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

code cleunup

   distribution. libedit is used by default, one needs to use
   "--with-readline" when compiling with readline instead.

uninitialized value fixed

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

Barkov approved it already

into mashka.mysql.fi:/home/my/mysql-4.1

Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings