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

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

    after merge fix
sql/sql_parse.cc
    correct max_connections condition

into mysql.com:/home/jimw/my/mysql-5.0-clean

into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug3788.4

into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug3788.4

into mysql.com:/home/jimw/my/mysql-5.0-clean

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

  Correction after manual merge.

into mysql.com:/home/jimw/my/mysql-5.0-clean

into mysql.com:/home/jimw/my/mysql-5.0-clean

  Delete: mysql-test/t/ndb_multi.test
.del-ndb_multi.result~4baa26e7403188ae:
  Delete: mysql-test/r/ndb_multi.result
.del-have_multi_ndb.inc~ef8da69d972ee707:
  Delete: mysql-test/include/have_multi_ndb.inc

  bug#4914 added --help and usage information

    preserve backward compatibility

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

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.

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

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

into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug3788.4

  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

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

fix crashing bug in Dict caused by Suma on CREATE_SUBID_REF

into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0

which is always false. In a very fast InnoDB shutdown, we just ensure that
no more transactions are running, flush InnoDB log, signal InnoDB threads to die,
and then return from InnoDB (from innobase_end()) without waiting for those threads
to actually die. I have tested on a 4CPU machine that even with --innodb_flush_log_at_trx_commit=0,
this optimized InnoDB very fast shutdown loses no committed transactions. Patch pre-approved by Heikki.