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

  Post-merge fix.

  Post-merge fix.

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

  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

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

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

 SELECT statement itself returns empty.

As a result of this bug 'SELECT AGGREGATE_FUNCTION(fld) ... GROUP BY'
can return one row instead of an empty result set.

When GROUP BY only has fields of constant tables
(with a single row), the optimizer deletes the group_list.
After that we lose the information about whether we had an
GROUP BY statement. Though it's important
as SELECT min(x) from empty_table; and
   SELECT min(x) from empty_table GROUP BY y; have to return
different results - the first query should return one row,
second - an empty result set.
So here we add the 'group_optimized_away' flag to remember this case
when GROUP BY exists in the query and is removed
by the optimizer, and check this flag in end_send_group()

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

  Fixing a typo in the test case.

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

Bug #27417 thd->no_trans_update.stmt lost value inside of SF-exec-stack
  
Once had been set the flag might later got reset inside of a stored routine 
execution stack.
The reason was in that there was no check if a new statement started at time 
of resetting.
The artifact affects most of binlogable DML queries. Notice, that multi-update 
is wrapped up within
  bug@27716 fix, multi-delete bug@29136.
  
Fixed with saving parent's statement flag of whether the statement modified 
non-transactional table, and unioning (merging) the value with that was gained 
in mysql_execute_command.
  
Resettling thd->no_trans_update members into thd->transaction.`member`;
Asserting code;
Effectively the following properties are held.
  
1. At the end of a substatement thd->transaction.stmt.modified_non_trans_table
   reflects the fact if such a table got modified by the substatement.
   That also respects THD::really_abort_on_warnin() requirements.
2. Eventually thd->transaction.stmt.modified_non_trans_table will be computed as
   the union of the values of all invoked sub-statements.
   That fixes this bug#27417;

Computing of thd->transaction.all.modified_non_trans_table is refined to base to 
the stmt's value for all the case including insert .. select statement which 
before the patch had an extra issue bug@28960.
Minor issues are covered with mysql_load, mysql_delete, and binloggin of insert in
to temp_table select. 
  
The supplied test verifies limitely, mostly asserts. The ultimate testing is defered
for bug@13270, bug@23333.