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.

    (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

into  trift2.:/M41/push-4.1

into  trift2.:/M41/push-4.1

 - Send confusing output to /dev/null

into  trift2.:/M50/merge-4.1-to-5.0

into  trift2.:/M50/merge-4.1-to-5.0

into  trift2.:/M50/merge-4.1-to-5.0

into  trift2.:/M50/merge-4.1-to-5.0

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

  Place mysqlmanager 'pdb' file in 'client_debug' directory
mysys.vcproj:
  Removed define of __NT__ from 'Debug' target
mysqld.vcproj:
  Always generate 'pdb' and 'map' files

into  xiphis.org:/home/antony/work2/merge/mysql-5.0

- Adapt it to work with the handlerton class

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

"real" table fails in JOINs".

This is a regression caused by the fix for Bug 18444. 
This fix removed the assignment of empty_c_string to table->db performed 
in add_table_to_list, as neither me nor anyone else knew what it was 
there for. Now we know it and it's covered with tests: the only case 
when a table database name can be empty is when the table is a derived 
table. The fix puts the assignment back but makes it a bit more explicit.

Additionally, finally drop sp.result.orig which was checked in by mistake. 

into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0

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