into  mysql.com:/usr/home/bar/mysql-5.1-new

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

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

into  mysql.com:/usr/home/bar/mysql-5.1-new

  Recreating ctype-extra.c with additional 5.1
  charset, and with additional missing 5.0 charset
  due to bug with too small buffer MAX_BUF.

into  mysql.com:/usr/home/bar/mysql-5.1-new

  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  mysql.com:/usr/home/bar/mysql-5.1-new

never defined.
It was used at some point to add -Wuninitialized to debug flags, 
but not any more. If there is still need to add -Wunitialized,
it can be added directly to $global_warnings.

into  mysql.com:/home/bk/b18436-mysql-5.1-new

into  mysql.com:/home/bk/b18436-mysql-5.1-new

  After merge correction

into  mysql.com:/home/bk/b18436-mysql-5.1-new

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 mysql.com:/Users/kent/mysql/bk/mysql-5.1-new

into  mysql.com:/home/bk/b18436-mysql-5.1-new

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:/home/bk/b18436-mysql-5.1-new

into  mysql.com:/home/timka/mysql/src/5.1-merge

into  rurik.mysql.com:/home/igor/mysql-5.1

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

into  mysql.com:/home/psergey/mysql-5.1-bug18659-pre

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

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

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

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new