into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-merge

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-2team

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-2team

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-bug28404

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl

into  magare.gmz:/home/kgeorge/mysql/work/B25228-5.1-opt

into  magare.gmz:/home/kgeorge/mysql/work/B25228-5.1-opt

into  mysql.com:/home/bar/mysql-work/mysql-5.1.b28875

A test case was waiting for a fixed number of seconds for a specific 
state of the slave IO thread to take place.
Fixed by waiting in a loop for that specific thread state instead 
(or timeout).

into  bk-internal.mysql.com:/users/gshchepa/5.1-opt

  Post-merge fix.

into  mysql.com:/home/bar/mysql-work/mysql-5.0-rpl

(Regression, caused by a patch for the bug 22646).
Problem: when result type of date_format() was changed from
binary string to character string, mixing date_format()
with a ascii column in CONCAT() stopped to work.
Fix:
- adding "repertoire" flag into DTCollation class,
to mark items which can return only pure ASCII strings.
- allow character set conversion from pure ASCII to other character sets.

  Post-merge fix.

into  magare.gmz:/home/kgeorge/mysql/autopush/B30193-5.0-opt

into  magare.gmz:/home/kgeorge/mysql/work/B30193-5.1-opt

  
This patch removes a portion of the last patch to Field_blob::copy
after problems found during testing of tests using distinct operations.

into  gleb.loc:/home/uchum/work/bk/5.1-opt

into  gleb.loc:/home/uchum/work/bk/5.0-opt

into  gleb.loc:/home/uchum/work/bk/5.0-opt

The SELECT query with more than 31 nested dependent SELECT queries returned
wrong result.

New error message has been added: ER_TOO_HIGH_LEVEL_OF_NESTING_FOR_SELECT.
It will be reported as: "Too high level of nesting for select".

This patch corrects a problem found during testing on Solaris. The code
changes how length values are retrieved on big endian machines. The
patch allows the rpl_extraColmaster tests to run on these machines.

This patch adds cost estimation for the queries with ORDER BY / GROUP BY
and LIMIT. 
If there was a ref/range access to the table whose rows were required
to be ordered in the result set the optimizer always employed this access
though a scan by a different index that was compatible with the required 
order could be cheaper to produce the first L rows of the result set.
Now for such queries the optimizer makes a choice between the cheapest
ref/range accesses not compatible with the given order and index scans
compatible with it.

into  mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl-merge

into  mysql_cab_desk.:C:/source/c++/mysql-5.1

  Post merge changes.

  After merge changes.

into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql

into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql

When DROP TABLE detects that it has been killed
by another thread it must unlock the table names
it locked.

Fixed by backporting the 5.1 error handling code.

into  mysql.com:/home/ram/work/b30088/b30088.5.0