into  perch.ndb.mysql.com:/home/jonas/src/41-jonas

into  perch.ndb.mysql.com:/home/jonas/src/41-work

  handle error in TCKEYREQ during TCINDXREQ better

into  perch.ndb.mysql.com:/home/jonas/src/41-jonas

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

into  perch.ndb.mysql.com:/home/jonas/src/41-jonas

into  perch.ndb.mysql.com:/home/jonas/src/41-jonas

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

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

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

  Corrected typo

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)

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  trift2.:/M41/push-4.1

into  trift2.:/M41/push-4.1

 - Send confusing output to /dev/null

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

  Filter out strange control characters, messes up logs

into  mysql.com:/usr/home/ram/work/4.1.b16327

into  mysql.com:/home/hf/work/mysql-4.1.19983

 - backport patch from 5.0
 - "table" can be NULL in temporary fields used for type conversion

  Added new "mysql_explain_log" man page
  Added missing install of "myisam_ftdump" man page
  Added missing install of "mysqlman" man page

into  moonbone.local:/work/tmp_merge-4.1-opt-mysql

into  moonbone.local:/work/tmp_merge-4.1-opt-mysql

Please use "ul" when merging this changeset to 5.0.

1) When initializing a boolean variable, do not use string representations '"false"' and '"true"' 
    but rather the boolean values 'false' and 'true'.
2) Add the module to the various Windows description files.

In 5.0, this is already solved, so that is a null-merge ("ul").

into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41-1.2461

  Command "ndb_mgm" is an optional tool, and should only be in "ndb-tools" package (bug#21058)

into  mysql.com:/usr/home/ram/work/4.1.b15195

to avoid the potential security problem.
(see bug #15195: Security Breach with MERGE table)

into  rakia.(none):/home/kgeorge/mysql/autopush/B17212-4.1-opt

into  mysql.com:/home/hf/work/mysql-4.1.16017

into  mysql.com:/home/hf/work/mysql-4.1.16017

into  zippy.(none):/home/cmiller/work/mysql/m41-maint--07AB5