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

  Fix for bug#16716 for --ps-protocol mode.
item_cmpfunc.cc:
  Fix for a memory allocation/freeing problem in agg_cmp_type() after fix
for bug#16377. Few language corrections.

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

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

into moonbone.local:/work/18175-bug-5.0-opt

resulted in a wrong error message.

The nest_level counter indicates the depth of nesting for a subselect. It is
needed to properly resolve aggregate functions in nested subselects. Obviously 
it shouldn't be incremented for UNION parts because they have the same level of
nesting. This counter was incremented by 1 in the mysql_new_select() function
for any new select and wasn't decremented for UNION parts. This resulted in
wrongly reported error messages.

Now the nest_level counter is decremented by 1 for any union part.

into moonbone.local:/work/16377-4.1-after

  Post fix for bug#16377

into moonbone.local:/work/19789-bug-5.0-opt-mysql

into moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt

  After merge fix

into  devsrv-b.mysql.com:/users/msvensson/mysql-5.0

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

 - Import patch from yaSSL

into moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt

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

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

- correction of backport error

- make sure to disable bulk insert when check for duplicate key is needed

into  mysql.com:/home/kgeorge/mysql/5.0/B18895

into  mysql.com:/home/kgeorge/mysql/5.0/B18895

into moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt

The Field::eq() considered instances of Field_bit that differ only in 
bit_ptr/bit_ofs equal. This caused equality conditions optimization 
(build_equal_items_for_cond()) to make bad field substitutions that result
in wrong predicates. 
Field_bit requires an overloaded eq() function that checks the bit_ptr/bit_ofs
in addition to Field::eq().

into moonbone.local:/work/15962-bug-5.0-opt-mysql

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

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

corrupt
  - add infinite retry on drop table temporary error

into  mysql.com:/home/kgeorge/mysql/5.0/B20195

into  rurik.mysql.com:/home/igor/mysql-4.1-opt

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

This bug in Field_string::cmp resulted in a wrong comparison 
with keys in partial indexes over multi-byte character fields.
Given field a is declared as 
  a varchar(16) collate utf8_unicode_ci
INDEX(a(4)) gives us an example of such an index.

Wrong key comparisons could lead to wrong result sets if 
the selected query execution plan used a range scan by 
a partial index over a utf8 character field.
This also caused wrong results in many other cases.