into mysql.com:/home/dlenev/src/mysql-5.0-merges

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

  after merge clean-up

into mysql.com:/home/dlenev/src/mysql-5.0-merges

into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0

The old syntax works as well. WL#2356.

into mysql.com:/home/psergey/mysql-5.0-fix-vg1

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

into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0

compile warning: changed eq_range -> eq_r

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

prefix", which roots were fixed in 4.0 tree.

TIMESTAMP prefix" into 4.1 tree.

into mysql.com:/home/dlenev/src/mysql-4.0-bg7884

macros.

It does not fixes any bugs in 4.0. But it prevents from future error in
any bugfixes that may use these macros. Also after merging into 4.1 tree
this cleanup will fix bug #7884 "Able to add invalid unique index on
TIMESTAMP prefix".

into mysql.com:/home/psergey/mysql-5.0-fix-vg1

into mysql.com:/home/mysql_src/mysql-5.0-clean

into mysql.com:/home/psergey/mysql-5.0-fix-vg1

  5.0 has a different way of knowing if master is < 3.23.57

into mysql.com:/home/kostja/work/mysql-5.0-root

into mysql.com:/home/mysql_src/mysql-5.0-clean

not default_charset_into. It fixes the
problem that in some cases numbers where
treated as CHAR(N), not as BINARY(N), e.g.
wrong 'charsetnr' when sent to the client side.
2. IFNULL didn't aggregate argument charsets
and collations, so IFNULL(1,'a') produced
a CHAR(N). Now produces a BINARY(N).
3. SELECT PROCEDURE ANALIZE now returns
BINARY columns, which is much better than it worked
previously: CHAR with the default character set.
But in the future it's worth to fix the fields
'Field_name' and 'Optimal_fieldtype' to use UTF8,
and 'Min_value' and 'Max_value' to inherit their charsets
from the original items. But it is not important,
and BINARY(N) is OK for now.
4. Tests were fixed accordingly. No new tests were
made, as the old onces cover everything.

into mysql.com:/home/mysql_src/mysql-4.1-clean

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

into mysql.com:/space/my/mysql-4.0

into mysql.com:/space/my/mysql-4.1

into mysql.com:/home/mysql_src/mysql-5.0-clean

into mysql.com:/home/mysql_src/mysql-4.1-clean

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

We should not overwrite res if it is returned from a const item.