into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt

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

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt

into  moonbone.local:/work/18360-bug-5.1-opt-mysql

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

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt

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

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

 - fix moved to 5.1

into  macbook.gmz:/Users/kgeorge/mysql/work/B21174-5.1-opt

 - reversed the patch for 5.0 and moved to 5.1

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

into  mysql.com:/home/hf/work/mysql-5.0-mrg

result

The IN function aggregates result types of all expressions. It uses that 
type in comparison of left expression and expressions in right part. 
This approach works in most cases. But let's consider the case when the
right part contains both strings and integers. In that case this approach may
cause wrong results because all strings which do not start with a digit are
evaluated as 0.
CASE uses the same approach when a CASE expression is given thus it's also
affected.

The idea behind this fix is to make IN function to compare expressions with
different result types differently. For example a string in the left
part will be compared as string with strings specified in right part and
will be converted to real for comparison to int or real items in the right
part.

A new function called collect_cmp_types() is added. It collects different
result types for comparison of first item in the provided list with each 
other item in the list. 

The Item_func_in class now can refer up to 5 cmp_item objects: 1 for each
result type for comparison purposes. cmp_item objects are allocated according
to found result types. The comparison of the left expression with any
right part expression is now based only on result types of these expressions.

The Item_func_case class is modified in the similar way when a CASE
expression is specified. Now it can allocate up to 5 cmp_item objects
to compare CASE expression with WHEN expressions of different types.
The comparison of the CASE expression with any WHEN expression now based only 
on result types of these expressions.

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-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  rurik.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug21646

into  rurik.mysql.com:/home/igor/mysql-5.0-opt

Presence of a subquery in the ON expression of a join 
should not block merging the view that contains this join.
Before this patch the such views were converted into 
into temporary table views.

an ALL/ANY quantified subquery in HAVING.
The Item::split_sum_func2 method should not create Item_ref
for objects of any class derived from Item_subselect.

into  mysql.com:/home/hf/work/mysql-5.0-mrg

into  mysql.com:/home/hf/work/mysql-4.1.15428

into  mysql.com:/home/hf/work/mysql-4.1.15428

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

Remove race situations that occur when removing pidfiles. Primarily each process should remove its own
pidfile, secondly it should be removed by the process that created it and _only_ if it's
certain the process is dead. Third, mysql-test-run.pl will remove the pidfile when process has been killed.
- Set state of an instance to STARTING _before_ calling instance->start()
- Check that pidfile of instance has been created before changing STARTING => STARTED
- Only remove the pidfile if IM kills an instance with SIGKILL, otherwise the instance will remove it itself

into  production.mysql.com:/usersnfs/jamppa/mysql-5.1-bug-20208

into  mysql.com:/Users/kent/mysql/bk/mysql-5.1