into hundin.mysql.fi:/home/heikki/mysql-4.1

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

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

ndb - Reenable MAX_OPEN_FILES to enable LCP in some situations

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

  Correction after manual merge.

  Better ibbackup message
  Add a message explaining why we do a 'crash recovery' after an ibbackup restore; suggested by Tim Smith

  bug#4914 added --help and usage information

    preserve backward compatibility

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

    recalculate stats/gws for the last word in the index too
    remove unused code

  Added a test case for bug #8669.
item_strfunc.cc:
  Fixed bug #8669.
  Function AES_DECRYPT can return NULL value.

(recommit as 4.1->5.0 merge is not possible)

  bug#5102, bug#6862 define HAVE_VIS_H to libedit only if header and strvis() exists

  Removed -c from /bin/sh call
make_win_src_distribution.sh:
  Copy all content in mysql-test
make_win_binary_distribution.sh, make_binary_distribution.sh:
  Add Perl version of mysql-test-run to package
s_win32_dsp, s_win32, s_vxworks, s_test, s_readme, s_java, s_javah:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris

  main(): add missing parameter to printf(ER(ER_READY),...) call

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

  Add dummy changelog file. It should merge upward without conflict.

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

for fulltext searches too

  dict_load_table(): Do not complain about mix_len != 0,
  because MySQL 3.23.4x left garbage in that column.

  Fix bad root element name in DOCTYPE.  Sheesh.

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.0

  dict_load_table(): Remove the check for row_format=compact for now,
  because the flag bit we used (high-order bit of mix_len)
  has not been zero for at least two customers.

into hundin.mysql.fi:/home/marko/mysql-4.1

into mysql.com:/M41/mysql-4.1

into hundin.mysql.fi:/home/marko/k/mysql-4.0

- bumped up version number in configure.in from 4.0.24 -> 4.0.25 (ChangeSet 1.2073 was already tagged
  as 4.0.24)