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

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

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

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.

  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

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 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.

  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.

keep_files_on_create made a startup option

into  moonbone.local:/mnt/gentoo64/work/24989-bug-5.0-opt-mysql

  Warning fixed.

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

into  magare.gmz:/home/kgeorge/mysql/autopush/B27417-5.1-opt

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

extend the assert so it will run the testsuite

into  mysql.com:/home/psergey/mysql-5.0-bug29582

- Don't call mysql_select() several times for the select that enumerates
  a temporary table with the results of the UNION. Making this call for
  every subquery execution caused O(#enumerated-rows-in-the-outer-query) 
  memory allocations.
- Instead, call join->reinit() and join->exec(), and
  = disable constant table detection for such joins,  
  = provide special handling for table-less constant subqueries.

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

  Post-merge fix.

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

into  mysql.com:/home/hf/work/29717/my50-29717

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

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

into  mysql.com:/home/hf/work/29717/my51-29717