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

  Fix alignment of sockaddr(_in)

  ndb_mgmd limited no of api nodes, by restricting no of mgmsessions
  (these are used for dynamic port allocation)

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

  Handle early abort of scan, so that resources are correctly freed

  post merge

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

  fix api_signal_log print of uncond signals

  4.1->5.0 merge

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

  fix correct frag count in Backup block

  fix mem leak (not during running of transactions, but a few bytes when shutting down)

  silent valgrind warnings 5.0, ndb_autodiscover

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

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

  remove debug prinouts in Qmgr

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

  1) make sure that check_multi_node_shutdown does not proceed (in stop case)
  2) Fix printout

  add two new start options that will decrease likelyhood of bug#18612
  push cntr-sp2 logic down into qmgr-sp1 to decrease likelyhood of bug#18612

into  shellback.(none):/home/msvensson/mysql/mysql-5.0

as it is now required by mysql_set_character_set()

  Bug#18830 incompatibility new libraries with old server
  Additional 5.0 fix:
  applying the same patch to client.c.

into  mysql.com:/usr/home/bar/mysql-5.0

  Bug#18830: incompatibility new libraries with old server
  Don't execute SET NAMES with pre-4.1 server.

into  mysql.com:/usr/home/bar/mysql-5.0

Adding test case to cover queries which worked incorrectly earlier:
Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci

  Using local.

into  mysql.com:/usr/home/bar/mysql-5.0

  Backporting a 5.0 change:
  MAX_BUF was too small for Index.xml
  Changeing MAX_BUF and adding assert to easier
  catch the same problem in the future.
ctype-extra.c:
  Regenerating ctype-extra.c with the fixed conf_to_src.

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

  Buffer was too small to load Index.xml.
  So some charsets were not gerenrated.
  Making the buffer bigger, and adding an DBUG_ASSERT,
  to easier catch the problem in the future.
ctype-extra.c:
  Additional charsets were generated.

into sunlight.local:/local_work/16281-bug-5.0-mysql

Mutli-table uses temporary table to store new values for fields. With the
new values the rowid of the record to be updated is stored in a Field_string
field. Table to be updated is set as source table of the rowid field.
But when the temporary table creates the tmp field for the rowid field it
converts it to a varstring field because the table to be updated was created by
the v4.1. Due to this the stored rowids were broken and no records for 
update were found.

The flag can_alter_field_type is added to Field_string class. When it is set to
0 the field won't be converted to varstring. The Field_string::type() function 
now always returns MYSQL_TYPE_STRING if can_alter_field_type is set to 0.
The multi_update::initialize_tables() function now sets can_alter_field_type
flag to 0 for the rowid fields denying conversion of the field to a varstring
field.

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

into  shellback.(none):/home/msvensson/mysql/mysql-5.0

The code in opt_sum_query that prevented the COUNT/MIN/MAX 
optimization from being applied to outer joins  was not adjusted 
after introducing nested joins. As a result if an outer join
contained a reference to a view as an inner table the code of
opt_sum_query missed the presence of an on expressions and
erroneously applied the mentioned optimization.

into  mysql.com:/usr/home/bar/mysql-5.0