- Build mysql_client_test from mysql_client_test.c and mysys/my_memmem.c

into  maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfx

Fix OPT_MYISAM_STATS_METHOD case, where the NULLS_EQUAL and NULLS_NOT_EQUAL methods were mixed up

  Provide a more extensible, easier-to-change way of reordering
  test cases.

Zero-length variables caused failures when using the length to look
up the name in a hash.  Instead, signal that no zero-length name can
ever be found and that to encounter one is a syntax error.

Fixes:
- bug #19834: Using cursors when running in READ-COMMITTED can cause InnoDB to crash
- bug #21112: InnoDB slow with > 100,000 .ibd files
- bug #21113: Duplicate printout in SHOW INNODB STATUS

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge

into  mysql.com:/Users/kent/mysql/bk/mysql-5.0

into  mysql.com:/Users/kent/mysql/bk/mysql-4.1

  Corrected typo

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge

  Converted "udf_example.cc" to C, avoids C++ runtime lib dependency (bug#21336)

into  mysql.com:/Users/kent/mysql/bk/mysql-4.1

  Man page for mysqld command move to section 8 (bug#21220)

  Man page for "mysqld" command move to section 8 (bug#21220)

  Man page for "mysqld" command move to section 8 (bug#21220)

into  mysql.com:/Users/kent/mysql/bk/mysql-5.0-new

into  mysql.com:/Users/kent/mysql/bk/mysql-5.0-new

  Renamed variable, to avoid name clash with macro "rem_size"
  on AIX 5.3 and "/usr/include/sys/xmem.h" (bug#17648)
asn.cpp, asn.hpp:
  Avoid name clash with NAME_MAX

into  maint1.mysql.com:/data/localhome/tsmith/bk/global-50

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-main

Too many cursors (more than 1024) could lead to memory corruption.
This affects both, stored routines and C API cursors, and the
threshold is per-server, not per-connection.  Similarly, the
corruption could happen when the server was under heavy load
(executing more than 1024 simultaneous complex queries), and this is
the reason why this bug is fixed in 4.1, which doesn't support
cursors.

The corruption was caused by a bug in the temporary tables code, when
an attempt to create a table could lead to a write beyond allocated
space.  Note, that only internal tables were affected (the tables
created internally by the server to resolve the query), not tables
created with CREATE TEMPORARY TABLE.  Another pre-condition for the
bug is TRUE value of --temp-pool startup option, which, however, is a
default.

The cause of a bug was that random memory was overwritten in
bitmap_set_next() due to out-of-bound memory access.

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-main

into  siva.hindu.god:/usr/home/tim/m/bk/global-50

Too many cursors (more than 1024) could lead to memory corruption.
This affects both, stored routines and C API cursors, and the
threshold is per-server, not per-connection.  Similarly, the
corruption could happen when the server was under heavy load
(executing more than 1024 simultaneous complex queries), and this is
the reason why this bug is fixed in 4.1, which doesn't support
cursors.

The corruption was caused by a bug in the temporary tables code, when
an attempt to create a table could lead to a write beyond allocated
space.  Note, that only internal tables were affected (the tables
created internally by the server to resolve the query), not tables
created with CREATE TEMPORARY TABLE.  Another pre-condition for the
bug is TRUE value of --temp-pool startup option, which, however, is a
default.

The cause of a bug was that random memory was overwritten in
bitmap_set_next() due to out-of-bound memory access.

into  mysql.com:/home/alexi/innodb/mysql-5.0-work
  Null merge.

    (Re-apply a patch from the general tree to the clone.)

      BUG#20850: Assert during slave shutdown in many rpl_* tests
      This patch has already been applied to 5.1.

into  mysql.com:/home/hf/work/mysql-5.0.mrg