into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21081

into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge

into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge

into  mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge

into  mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge

create_tmp_table()".

The fix for bug 21787 "COUNT(*) + ORDER BY + LIMIT returns wrong
result" introduced valgrind warnings which occured during execution
of information_schema.test and sp-prelocking.test in version 5.0.
There were no user visible effects.

The latter fix made create_tmp_table() dependant on
THD::lex::current_select value. Valgrind warnings occured when this
function was executed and THD::lex::current_select member pointed
to uninitialized SELECT_LEX instance.

This fix tries to remove this dependancy by moving some logic
outside of create_tmp_table() function.

into  mysql.com:/home/gluh/MySQL/Merge/5.1

into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged

into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged

into  mysql.com:/home/gluh/MySQL/Merge/5.1

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21081

into  example.com:/work/mysql-5.1-runtime-fresh2

into  mockturtle.local:/home/dlenev/src/mysql-4.1-runtime

into  mysql.com:/home/cps/mysql/trees/5.1-runtime-new

into  example.com:/work/mysql-5.0-runtime

into  example.com:/work/mysql-5.1-runtime-fresh2

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21081

  
There was possible stack overrun in an edge case which handles invalid body of
a SP in mysql.proc . That should be case when mysql.proc has been changed
manually. Though, due to bug 21513, it can be exploited without having access
to mysql.proc only being able to create a stored routine.

Re-execution of a parametrized prepared statement or a stored routine
with a SELECT that use LEFT JOIN with second table having only one row
could yield incorrect result.

The problem appeared only for left joins with second table having only
one row (aka const table) and equation conditions in ON or WHERE clauses
that depend on the argument passed.  Once the condition was false for
second const table, a NULL row was created for it, and any field involved
got NULL-value flag, which then was never reset.

The cause of the problem was that Item_field::null_value could be set
without being reset for re-execution.  The solution is to reset
Item_field::null_value in Item_field::cleanup().

at the moment, so we can safely do that). Update an error
mesage to make it translateable.

into  mysql.com:/home/gluh/MySQL/Merge/5.0

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21414

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21414

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-runtime

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-runtime

A better fix for bug#10025.

Fixed test case plus added new tests.

After fixing Bug#20208 "Blobs greater than 8K are being truncated to 8K"
the fix to bug#10025 "Misleading error with COLLATE mediumtext and UNION"
became more accurate. Earlier mediumtext got converted to longtext,
although mediumtext was enough to contain the results. Now it converts
correctly to mediumtext, if the length does not exceed that and if none
of the original fields were type longtext.

Type longtext still converts correctly to type longtext, as the extra
tests prove.

into  trift2.:/MySQL/M50/push-5.0

when set to DISABLED
  
It was a silly ordering number error.

  
ALTER EVENT in stored procedure body led to a crash during the
procedure call. Affected was only ALTER EVENT which changed the
interval of the event. No problems with AT, STARTS, ENDS and so on.

into  neptunus.(none):/home/msvensson/mysql/bug22379_runtime/my51-bug22379_runtime